snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qmake-to-cmake

This commit is contained in:
Vinyl Darkscratch 2018-10-06 18:25:01 -07:00
parent 8f473733e6 183e1e8ecc
commit ba8217b6b3
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -15,7 +15,7 @@
bin/ bin/
lib/ lib/
oneshot\.dir/ *.dir/
x64/ x64/
Makefile* Makefile*
@ -28,6 +28,7 @@ __pycache__
/dist /dist
/debug /debug
/release /release
steamshim_parent/build/
object_script.* object_script.*
rpgscript.bat rpgscript.bat
@ -54,6 +55,4 @@ package/
oclint/ oclint/
steamshim_parent/build/
steamworks/ steamworks/

37
CMakeLists.txt
View File

@ -314,32 +314,37 @@ IF(APPLE)
ENDIF() ENDIF()
# Steamshim # Steamshim
IF(NOT WIN32)
set(STEAMSHIM_SOURCES set(STEAMSHIM_SOURCES
steamshim_parent/steamshim_parent.cpp steamshim_parent/steamshim_parent.cpp
) )
include_directories(${STEAMWORKS_PATH}/public) include_directories(${STEAMWORKS_PATH}/public)
add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}") add_definitions(-DGAME_LAUNCH_NAME="${GAME_LAUNCH_NAME}")
IF(DEBUG) IF(DEBUG)
add_definitions(-DSTEAMSHIM_DEBUG) add_definitions(-DSTEAMSHIM_DEBUG)
ENDIF() ENDIF()
IF(APPLE) IF(APPLE)
link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32) link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
ELSEIF(WIN32) ELSEIF(WIN32)
list(APPEND STEAMSHIM_SOURCES resources.rc) list(APPEND STEAMSHIM_SOURCES steamshim_parent/resources.rc)
link_directories(${STEAMWORKS_PATH}/redistributable_bin) link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows")
ELSEIF(LINUX) ELSEIF(LINUX)
link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64) link_directories(${STEAMWORKS_PATH}/redistributable_bin/linux64)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
ENDIF() ENDIF()
add_executable(steamshim add_executable(steamshim
${STEAMSHIM_SOURCES} ${STEAMSHIM_SOURCES}
) )
target_link_libraries(steamshim steam_api) IF(WIN32)
target_link_libraries(steamshim steam_api64)
ELSE()
target_link_libraries(steamshim steam_api)
ENDIF()
ENDIF()