PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-08 06:06:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix missing gamestates on macOS builds

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2018-12-08 14:52:05 +01:00
parent f82dc24a88
commit 66caf96cc8
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmake/libsuperderpy.cmake
View file

@ -80,13 +80,15 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
add_definitions(-D_Noreturn=) add_definitions(-D_Noreturn=)
endif(MAEMO5) endif(MAEMO5)
set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
if(APPLE) if(APPLE)
if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") # HACK
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}") set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}.app/Contents/MacOS/")
endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin/${LIBSUPERDERPY_GAMENAME}.app/Contents/MacOS/")
set(MACOSX_BUNDLE_ICON_FILE ${LIBSUPERDERPY_GAMENAME}) set(MACOSX_BUNDLE_ICON_FILE ${LIBSUPERDERPY_GAMENAME})
set(MACOSX_BUNDLE_BUNDLE_NAME ${LIBSUPERDERPY_GAMENAME_PRETTY}) set(MACOSX_BUNDLE_BUNDLE_NAME ${LIBSUPERDERPY_GAMENAME_PRETTY})
@ -169,12 +171,10 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
set(EMSCRIPTEN_FLAGS ${EMSCRIPTEN_FLAGS} -s USE_WEBGL2=1) set(EMSCRIPTEN_FLAGS ${EMSCRIPTEN_FLAGS} -s USE_WEBGL2=1)
endif(LIBSUPERDERPY_USE_WEBGL2) endif(LIBSUPERDERPY_USE_WEBGL2)
if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") if(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") # HACK
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/output") set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/output")
endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
endif() endif()
@ -215,7 +215,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
endif(TARGET libsuperderpy-${LIBSUPERDERPY_GAMENAME}) endif(TARGET libsuperderpy-${LIBSUPERDERPY_GAMENAME})
endif (NOT EMSCRIPTEN) endif (NOT EMSCRIPTEN)
install(TARGETS "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) install(TARGETS "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" DESTINATION ${GAMESTATE_INSTALL_DIR})
if (ANDROID) if (ANDROID)
add_dependencies(${LIBSUPERDERPY_GAMENAME}_apk "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}") add_dependencies(${LIBSUPERDERPY_GAMENAME}_apk "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}")