From ba53c209723cdcfe2feaf884448a1435cb2fa5ad Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Sun, 7 Oct 2018 10:09:50 -0700 Subject: [PATCH] Update CMakeLists for Steamshim --- CMakeLists.txt | 4 ++-- steamshim_parent/CMakeLists.txt | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dbe084..beab52f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ conan_basic_setup() ## Setup options ## -option(STEAM "Build for Steam" ON) -set(STEAMWORKS_PATH "${CMAKE_BINARY_DIR}/steamworks" CACHE PATH "Path to Steamworks folder") +option(STEAM "Build for Steam" OFF) +set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder") option(DEBUG "Debug mode" OFF) ## Misc setup ## diff --git a/steamshim_parent/CMakeLists.txt b/steamshim_parent/CMakeLists.txt index cbc3a4e..3c25ad2 100644 --- a/steamshim_parent/CMakeLists.txt +++ b/steamshim_parent/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.11) -set(STEAMWORKS_PATH "" CACHE PATH "Path to Steamworks folder") +set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../steamworks" CACHE PATH "Path to Steamworks folder") set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name") option(DEBUG "Debug mode" OFF) @@ -20,7 +20,7 @@ IF(APPLE) link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32) ELSEIF(WIN32) list(APPEND SOURCES resources.rc) - link_directories(${STEAMWORKS_PATH}/redistributable_bin) + link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows") ELSEIF(LINUX) link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64) @@ -31,4 +31,8 @@ add_executable(steamshim ${SOURCES} ) -target_link_libraries(steamshim steam_api) +IF(WIN32) + target_link_libraries(steamshim steam_api64) +ELSE() + target_link_libraries(steamshim steam_api) +ENDIF()