snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qmake-to-cmake'

Browse source
This commit is contained in:
Vinyl Darkscratch 2018-10-07 11:12:53 -07:00
commit 6be62bc492
3 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
CMakeLists.txt
View file

@ -315,37 +315,39 @@ IF(APPLE)
ENDIF() ENDIF()
# Steamshim # Steamshim
IF(NOT WIN32) IF(STEAM)
set(STEAMSHIM_SOURCES IF(NOT WIN32)
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) 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 steamshim_parent/resources.rc) list(APPEND STEAMSHIM_SOURCES steamshim_parent/resources.rc)
link_directories(${STEAMWORKS_PATH}/redistributable_bin/win64) 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}
) )
IF(WIN32) IF(WIN32)
target_link_libraries(steamshim steam_api64) target_link_libraries(steamshim steam_api64)
ELSE() ELSE()
target_link_libraries(steamshim steam_api) target_link_libraries(steamshim steam_api)
ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()

1
README.md
View file

@ -32,6 +32,7 @@ Thanks to [hunternet93](https://github.com/hunternet93) for starting the reimple
* Ruby * Ruby
* Python 3 (journal reimplementation only) * Python 3 (journal reimplementation only)
* PyQt5 for 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 ### Building with Conan

4
make-oneshot-mac.command
View file

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