Browse Source

add CPack zips for Windows

pull/1027/head
Trihedraf 5 years ago committed by Anders Jenbo
parent
commit
b12a1cb53e
  1. 4
      .circleci/config.yml
  2. 1
      CMake/mingwcc64.cmake
  3. 76
      CMakeLists.txt

4
.circleci/config.yml

@ -66,7 +66,9 @@ jobs:
- run: Packaging/windows/mingw-prep.sh
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x86.exe}
- store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x86.zip}
windows_x64:
docker:
- image: ubuntu:20.04
@ -82,7 +84,9 @@ jobs:
- run: Packaging/windows/mingw-prep64.sh
- run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc64.cmake
- run: cmake --build build -j $(nproc)
- run: cmake --build build --target package
- store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x64.exe}
- store_artifacts: {path: ./build/devilutionx.zip, destination: devilutionx_x64.zip}
switch:
docker:
- image: devkitpro/devkita64:20200528

1
CMake/mingwcc64.cmake

@ -17,3 +17,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
SET(SYSTEM_BITS x64)

76
CMakeLists.txt

@ -615,7 +615,81 @@ if(SWITCH)
endif()
if(CPACK)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(NOT SYSTEM_BITS MATCHES x64 AND WIN32)
set(CPACK_PACKAGE_FILE_NAME "devilutionx")
set(CPACK_PACKAGE_NAME ${project_name})
set(CPACK_GENERATOR "ZIP")
set(CPACK_STRIP_FILES TRUE)
install(TARGETS ${BIN_TARGET} DESTINATION .)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/windows/README.txt"
DESTINATION "."
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/libfreetype-6.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2-2.0.9/i686-w64-mingw32/bin/SDL2.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_mixer-2.0.4/i686-w64-mingw32/bin/SDL2_mixer.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/SDL2_ttf.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/zlib1.dll"
DESTINATION "."
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.CharisSILB.txt"
DESTINATION "LICENSE"
)
install(FILES "~/repo/SDL2_ttf-2.0.15/i686-w64-mingw32/bin/LICENSE.freetype.txt"
DESTINATION "LICENSE"
)
install(FILES "~/repo/SDL2-2.0.9/README-SDL.txt"
DESTINATION "LICENSE"
)
elseif(SYSTEM_BITS MATCHES x64 AND WIN32)
set(CPACK_PACKAGE_FILE_NAME "devilutionx")
set(CPACK_PACKAGE_NAME ${project_name})
set(CPACK_GENERATOR "ZIP")
set(CPACK_STRIP_FILES TRUE)
install(TARGETS ${BIN_TARGET} DESTINATION .)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/windows/README.txt"
DESTINATION "."
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/libfreetype-6.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2-2.0.9/x86_64-w64-mingw32/bin/SDL2.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_mixer-2.0.4/x86_64-w64-mingw32/bin/SDL2_mixer.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/SDL2_ttf.dll"
DESTINATION "."
)
install(FILES "~/repo/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/zlib1.dll"
DESTINATION "."
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/LICENSE.CharisSILB.txt"
DESTINATION "LICENSE"
)
install(FILES "~/repo/SDL2_ttf-2.0.15/x86_64-w64-mingw32/bin/LICENSE.freetype.txt"
DESTINATION "LICENSE"
)
install(FILES "~/repo/SDL2-2.0.9/README-SDL.txt"
DESTINATION "LICENSE"
)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
string(TOLOWER ${PROJECT_NAME} project_name)
set(CPACK_PACKAGE_NAME ${project_name})
set(CPACK_GENERATOR "7Z")

Loading…
Cancel
Save