snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 21:39:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into qmake-to-cmake

Browse source
This commit is contained in:
Vinyl Darkscratch 2018-10-07 10:33:33 -07:00
commit ea50467100
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -6,8 +6,8 @@ conan_basic_setup()
## Setup options ## ## Setup options ##
option(STEAM "Build for Steam" ON) option(STEAM "Build for Steam" OFF)
set(STEAMWORKS_PATH "${CMAKE_BINARY_DIR}/steamworks" CACHE PATH "Path to Steamworks folder") set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
option(DEBUG "Debug mode" OFF) option(DEBUG "Debug mode" OFF)
## Misc setup ## ## Misc setup ##

2
conanfile.py
View file

@ -16,7 +16,7 @@ class MkxpConan(ConanFile):
"openal/1.18.2@bincrafters/stable", "openal/1.18.2@bincrafters/stable",
"physfs/3.0.1@eliza/stable", "physfs/3.0.1@eliza/stable",
"pixman/0.34.0@bincrafters/stable", "pixman/0.34.0@bincrafters/stable",
"ruby-mkxp/2.5.1@eliza/stable", "ruby/2.5.1@eliza/stable",
"sdl2/2.0.8@bincrafters/stable", "sdl2/2.0.8@bincrafters/stable",
"sdl2_image/2.0.3@bincrafters/stable", "sdl2_image/2.0.3@bincrafters/stable",
"sdl2_ttf/2.0.14@eliza/stable", "sdl2_ttf/2.0.14@eliza/stable",

2
src/main.cpp
View file

@ -252,7 +252,7 @@ int main(int argc, char *argv[])
if (conf.windowTitle.empty()) if (conf.windowTitle.empty())
conf.windowTitle = conf.game.title; conf.windowTitle = conf.game.title;
int imgFlags = IMG_INIT_PNG | IMG_INIT_JPG; int imgFlags = IMG_INIT_PNG;
if (IMG_Init(imgFlags) != imgFlags) if (IMG_Init(imgFlags) != imgFlags)
{ {
showInitError(std::string("Error initializing SDL_image: ") + SDL_GetError()); showInitError(std::string("Error initializing SDL_image: ") + SDL_GetError());

10
steamshim_parent/CMakeLists.txt
View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
set(STEAMWORKS_PATH "" CACHE PATH "Path to Steamworks folder") set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../steamworks" CACHE PATH "Path to Steamworks folder")
set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name") set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
option(DEBUG "Debug mode" OFF) option(DEBUG "Debug mode" OFF)
@ -20,7 +20,7 @@ IF(APPLE)
link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32) link_directories(${STEAMWORKS_PATH}/redistributable_bin/osx32)
ELSEIF(WIN32) ELSEIF(WIN32)
list(APPEND SOURCES resources.rc) list(APPEND SOURCES 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)
@ -31,4 +31,8 @@ add_executable(steamshim
${SOURCES} ${SOURCES}
) )
target_link_libraries(steamshim steam_api) IF(WIN32)
target_link_libraries(steamshim steam_api64)
ELSE()
target_link_libraries(steamshim steam_api)
ENDIF()