Commit Graph

5881 Commits

Author SHA1 Message Date
pavanvo b21a853e70 Merge branch 'windows-cmake-msbuild' of https://github.com/MegaGlest/megaglest-source into build/windows_cmake_msbuild 2022-09-06 20:51:41 +04:00
Jammyjamjamman 3fd6ccd247 More instructions 2022-08-31 00:44:19 +01:00
pavanvo 935be6fc8f
Merge branch 'feat/hotkeys_rebase' into build/windows_cmake_msbuild 2022-08-25 06:55:11 +04:00
James Sherratt c46d1260f5 Tidy up 2022-08-24 23:26:25 +01:00
James Sherratt 1c8a6f3d8b Fix SSE check and cleanup 2022-08-24 23:26:25 +01:00
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
pavanvo d5f15d2c72 Revert "refactor: remove some useless code,"
This reverts commit afc26199f7.
2022-08-18 05:57:20 +04:00
pavanvo 8caa800ee1
fix: reset command position for non-target commands 2022-08-16 22:00:31 +04:00
pavanvo aec7bf5c80
fix: reset command position for build commands 2022-08-16 21:59:41 +04:00
pavanvo ea3ede3c08
refactor: remove incompatible code,
code blocking switching from attack to anothe command
2022-08-16 21:58:18 +04:00
pavanvo afc26199f7
refactor: remove some useless code,
since we removed this hotkeys, we don't need this code any more
2022-08-16 21:56:36 +04: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 a5438f6a93 Use the cancel icon for the unused grid locations 2022-08-14 13:38:16 +02:00
Jammyjamjamman e277c47583 Add key mappings to docs 2022-08-14 13:38:16 +02:00
pavanvo 5523bba192 refactor: command sorting code 2022-08-14 13:38:16 +02:00
pavanvo f2b8d76383 fix: if two build buttons, move second to basics 2022-08-14 13:38:16 +02:00
pavanvo f1e4a1bf83 feat: standart for cammand grid 2022-08-14 13:38:15 +02:00
Rampoina 46d5904578 Bump Command Keys to 12
Otherwise some units in the game don't have enough hotkeys like the
ballista.
Moves the hotkey for attacking units to ,
Moves the hotkey for font cOlor to O
2022-08-14 12:26:38 +02:00
Rampoina e209dcbd35 Fix numberCommands
It wasn't updated correctly for units with morphing abilities
2022-08-14 12:26:38 +02:00
Rampoina 7945fa8c80 Remove key conflics
Move back the camera hotkeys to a and d, this means that the equivalent command
hotkeys won't be usable in free camera mode
2022-08-14 12:26:38 +02:00
Rampoina c4caa6b912 Display hotkey on hover 2022-08-14 12:26:38 +02:00
Rampoina c549a6b66c Correctly update numberCommands 2022-08-14 12:26:38 +02:00
Rampoina 9276faeeb5 Update the GUI immediately after calling the command from a hotkey
Otherwise the gui takes a bit to update
2022-08-14 12:26:38 +02:00
Rampoina 3313f187bb Rename HotKeyBuildN to CommandKeyN 2022-08-14 12:26:38 +02:00
Rampoina 1922522009 Rename commonCommands to numberCommands 2022-08-14 12:26:38 +02:00
Rampoina c3e8a25e9e Update commonCommands for a uniform selection 2022-08-14 12:26:38 +02:00
Rampoina 2cd190d822 Retabulate (use only tabs) 2022-08-14 12:26:38 +02:00
Rampoina f322a3ee52 Add command grid hotkeys to the default hotkeys 2022-08-14 12:26:38 +02:00
Rampoina 5783db3033 Check the number of shared commands before trying to click from a hotkey 2022-08-14 12:26:38 +02:00
Rampoina e9b771241f Add building and unit hotkeys 2022-08-14 12:26:38 +02:00