games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-28 03:57:02 +02:00
Code Issues Releases Activity
12,112 Commits 22 Branches 65 Tags
Commit Graph

274 Commits

Author SHA1 Message Date
Arseniy Shestakov
8577bba417 CMake: add workaround for Visual Studio 2015 linking issue 
I tried to workaround it in code, but completely failed that.
So for now we'll just tell linker to ignore multiple definitions.
 2018-03-29 02:02:00 +07:00
Arseniy Shestakov
e48797f7e8 CMake: enable /MP flag by default for Visual Studio solution 
Can be toggled with ENABLE_MULTI_PROCESS_BUILDS option to CMake
 2018-02-28 22:30:31 +08:00
Arseniy Shestakov
734441eb3b CMake: use CMAKE_DL_LIBS on Linux for linking with GNU gold 
Gold only link what explicitly specified and we use dlopen.
 2018-02-18 15:15:19 +08:00
Ivan Romanov
3c1c72319b CMake: update version on each compiling 2018-02-11 13:52:29 +03:00
Arseniy Shestakov
940c8a0b82 CMake: add $ORIGIN into RPATH for single-directory installation 
End up that single-directory installation is useful for Snap package.
 2017-09-08 03:43:44 +03:00
Arseniy Shestakov
610740011c CMake: print useful debug information on every build 
That way we don't need to ask more questions regarding system where build failed.
 2017-09-06 13:15:49 +03:00
Arseniy Shestakov
8180e4d5c5 VCMIDirs: improvements for development on Mac and Linux 
Also added /usr/share/games in VCMIDirsXDG::dataPaths for mantis#2189.
 2017-08-25 08:43:27 +03:00
Arseniy Shestakov
dfe781945b CMake: try to enable automated DS_Store generation for Mac 
We should see in AppleScript from CMake would work on Travis CI.
Also use VCMI as volume name of DMG for now and update pre-generated DS_Store for it.
 2017-08-21 17:04:53 +03:00
