Merge branch 'qmake-to-cmake'

CMakeLists.txt

@@ -315,7 +315,8 @@ IF(APPLE)
 ENDIF()
 
 # Steamshim
-IF(NOT WIN32)
+IF(STEAM)
+	IF(NOT WIN32)
 		set(STEAMSHIM_SOURCES
 			steamshim_parent/steamshim_parent.cpp
 		)
@@ -348,4 +349,5 @@ IF(NOT WIN32)
 		ELSE()
 			target_link_libraries(steamshim steam_api)
 		ENDIF()
+	ENDIF()
 ENDIF()

README.md

@@ -32,6 +32,7 @@ Thanks to [hunternet93](https://github.com/hunternet93) for starting the reimple
 * Ruby
 * Python 3 (journal reimplementation only)
 * PyQt5 for Python 3 (journal reimplementation only)
+* Steamworks SDK (optional, place contents of sdk folder in ZIP into "steamworks" folder in root)
 
 ### Building with Conan
 

make-oneshot-mac.command

@@ -7,8 +7,6 @@ cd `dirname $0`
 mac_version="1.1.0"
 make_threads=8
 ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot
-STEAMWORKS_PATH=$HOME/Developer/downloaded/steamworks
-
 # Colors
 white="\033[0;37m"      # White - Regular
 bold="\033[1;37m"       # White - Bold
@@ -30,7 +28,7 @@ if [[ $use_qmake == True ]]
 	echo "-> ${cyan}Compile steamshim...${color_reset}"
 	cd steamshim_parent
 	mkdir build && cd build
-	cmake -DSTEAMWORKS_PATH=${STEAMWORKS_PATH} ..
+	cmake ..
 	make -j${make_threads}
 	cd ../..
 else