mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-20 22:09:55 +00:00
Merge branch 'master' into qmake-to-cmake
This commit is contained in:
commit
ba8217b6b3
2 changed files with 32 additions and 28 deletions
7
.gitignore
vendored
7
.gitignore
vendored
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
bin/
|
||||
lib/
|
||||
oneshot\.dir/
|
||||
*.dir/
|
||||
x64/
|
||||
|
||||
Makefile*
|
||||
|
|
@ -28,6 +28,7 @@ __pycache__
|
|||
/dist
|
||||
/debug
|
||||
/release
|
||||
steamshim_parent/build/
|
||||
|
||||
object_script.*
|
||||
rpgscript.bat
|
||||
|
|
@ -54,6 +55,4 @@ package/
|
|||
|
||||
oclint/
|
||||
|
||||
steamshim_parent/build/
|
||||
|
||||
steamworks/
|
||||
steamworks/
|
||||
|
|
@ -314,32 +314,37 @@ IF(APPLE)
|
|||
ENDIF()
|
||||
|
||||
# Steamshim
|
||||
IF(NOT WIN32)
|
||||
set(STEAMSHIM_SOURCES
|
||||
steamshim_parent/steamshim_parent.cpp
|
||||
)
|
||||
|
||||
set(STEAMSHIM_SOURCES
|
||||
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)
|
||||
add_definitions(-DSTEAMSHIM_DEBUG)
|
||||
ENDIF()
|
||||
|
||||
IF(DEBUG)
|
||||
add_definitions(-DSTEAMSHIM_DEBUG)
|
||||
IF(APPLE)
|
||||
link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
|
||||
ELSEIF(WIN32)
|
||||
list(APPEND STEAMSHIM_SOURCES steamshim_parent/resources.rc)
|
||||
link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64)
|
||||
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}
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
target_link_libraries(steamshim steam_api64)
|
||||
ELSE()
|
||||
target_link_libraries(steamshim steam_api)
|
||||
ENDIF()
|
||||
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue