Commit Graph

5852 Commits

Author SHA1 Message Date
James Sherratt 0a0ca7507d Fix windows g3d xml tools build 2022-08-24 23:26:25 +01:00
James Sherratt 2a81312f0d fix workflow 2022-08-24 23:26:25 +01:00
James Sherratt 35ca64f26d some more improvements 2022-08-24 23:26:25 +01:00
James Sherratt 1514f5f19c Improve build script 2022-08-24 23:26:24 +01:00
Jammyjamjamman cbb4b261a8 Fix for windows + older linux distros 2022-08-24 23:26:24 +01:00
Jammyjamjamman db8d2dd355 Fix cmake-clang for macos
* Also fix for ubuntu 18, by decreasing required cmake version.
2022-08-24 23:26:24 +01:00
Jammyjamjamman c5245a9e73 More fixes to cmake builds
- Add icons to windows exes.
- Revert removal of CurlGetConfig.cmake. This is still required in
ubuntu. (Perhaps only for static builds.)
2022-08-24 23:26:24 +01:00
Jammyjamjamman e9b554c2b4 Windows build script: Remove unnecessary multithread build flag. 2022-08-24 23:26:24 +01:00
Jammyjamjamman 6723924b5b Fix map editor and g3d viewer build for linux and macos 2022-08-24 23:26:24 +01:00
Jammyjamjamman a3a3afc0f0 Fix build script errors
No longer errors when vcpkg path not specified.
2022-08-24 23:26:24 +01:00
Jammyjamjamman ce0345854c New windows build helper scripts
* build-mg-vs-cmake.ps1 to build mg.
* clean-all.ps1 to clean mg.
* install-deps-vcpkg.ps1
* .gitignore ignores build and vcpkg folders.
2022-08-24 23:26:24 +01:00
Jammyjamjamman b405ce86ca Get map editor and model viewer building with VS cmake builds
* Map editor and model viewer build, but only as "Release" build.
* Unwanted flags not set for msbuild, such as FPIC, -g3, -O3, -sse...
* Wanted flags set for msbuild e.g. /arch:SSE2 /fp:fast -D__SSE__
-D__SSE2__
* Allow including wx, used for vcpkg wx.
* Mapeditor is WIN32 exe for VS_BUILD. (Not sure why this is needed...)
* g3d viewer and map editor mains edited to remove unnecessary windows-
only code(, for strings).
2022-08-24 23:26:24 +01:00
Jammyjamjamman 523229ab55 More progress with cmake for Visual Studio projects
* Change conditon so that L137 onwards of main CMakelists.txt is
executed fro VS project target. Main reason to do this was to make sure
project actually built with streflop.
* Change conditions after L137 so unwanted compile flags aren't added.
* Project now builds multi threaded for VS project. Tries to use max
number of cores.
* Simplify cxx flags. Remove unneeded MT and MTd flags.
* Set VS build output to mk/windoze.
* Add FPUSettings.asm to streflop in cmake, if VS project specified.
* Remove STREFLOP compile definitions. Not needed now streflop is
configured properly.
* Simplify cmake by adding "VS_BUILD" variable, instead of doing string
comparisons all the time to check if is "Visual Studio" target.
2022-08-24 23:26:24 +01:00
Jammyjamjamman c6a632c33c Fix for linux and mac 2022-08-24 23:26:24 +01:00
Jammyjamjamman 1e8ff3642c Cmake: Add build configuration for VS builds
* Build vs 2019 project using cmake.
* Cmake configured to work in windows. Hopefully still works in linux
too!
* Update vcpkg install script.
* Configures build for MG game release or debug mode.
* Still need to fix building mapeditor and g3d viewer.
* Remove CurlGetConfig.cmake (not needed!)
2022-08-24 23:26:24 +01:00
Jammyjamjamman dd7139ee10 Add script to install build deps using vcpkg. 2022-08-24 23:26:24 +01:00
titiger 08cf0c49fb
Merge pull request #243 from Rampoina/loadMenuDoubleClick
Load the game on double click on the loading menu.
2022-08-24 23:09:03 +02:00
titiger e10a60ea6f
Merge pull request #244 from Rampoina/saveProgress
Fix unit/building progress not getting restored when loading a game
2022-08-23 01:23:23 +02:00
Rampoina 332780950b Fix unit/building progress not getting restored when loading a game 2022-08-23 00:07:20 +01:00
Andy Alt 77d696138a
workflows/cmake.yml:add tests for recent gcc versions;migrate to checkoutv3 (#250)
* workflows/cmake.yml:test on Ubuntu Jammy (22.04);migrate to checkoutv3

This should also fix #247

* maybe fix ssh link error on Ubuntu Jammy

gcc and clang build is failing on Jammy with the message:

'cannot find -lssh: No such file or directory'

Basically I added libcurl-openssl-dev to the deps

* remove libcurl4-gnutls-dev

Trying to correct:

 The following packages have unmet dependencies:
libcurl4-gnutls-dev : Conflicts: libcurl4-openssl-dev but
7.81.0-1ubuntu1.3 is to be installed
libcurl4-openssl-dev : Conflicts: libcurl4-gnutls-dev but
7.81.0-1ubuntu1.3 is to be installed
E: Unable to correct problems, you have held broken packages.
An error occurred while installing build dependencies.

* use cmake FindCURL module

* for OpenSSL, use include instead of find_package

* remove jammy, add gcc-10 and 11 test

* revert now-unrelated changes

* clean-up

* add VERBOSE flag to make

* Update .github/workflows/cmake.yml

* Update .github/workflows/cmake.yml

* use '-f' option from build script to force clang

* force dynamic libs with '-d'

fixes #251

* mk/linux/setupBuildDeps.sh:fix script so 22.04 is detected

*remove vlc deps (not required for the CI)
*remove ubuntu-18.04 from the build matrix, see
https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/

* revert removal of commented macos jobs

* run apt-get update and upgrade

* cleanup Prep snapshot section
2022-08-20 23:29:38 +01:00
Rampoina 00fc8bcee3 Add missing check for the selected button 2022-08-15 01:44:37 +02:00
Andy Alt e63d8142dc
.github/workflows/cmake.yml:cancel in progress jobs if newer job is started (#248) 2022-08-14 22:41:35 +01:00
Rampoina 3b03b458e5 Load the game on double click on the loading menu 2022-08-09 21:14:10 +02:00
Rampoina 22a474b93b
Allow a selected group to have the attack command even if some units … (#217)
* Allow a selected group to have the attack command even if some units don't have it

* Add getUnitFromCC function

* return NULL if getFirstCtOfClass founds no unit

* Search for the unit containing the attack command in a non uniform selection

Co-authored-by: Rampoina <Rampoina@protonmail.com>
2022-08-08 23:26:47 +01:00
Jammyjamjamman 94fa13cde7 Update data submodule 2022-07-30 20:20:01 +01:00
James Sherratt ebecdbb5ed
try vs 2022 2022-07-28 18:51:38 +01:00
NetSysFire 873217577a
Replace some http links with https (#211)
* Replace working http links with https

* downloads also has working https

* forum also has working https

* Fix get_started link

* fix get_started link

Co-authored-by: James Sherratt <jdsherratt3@gmail.com>
2022-07-20 22:59:09 +01:00
titiger 1e4441e099 data was changed 2022-03-02 01:05:39 +01:00
titiger 04bd8e8038 new norse faces 2022-02-16 00:03:39 +01:00
titiger e3af470288 Level up should not be effect boosts 2021-11-23 18:17:45 +01:00
Jammyjamjamman 3c0858318d Fix colours in endgame statistics.
Text colours where the colour wasn't explicitly set was rendering as the
previous (incorrect) colour instead of white. Now text colour is
explicitly set.
2021-11-09 21:48:38 +00:00
titiger ae5e308a28 set meeting point for whole selection ( via icon ) 2021-10-06 23:40:18 +02:00
titiger f344fa7fbd Fixed mixed upgrades and boosts of EP and HP regeneration 2021-09-13 22:33:47 +02:00
Jammyjamjamman 680c868aa9 FTGL required + Manjaro wx package corrected to wxgtk-common
Fixes bugs found in iss #206. Building without FTGL fails and the error
is confusing. So we'll fail at the cmake stage (suggested by andy5995).
People who don't want it can disable this at their own peril! ;-)
2021-07-14 22:28:06 +01:00
Jammyjamjamman 0e5d3a2d49 Add macos workflow
Macos workflow does not work atm, so it's commented out. But this shows
the general idea of how it should work.
2021-07-02 19:49:53 +01:00
Jammyjamjamman 367c6e61ec More improvements to actions
* Better naming for "preparing snapshot".
* Strip debug info on linux builds for artifact, to make smaller.
2021-06-20 22:56:41 +01:00
Jammyjamjamman d18cbac6d4 Another fix to artifact generation 2021-06-20 18:00:21 +01:00
Jammyjamjamman ecbddb4137 More fixes to artifact generation 2021-06-20 16:22:43 +01:00
Jammyjamjamman 3bf6bffa7d Continue attempting other builds, even if one fails 2021-06-20 03:38:01 +01:00
Jammyjamjamman d357ff859e Another fix to the actions yml... 2021-06-20 02:24:13 +01:00
Jammyjamjamman 8cc3b515b4 Hopefullly last actions fix 2021-06-20 02:15:55 +01:00
Jammyjamjamman ade0bffc37 Another actions yml fix 2021-06-20 02:14:04 +01:00
Jammyjamjamman 51cdfd8382 Fix actions yml (again) 2021-06-20 02:11:38 +01:00
Jammyjamjamman 5032f6c266 Add Linux to actions 2021-06-20 02:03:46 +01:00
Jammyjamjamman 9224a72651 Fix gh action artifacts 2021-06-18 21:24:55 +01:00
titiger 4e532db6dd Food shortage warning sound
General sound to warn about consumable resources shortage
2021-06-18 17:25:37 +02:00
Jammyjamjamman fdf77e846e Attempt #3 to fix Github action 2021-06-18 02:03:30 +01:00
Jammyjamjamman d48d0870f1 Another fix for Github actions 2021-06-18 01:43:59 +01:00
Jammyjamjamman 64b0a3e33a Fix Github actions yml 2021-06-18 01:27:58 +01:00
Jammyjamjamman 5b01dd4841 Github actions: Get more windows deps, tidy up yml 2021-06-18 01:24:22 +01:00