diff --git a/cmake/libsuperderpy.cmake b/cmake/libsuperderpy.cmake index 343fc18..10f4c40 100644 --- a/cmake/libsuperderpy.cmake +++ b/cmake/libsuperderpy.cmake @@ -80,13 +80,15 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED) add_definitions(-D_Noreturn=) endif(MAEMO5) + set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + 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(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") + set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin/${LIBSUPERDERPY_GAMENAME}.app/Contents/MacOS/") + set(MACOSX_BUNDLE_ICON_FILE ${LIBSUPERDERPY_GAMENAME}) 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) 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") endif(CMAKE_INSTALL_PREFIX MATCHES "/usr/local") - set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") - set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") - set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + set(GAMESTATE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}") endif() @@ -215,7 +215,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED) endif(TARGET libsuperderpy-${LIBSUPERDERPY_GAMENAME}) 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) add_dependencies(${LIBSUPERDERPY_GAMENAME}_apk "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}")