games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
9,015 Commits 30 Branches 75 Tags
bbabc991ee7ebf655150b459029507101ec100a1
Commit Graph
202 Commits
Author SHA1 Message Date
Ivan Savenko 1e2793af3a Attempt to fix cmake with older gcc 2022-11-28 23:05:36 +02:00
Ivan Savenko f5f719b78e Enabled -Wmismatched-tags warning for gcc/clang since this apparently 
lead to MSVC linker error
 2022-11-28 21:46:24 +02:00
Andrey Filipenkov c20ae90973 disable tests by default 2022-11-03 11:33:17 +03:00
Andrii Danylchenko 11790c7c02 Merge pull request #1083 from vcmi/fix-android 
Move version definition into a separate cmake file
 2022-10-23 10:39:25 +03:00
Andrii Danylchenko 6ef480971d Move version definition into a separate cmake file 2022-10-22 20:48:38 +03:00
Andrey Filipenkov 002e09fa2d [macOS] set copyright to Info.plist 2022-10-22 16:52:47 +03:00
Andrey Filipenkov c9198311a1 [macOS] set bundle identifier to Info.plist 2022-10-22 16:52:27 +03:00
Andrii Danylchenko b43e0ff9e4 Merge pull request #972 from vcmi/cpp-map-editor 
Cpp map editor
 2022-10-22 12:42:27 +03:00
Andrey Filipenkov f10e5e3b99 [Conan] add iOS support 2022-10-16 13:25:38 +03:00
nordsoft 4cb31ea912 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-08 23:24:57 +04:00
Nordsoft91andAndrey Filipenkov 23f80c58dc Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-10-08 22:55:15 +04:00
Andrey Filipenkov 92dd6d8c17 define app version only in CMakeLists 
now it's propagated to code via macros
 2022-10-04 12:29:38 +03:00
Andrey Filipenkov af1f35779d raise app version in CMakeLists 2022-10-04 11:47:29 +03:00
Andrii Danylchenko d07586ccf6 Merge pull request #1022 from kambala-decapitator/apple-set-app-version 
[Apple] set proper app and build versions
 2022-10-01 20:48:37 +03:00
Andrey Filipenkov b766edb6af [iOS] don't nest AI and scripting libs under subdirectories 
3rd party signing tools may ignore such directory layout
 2022-10-01 12:36:48 +03:00
Andrey Filipenkov 4e1b441399 [macOS] set app and bundle version in app bundle's Info.plist generated by CPack 2022-09-30 13:25:14 +03:00
Andrey Filipenkov 3f61e6f964 [iOS] allow setting custom app name 2022-09-30 12:33:37 +03:00
Andrey Filipenkov 95e3400eb9 raise iOS deployment target to 12.0 2022-09-27 06:31:06 +03:00
Andrey Filipenkov a5b62104d4 remove solved TODOs 2022-09-25 14:11:11 +03:00
nordsoft d32898b39b Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 
# Conflicts:
#	CMakeLists.txt
 2022-09-25 00:58:43 +04:00
Andrey Filipenkov 5f0a8419d3 install scripts directory only when scripting modules are enabled 2022-09-24 15:55:25 +03:00
Andrey Filipenkov 605d5b6481 add dedicated macro when building as single process 
fix kambala-decapitator/vcmi#40
 2022-09-24 15:55:25 +03:00
Andrey Filipenkov 2af7c29163 enable Foundation assertions only in Debug build 2022-09-24 15:55:24 +03:00
Andrey Filipenkov e1c9903a45 extract iOS helpers into a shared lib 2022-09-24 15:55:24 +03:00
Andrey Filipenkov 7b411a5fc4 fix building vcmiERM for iOS 2022-09-24 15:55:24 +03:00
Andrey Filipenkov 902de3af7c CMake cleanup 2022-09-24 15:55:24 +03:00
Andrey Filipenkov 8dcd3146e7 generate zip with ipa structure using cpack 
fix kambala-decapitator/vcmi#6
 2022-09-24 15:55:23 +03:00
Andrey Filipenkov e0244c69a3 add CMake presets for iOS 2022-09-24 15:55:23 +03:00
Andrey Filipenkov 1bb6a20b76 get rid of the custom toolchain 2022-09-24 15:55:23 +03:00
Andrey Filipenkov 5e838008df merge launcher and client 
launcher is a static lib now
 2022-09-24 15:55:22 +03:00
Andrey Filipenkov c6e51852d0 add ability to build VCMI as single process 
"Client process -> shared VCMI lib <- Server process" is turned into "shared Client-VCMI lib -> process <- static Server-VCMI lib"
- adds lib_client and lib_server targets that define distinct namespaces
- lib_client is a dynamic library which is shared with AI libs, lib_server is static
 2022-09-24 15:55:21 +03:00
Andrey Filipenkov ede9f33328 fix linking with FFmpeg 2022-09-24 15:55:20 +03:00
Andrey Filipenkov 3388583089 use component-based install to copy only what's needed for every app 2022-09-24 15:55:20 +03:00
Andrey Filipenkov fae295da88 allow building without codesigning 2022-09-24 15:55:20 +03:00
Andrey Filipenkov 67ef0c234d build Qt launcher, launch Client with it 
kambala-decapitator/vcmi#17
 2022-09-24 15:55:19 +03:00
Andrey Filipenkov 497bf58d32 disable modules 2022-09-24 15:55:19 +03:00
Andrey Filipenkov 5f97bf0be8 debug config in Xcode shouldn't produce dSYM files 2022-09-24 15:55:18 +03:00
Andrey Filipenkov 59fe73e454 some random cleanup 2022-09-24 15:55:18 +03:00
Andrey Filipenkov 7def214740 more Xcode-compatible Info.plist 2022-09-24 15:55:17 +03:00
Andrey Filipenkov 6e41e3154c fix running on device from Xcode 
proper codesigning
 2022-09-24 15:55:17 +03:00
Andrey Filipenkov cfa22c33ad use rpath properly 2022-09-24 15:55:17 +03:00
Andrey Filipenkov b6c4126bed install files after building server/client 
package required files inside app bundle
 2022-09-24 15:55:17 +03:00
Andrey Filipenkov 92a7936202 add Info.plist to sources 2022-09-24 15:55:17 +03:00
Andrey Filipenkov fa90fc0aa4 cosmetics 2022-09-24 15:55:16 +03:00
Andrey Filipenkov d6a92f23aa fix leading whitespace 2022-09-24 15:55:16 +03:00
Andrey Filipenkov 7a50620e61 enable clang modules and framework auto-linking 2022-09-24 15:55:16 +03:00
Andrey Filipenkov b824a90295 initial iOS support to fix building 
tested with Xcode and Unix Makefiles
 2022-09-24 15:55:15 +03:00
Andrii Danylchenko 735c4f149a Update vcpkg, fix QT paths 2022-09-24 10:53:09 +03:00
nordsoft 89d0de53da Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor 
# Conflicts:
#	.github/workflows/github.yml
#	launcher/modManager/cmodlist.cpp
#	lib/CModHandler.cpp
#	lib/CModHandler.h
 2022-09-22 17:09:47 +04:00
Andrii Danylchenko b4d3445559 Merge pull request #971 from kambala-decapitator/fix-warnings 
Fix most project warnings
 2022-09-22 16:05:32 +03:00