Merge branch 'qmake-to-cmake'

.gitignore

@@ -53,3 +53,7 @@ conan_imports_manifest\.txt
 package/
 
 oclint/
+
+steamshim_parent/build/
+
+steamworks/

CMakeLists.txt

@@ -7,6 +7,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(DEBUG "Debug mode" OFF)
 
 ## Misc setup ##
 
@@ -16,7 +18,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # 	SET(LINUX ON)
 # ENDIF()
 
-# set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
 
 # IF(LINUX)
 # 	if(CMAKE_SIZEOF_VOID_P MATCHES "8" AND NOT(FORCE32) )
@@ -154,6 +156,9 @@ if(WIN32)
 	include_directories(
 		${CMAKE_CURRENT_BINARY_DIR}/windows
 	)
+elseif(APPLE)
+	list(APPEND MAIN_HEADERS src/mac-desktop.h)
+	list(APPEND MAIN_SOURCE src/mac-desktop.mm)
 endif()
 
 if (STEAM)
@@ -303,3 +308,38 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE WIN32
 target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES})
 target_include_directories(${PROJECT_NAME} PRIVATE src)
 target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS} ${PLATFORM_LIBRARIES})
+
+IF(APPLE)
+	add_custom_command(TARGET ${target} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM)
+ENDIF()
+
+# Steamshim
+
+set(STEAMSHIM_SOURCES
+	steamshim_parent/steamshim_parent.cpp
+)
+
+include_directories(${STEAMWORKS_PATH}/public)
+
+add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}")
+
+IF(DEBUG)
+	add_definitions(-DSTEAMSHIM_DEBUG)
+ENDIF()
+
+IF(APPLE)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
+ELSEIF(WIN32)
+	list(APPEND STEAMSHIM_SOURCES resources.rc)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
+ELSEIF(LINUX)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+ENDIF()
+
+add_executable(steamshim
+	${STEAMSHIM_SOURCES}
+)
+
+target_link_libraries(steamshim steam_api)

cleanup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 rm -rf journal/mac/__pycache__
-rm -rf steamshim_parent/steamshim
+rm -rf steamshim_parent/build
 rm -rf build
 rm -rf dist
 rm -rf _______.app
@@ -13,6 +13,7 @@ rm -rf cmake_install.cmake
 rm -rf CMakeCache.txt
 rm -rf conanbuildinfo.txt
 rm -rf conaninfo.txt
+rm -rf *.xxd
 if [ -f .qmake.stash ]
 then
 	make distclean

make-oneshot-linux.sh

@@ -7,6 +7,7 @@ cd `dirname $0`
 linux_version="0.1.0"
 make_threads=8
 ONESHOT_PATH=$HOME/.steam/steam/steamapps/common/OneShot
+STEAMWORKS_PATH=/usr/steamworks
 
 # Colors
 white="\033[0;37m"      # White - Regular
@@ -24,8 +25,10 @@ echo "-> ${cyan}Compile engine...${color_reset}"
 make -j${make_threads}
 echo "-> ${cyan}Compile steamshim...${color_reset}"
 cd steamshim_parent
-HOST=linux64 make -j${make_threads}
-cd ..
+mkdir build && cd build
+cmake -DSTEAMWORKS_PATH=${STEAMWORKS_PATH} ..
+make -j${make_threads}
+cd ../..
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 

make-oneshot-mac.command

@@ -7,6 +7,7 @@ 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
@@ -28,8 +29,10 @@ if [[ $use_qmake == True ]]
 	make -j${make_threads}
 	echo "-> ${cyan}Compile steamshim...${color_reset}"
 	cd steamshim_parent
-	HOST=osx make -j${make_threads}
-	cd ..
+	mkdir build && cd build
+	cmake -DSTEAMWORKS_PATH=${STEAMWORKS_PATH} ..
+	make -j${make_threads}
+	cd ../..
 else
 	echo "${bold}WARNING: Conan/CMake method not ready yet.${color_reset}"
 fi
@@ -54,7 +57,7 @@ if [ ! -e $ResourcesDir ]
 	mkdir -p "$ResourcesDir"
 fi
 
-cp steamshim_parent/steamshim ./OneShot.app/Contents/Resources/steamshim
+cp steamshim_parent/build/steamshim ./OneShot.app/Contents/Resources/steamshim
 cp patches/mac/libsteam_api.dylib ./OneShot.app/Contents/Libraries/libsteam_api.dylib
 cmake -P patches/mac/CompleteBundle.cmake
 cp assets/icon.icns ./OneShot.app/Contents/Resources/icon.icns

steamshim_parent/CMakeLists.txt

@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 2.8.11)
+
+set(STEAMWORKS_PATH "" CACHE PATH "Path to Steamworks folder")
+set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
+option(DEBUG "Debug mode" OFF)
+
+set(SOURCES
+	steamshim_parent.cpp
+)
+
+include_directories(${STEAMWORKS_PATH}/public)
+
+add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}")
+
+IF(DEBUG)
+	add_definitions(-DSTEAMSHIM_DEBUG)
+ENDIF()
+
+IF(APPLE)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
+ELSEIF(WIN32)
+	list(APPEND SOURCES resources.rc)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
+ELSEIF(LINUX)
+	link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+ENDIF()
+
+add_executable(steamshim
+	${SOURCES}
+)
+
+target_link_libraries(steamshim steam_api)