Dydzio
906bd7fc71 Fix CMake MSVS build problem (#366) 
* Fix CMake MSVS 2015 boost linking problem
Same errors as here when building vcmi client and server: https://stackoverflow.com/questions/27196312/boost-1-57-0-program-options-msvs-2013-linker-error
Fix based on: https://groups.google.com/forum/#!topic/boost-list/Lhqvoet8N18

* Compile fix for VS 2017.3 due to incompatibility with variadic templates in Boost

https://developercommunity.visualstudio.com/content/problem/69009/compilation-error-on-msvc2015-on-boostbase-from-me.html
 2017-08-18 23:11:11 +03:00
Arseniy Shestakov
5fce56d23e CMake: add ENABLE_DEBUG_CONSOLE option for Windows enabled by default 
For now we'll keep console, but in future we need a way to toggle it at runtime.
 2017-08-16 23:45:38 +03:00
Arseniy Shestakov
03c7bf5ee6 CMake: installer building improvements for Windows 
- Implement support for BundleUtilities when Vcpkg is used
- Add some hacky code to copy Qt plugins install directory
- Use same icon for launcher as used for VCMI, launcher one is ugly
 2017-08-16 18:34:46 +03:00
Arseniy Shestakov
adbfa09e31 CMake: restore some of old MinGW code and improve ENABLE_PCH option 
- MinGW: restore DLL deploy for MXE builds
- MinGW: restore linking options for: dbghelp, mswsock, iconv, etc
- MinGW: build with -Og when Debug is used to avoid crashes / freezes
- Cotire: when ENABLE_PCH is OFF we won't include Cotire at all
- FuzzyLite: enable FORCE_BUNDLED_FL by default for Linux to avoid FL5 usage
- Remove Version.cpp from lib source list so it's won't appear in projects
- Add option ENABLE_GITVERSION to disable Version.cpp usage
 2017-08-16 16:12:36 +03:00
Arseniy Shestakov
2b3a467728 CMake: structure changes and other small improvements 
- Now cmake_minimum_required used properly and set to 2.8.12
- cmake_modules/CMakeCPackOptions.cmake.in is removed
 2017-08-16 16:10:08 +03:00
Arseniy Shestakov
40af43c46e CMake: massive rework for Mac build and other improvements 
- macOS: RPATH-related code all removed or disabled
- macOS: new osx/CMakeLists.txt to run some install-code running after all subdirectories
- Assets copying into the runtime output directory implemented for Mac and Linux development
 2017-08-16 16:10:07 +03:00
Arseniy Shestakov
7dca95c8cc CMake: multiple improvements for builds and project generation 
- Change default build output directory name from "build" to "bin"
- Implement new function vcmi_get_cmake_debug_info
- Link client with SDL2main on Windows and disable debug console
- Remove all old MinGW-specific options since they outdated and MXE work fine
- Set AUTOGEN_TARGETS_FOLDER for better Xcode and Visual Studio projects
- Remove useless vcmitestFiles custom target for less garbage in project files
 2017-08-16 16:10:07 +03:00
Arseniy Shestakov
56f89270db macOS: full rework of Mac packaging process 
- Most of outdated CMakeLists code removed.
- All Mac-specific code is removed include Sparkle support and vcmibuilder app.
- DMG buidling reimplemented using macdeployqt command.
 2017-08-16 16:10:07 +03:00
Arseniy Shestakov
193f492b99 CMake: cleanup, project generation and other improvements 
- Use EXCLUDE_FROM_ALL for FuzzyLite and GoogleTest to avoid inclusion of unneded headers and libraries into installers.
- Set minimum CMake version only in main CMakeLists.txt
- Set project name only in main CMakeLists.txt
- Visual Studio: add assign_source_group function to generate proper filesystem tree
- Visual Studio: set PROJECT_LABEL so generated projects have same names binaries on Windows
- Visual Studio: enabled USE_FOLDERS for projects grouping. This also possibly affect other IDEs.
- Added add_subdirectory_with_folder function to make sure 3rd-party libraries are affected by USE_FOLDERS.
 2017-08-16 16:10:07 +03:00
Arseniy Shestakov
440226f7af CMake: use dynamic linking for Boost 2017-08-16 16:10:07 +03:00
Arseniy Shestakov
1b9daecd27 CMake: remove Boost.Test requirement 2017-07-22 03:19:17 +03:00
Arseniy Shestakov
6abc88c2bf CMake: set _WIN32_WINNT to 0x0600 for FuzzyLite 6 
Now CMake builds will require Windows Vista or newer
 2017-07-14 21:35:49 +03:00
Victor Luchits
30cc2f6a01 Change the output path for cmake so all files go into the same root directory 2017-07-07 13:08:53 +03:00
Alex Dunn
34058f1396 macOS: turn Sparkle off by default (#327) 2017-07-06 09:09:30 +03:00
Arseniy Shestakov
01a1353fe1 Cleanup: remove old editor code and adjust related project files 
It's useless and will fail build if accidentally enabled in CMake.
For anyone interested it's always available in git history.
 2017-07-03 21:59:57 +03:00
Arseniy Shestakov
0c7eeeaa5c Travis CI: update config and upload artifacts after build 2017-06-13 20:32:43 +03:00
Arseniy Shestakov
6c8aa6e938 Linux version bump for 0.99 2016-11-01 20:45:50 +03:00
Vadim Markovtsev
da1c9cf249 Fix rebuilding everything on HEAD change 2016-10-23 16:56:53 +02:00
Vadim Markovtsev
d0beb27197 Add git commit hash into the version string 2016-10-23 15:45:47 +02:00
Vadim Markovtsev
0e9e93e14e [WIP] macOS Travis / #2553 2016-10-12 11:35:40 +02:00
Arseniy Shestakov
6e5ad22efc Revert "CMake: add usage of ccache if it's available" 
This reverts commit 2576dd4692f95221226cc9e2f119a12641f41b2b.

Unfortunately I didn't manage to fix older combination of CMake+Clang with ccache.
Newer version of Clang that I use can't compile older FuzzyLite from VCMI repository anyway.
 2016-09-28 08:26:31 +03:00
Arseniy Shestakov
2576dd4692 CMake: add usage of ccache if it's available 
ccache obviously don't give any real betefit with PCH, but still nice option to test.
 2016-09-27 08:36:52 +03:00
AlexVinS
37d0dad70a Merge branch 'develop' into feature/VCMIMapFormat1 
Conflicts:
	lib/CArtHandler.cpp
 2016-01-01 20:28:52 +03:00
ArseniyShestakov
4124aacac8 CMake: add dbghelp to SYSTEM_LIBS for MiniDumpWriteDump. Fix issue 2312 2015-12-22 00:08:49 +03:00
AlexVinS
c53718a0d5 Enabled unit test by default 2015-12-05 12:06:37 +03:00
AlexVinS
108d4c39b5 Fix build 2015-09-24 11:55:23 +03:00
Sandy Carter
1b3c3ee9ca Add UseDoxygen to cmake 
Allow use of cmake . && make doc
Requires UseDoxygen.cmake from http://tobias.rautenkranz.ch/cmake/doxygen/
 2015-08-22 12:49:27 -04:00
AlexVinS
39db232f1b remove sdl1 from cmake files 2015-06-21 01:59:34 +03:00
Dmitry Marakasov
093ad29ae1 More portable libdl handling 2015-04-09 13:19:44 +03:00
Mikhail Paulyshka
9fd51e0219 version bump for Linux 2015-04-01 23:21:36 +03:00
Ivan Savenko
356b6ab34a A bit delayed, but still - Linux version bump 2014-11-11 22:59:26 +02:00
Mikhail Paulyshka
7887a750cf suppress some warnings 2014-11-02 23:43:40 +03:00
Mikhail Paulyshka
2047a66bd9 install MSVC runtime 
copy libEGL and libGLESv2 only for MSVC
 2014-10-12 18:03:47 +03:00
Mikhail Paulyshka
dcba7a6316 move minizip detection to module 2014-10-12 16:50:39 +03:00
Mikhail Paulyshka
fff8e10a63 copy libEGL and libGLESv2 for MSVC build 
copy debug version of Qt libraries when build type is debug for MinGW
 2014-10-12 16:40:24 +03:00
Mikhail Paulyshka
514045b259 add settings for MSVC 
small reorganizing in /CMakeLists.txt
 2014-10-12 16:38:53 +03:00
Mikhail Paulyshka
53e2719ca4 update cotire 2014-10-12 16:37:10 +03:00
josch
9bef590960 use system version of minizip 2014-09-02 17:00:20 +02:00
beegee1
12126754fb - added all SDL2 directories to CMake (in case if any SDL2 module is installed somewhere else) 2014-08-04 20:35:23 +02:00
Ivan Savenko
c23261ac0a Removed references to WoG files from CMake 2014-07-26 11:51:44 +03:00
Ivan Savenko
4fca583062 Merge pull request #29 from Mixaill/nsis 
CMake: add NSIS generator settings
 2014-07-18 00:56:46 +03:00
Michael Pavlyshko
a6e590f220 cpack/nsis: do not strip files 2014-07-17 23:11:09 +03:00