Commit Graph

1053 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 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 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 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 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
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 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 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 3313f187bb Rename HotKeyBuildN to CommandKeyN 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
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
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
SoftCoder 4654f69598 - attempt to see if this makes editors compile in debian sid 2020-08-20 15:16:37 -07:00
SoftCoder 4bdb45e96e - Add support for PopOs and disable VLC support by default in CMake build 2020-08-19 19:14:23 -07:00
titiger 0917cbbb82 fix for ubuntu 20.04 2020-05-12 00:24:39 +02:00
titiger 5d811c0d76 dependencies for ubuntu 20.04 2020-05-11 21:29:58 +02:00
Aleksei Gridnev efbca14747
Update setupBuildDeps.sh
Adding support for Raspbian (I installed all the dependencies for compiling Megaglest on Raspberry Pi 4 by simply substituting Debian with Raspbian in this script, as they are, essentially, the same system; it worked without any additional tweaks).
2020-01-25 21:45:11 +01:00
titiger 95b185bd10 ManjaroLinux needs static libs too 2019-10-21 23:25:11 +02:00
titiger 0a9a629bb0 trying to fix the windows build 2018-07-07 02:04:03 +02:00
titiger feb2f3fe3d first steps for xml based achievements 2018-07-07 01:36:53 +02:00
Tom Reynolds 889e247406 create LOG_DIR before accessing it 2018-06-20 22:57:00 +02:00
SoftCoder db6b5c4355 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2018-03-19 07:47:16 -07:00
SoftCoder 959ea8fcf6 - added ubuntu 18.04 support to deps 2018-03-19 07:46:50 -07:00
Tom Reynolds 6e8cdcab01 Make indenting great again (and add missing fi) 2018-02-25 12:21:02 +01:00
SoftCoder 87a9c4c069 - automatically adjust megaglest binary to shim if detected 2017-10-10 00:28:44 -07:00
SoftCoder ab3b70f36a - fix windows build and better automation for building steam shim 2017-10-09 23:53:43 -07:00
SoftCoder da8a44167b - update cppcheck script to install cppcheck if missing and check multiple paths for cfg file 2017-10-09 12:44:53 -07:00
SoftCoder d78f28983b - some coverity based cleanups 2017-10-08 20:31:42 -07:00
SoftCoder a7a92056eb - fix build for ubunti 17.10 2017-09-28 22:12:09 -07:00
SoftCoder 6479690d67 - fix windows build 2017-09-23 23:59:56 -07:00
SoftCoder 7d5bc6a6a8 - fix windows build 2017-09-23 23:37:13 -07:00
filux 056078909a 'mini update' more optional than before 2017-08-27 22:59:07 +02:00
filux 4a5249fe54 another test for macOS 2017-08-27 09:07:32 +02:00
filux f0cb385efb let's check how macOS like it 2017-08-26 19:05:04 +02:00
filux 5323a4fcdf let's try static curl also for mac OS 2017-08-25 22:06:08 +02:00
filux a719f29758 updated the supported linux's releases in the script; closes #170 2017-06-29 22:48:01 +02:00
SoftCoder aa8441e33f - added support for ubuntu 17.04 2017-04-12 12:35:54 -07:00
filux ef1c26d931 improved formatting of '--help' output in a way to be more friendly for help2man 2017-04-01 14:53:34 +02:00
titiger f5e09c2a7c some more steam stuff 2017-03-23 01:27:25 +01:00