backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Fix regressions with the windows packing

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-08-22 13:05:35 +02:00
parent 25641ac20e
commit 8ed8dd612e
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -27,11 +27,6 @@ include_directories ("${PROJECT_BINARY_DIR}/include")
file (GLOB_RECURSE sources src/*.cxx src/*.h) file (GLOB_RECURSE sources src/*.cxx src/*.h)
file (GLOB_RECURSE po resources/po/*.po) file (GLOB_RECURSE po resources/po/*.po)
if (MINGW)
file (GLOB_RECURSE rc resources/win32/*.rc)
list (APPEND sources ${rc})
endif (MINGW)
if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM) if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM)
set (USE_APPIMAGE ON) set (USE_APPIMAGE ON)
endif () endif ()
@ -78,6 +73,14 @@ endif ()
# Windows stuff # Windows stuff
if (MINGW) if (MINGW)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/resources/win32/planetblupi.rc.in"
"${CMAKE_BINARY_DIR}/planetblupi.rc"
@ONLY
)
list (APPEND sources "${CMAKE_BINARY_DIR}/planetblupi.rc")
set (CMAKE_RC_COMPILER_INIT windres) set (CMAKE_RC_COMPILER_INIT windres)
enable_language (RC) enable_language (RC)
set (CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") set (CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
@ -103,6 +106,8 @@ pkg_search_module (AVUTIL REQUIRED libavutil)
pkg_search_module (SWSCALE REQUIRED libswscale) pkg_search_module (SWSCALE REQUIRED libswscale)
pkg_search_module (SWRESAMPLE REQUIRED libswresample) pkg_search_module (SWRESAMPLE REQUIRED libswresample)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB")
################## ##################
## SDL_kitchensink ## SDL_kitchensink
################## ##################
@ -224,6 +229,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX}) set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX})
APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi") APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi")
elseif (MINGW) elseif (MINGW)
set (CPACK_PACKAGE_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}")
set (CPACK_GENERATOR "NSIS64") set (CPACK_GENERATOR "NSIS64")
set (CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\resources\\\\nsis\\\\installer.bmp") set (CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\resources\\\\nsis\\\\installer.bmp")
set (CPACK_NSIS_COMPRESSOR "/SOLID lzma") set (CPACK_NSIS_COMPRESSOR "/SOLID lzma")

0
resources/win32/planetblupi.rc → resources/win32/planetblupi.rc.in
View File