mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-21 17:17:06 +02:00
Use new prebuilts package
This commit is contained in:
Ivan Savenko
parent
2d2bc8293f
commit
501622229d
26
.github/workflows/github.yml
vendored
26
.github/workflows/github.yml
vendored
@ -78,45 +78,43 @@ jobs:
|
||||
extension: exe
|
||||
before_install: msvc.sh
|
||||
preset: windows-msvc-release
|
||||
- platform: mingw
|
||||
- platform: mingw_x86_64
|
||||
os: ubuntu-24.04
|
||||
test: 0
|
||||
pack: 1
|
||||
pack_type: Release
|
||||
extension: exe
|
||||
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
|
||||
cmake_args: -G Ninja
|
||||
before_install: mingw_x86_64.sh
|
||||
preset: windows-mingw-conan-linux
|
||||
conan_profile: mingw64-linux.jinja
|
||||
conan_prebuilts: dependencies-mingw
|
||||
- platform: mingw-32
|
||||
conan_prebuilts: dependencies-mingw-x86-64
|
||||
- platform: mingw_x86
|
||||
os: ubuntu-24.04
|
||||
test: 0
|
||||
pack: 1
|
||||
pack_type: Release
|
||||
extension: exe
|
||||
cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis`
|
||||
cmake_args: -G Ninja
|
||||
before_install: mingw_x86.sh
|
||||
preset: windows-mingw-conan-linux
|
||||
conan_profile: mingw32-linux.jinja
|
||||
conan_prebuilts: dependencies-mingw-32
|
||||
conan_prebuilts: dependencies-mingw-x86
|
||||
- platform: android-32
|
||||
os: macos-14
|
||||
os: ubuntu-24.04
|
||||
extension: apk
|
||||
preset: android-conan-ninja-release
|
||||
conan_profile: android-32
|
||||
conan_prebuilts: dependencies-android-32
|
||||
conan_options: --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
|
||||
before_install: android.sh
|
||||
conan_profile: android-32-ndk
|
||||
conan_prebuilts: dependencies-android-armeabi-v7a
|
||||
artifact_platform: armeabi-v7a
|
||||
- platform: android-64
|
||||
os: macos-14
|
||||
os: ubuntu-24.04
|
||||
extension: apk
|
||||
preset: android-conan-ninja-release
|
||||
conan_profile: android-64
|
||||
conan_prebuilts: dependencies-android-64
|
||||
conan_options: --conf tools.android:ndk_path=$ANDROID_NDK_ROOT
|
||||
before_install: android.sh
|
||||
conan_profile: android-64-ndk
|
||||
conan_prebuilts: dependencies-android-arm64-v8a
|
||||
artifact_platform: arm64-v8a
|
||||
runs-on: ${{ matrix.os }}
|
||||
defaults:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
RELEASE_TAG="1.2"
|
||||
RELEASE_TAG="1.3"
|
||||
FILENAME="$1"
|
||||
DOWNLOAD_URL="https://github.com/vcmi/vcmi-dependencies/releases/download/$RELEASE_TAG/$FILENAME.txz"
|
||||
|
||||
|
||||
@ -180,11 +180,6 @@ else()
|
||||
add_definitions(-DVCMI_NO_EXTRA_VERSION)
|
||||
endif(ENABLE_GITVERSION)
|
||||
|
||||
# Precompiled header configuration
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 )
|
||||
set(ENABLE_PCH OFF) # broken
|
||||
endif()
|
||||
|
||||
if(ENABLE_PCH)
|
||||
macro(enable_pch name)
|
||||
target_precompile_headers(${name} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:<StdInc.h$<ANGLE-R>>)
|
||||
@ -328,7 +323,6 @@ if(MINGW OR MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244") # 4244: conversion from 'xxx' to 'yyy', possible loss of data
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") # 4267: conversion from 'xxx' to 'yyy', possible loss of data
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") # 4275: non dll-interface class 'xxx' used as base for dll-interface class
|
||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800") # 4800: implicit conversion from 'xxx' to bool. Possible information loss
|
||||
|
||||
if(ENABLE_STRICT_COMPILATION)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") # Treats all compiler warnings as errors
|
||||
@ -493,14 +487,23 @@ if (ENABLE_CLIENT)
|
||||
if(TARGET SDL2_image::SDL2_image)
|
||||
add_library(SDL2::Image ALIAS SDL2_image::SDL2_image)
|
||||
endif()
|
||||
if(TARGET SDL2_image::SDL2_image-static)
|
||||
add_library(SDL2::Image ALIAS SDL2_image::SDL2_image-static)
|
||||
endif()
|
||||
find_package(SDL2_mixer REQUIRED)
|
||||
if(TARGET SDL2_mixer::SDL2_mixer)
|
||||
add_library(SDL2::Mixer ALIAS SDL2_mixer::SDL2_mixer)
|
||||
endif()
|
||||
if(TARGET SDL2_mixer::SDL2_mixer-static)
|
||||
add_library(SDL2::Mixer ALIAS SDL2_mixer::SDL2_mixer-static)
|
||||
endif()
|
||||
find_package(SDL2_ttf REQUIRED)
|
||||
if(TARGET SDL2_ttf::SDL2_ttf)
|
||||
add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf)
|
||||
endif()
|
||||
if(TARGET SDL2_ttf::SDL2_ttf-static)
|
||||
add_library(SDL2::TTF ALIAS SDL2_ttf::SDL2_ttf-static)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(ENABLE_LOBBY)
|
||||
@ -727,7 +730,7 @@ endif()
|
||||
|
||||
if(WIN32)
|
||||
if(TBB_FOUND AND MSVC)
|
||||
install_vcpkg_imported_tgt(TBB::tbb)
|
||||
install_vcpkg_imported_tgt(TBB::tbb)
|
||||
endif()
|
||||
|
||||
if(USING_CONAN)
|
||||
@ -737,7 +740,8 @@ if(WIN32)
|
||||
${dep_files}
|
||||
"${CMAKE_SYSROOT}/bin/*.dll"
|
||||
"${CMAKE_SYSROOT}/lib/*.dll"
|
||||
"${CONAN_SYSTEM_LIBRARY_LOCATION}/*.dll")
|
||||
"${CONAN_SYSTEM_LIBRARY_LOCATION}/libgcc_s_seh-1.dll"
|
||||
"${CONAN_SYSTEM_LIBRARY_LOCATION}/libstdc++-6.dll")
|
||||
else()
|
||||
file(GLOB dep_files
|
||||
${dep_files}
|
||||
|
||||
@ -47,9 +47,7 @@ class VCMI(ConanFile):
|
||||
self.options["freetype"].shared = self.settings.os == "Android"
|
||||
|
||||
# SDL_image and Qt depend on it, in iOS both are static
|
||||
# Enable static libpng due to https://github.com/conan-io/conan-center-index/issues/15440,
|
||||
# which leads to VCMI crashes of MinGW
|
||||
self.options["libpng"].shared = not (self.settings.os == "Windows" and cross_building(self)) and self.settings.os != "iOS"
|
||||
self.options["libpng"].shared = not self.settings.os != "iOS"
|
||||
# static Qt for iOS is the only viable option at the moment
|
||||
self.options["qt"].shared = self.settings.os != "iOS"
|
||||
|
||||
@ -173,12 +171,12 @@ class VCMI(ConanFile):
|
||||
self.options["sdl"].vulkan = False
|
||||
|
||||
# bmp, png are the only ones that needs to be supported
|
||||
# pcx is also enabled since some people might use it due to H3 using format named 'pcx' (but unrelated to sdl_image pcx)
|
||||
# dds support may be useful for HD edition, but not supported by sdl_image at the moment
|
||||
self.options["sdl_image"].gif = False
|
||||
self.options["sdl_image"].lbm = False
|
||||
self.options["sdl_image"].pnm = False
|
||||
self.options["sdl_image"].qoi = False
|
||||
self.options["sdl_image"].pcx = False
|
||||
#self.options["sdl_image"].qoi = False # sdl_image >=2.6
|
||||
self.options["sdl_image"].svg = False
|
||||
self.options["sdl_image"].tga = False
|
||||
self.options["sdl_image"].with_libjpeg = False
|
||||
|
||||
Loading…
Reference in New Issue
Block a user