127 Commits

Author SHA1 Message Date
Jammyjamjamman
35b08573f8 Lots of changes to make glest binary more portable on linux. 2019-04-12 21:28:19 +01:00
mathusummut
d5775734d7 Renamed ZetaGlest to Glest 2019-01-31 02:40:31 +01:00
mathusummut
dec899a524 Updated CMake files 2018-11-07 07:36:08 +01:00
MathuSum Mut
c53c231676 Travis fix 2018-11-04 19:05:48 +01:00
Andy Alt
caf5563b01 skip using the CMakeLists.txt in mk/macos, add fontconfig to osx deps (#287)
I'm not so sure the CMakeLists.txt in mk/osx is needed. When I disable it, travis is still able to complete the build.

I also added fontconfig to the osx dependencies so cmake could actually find it.

ping #263 and @oxenran
2018-10-17 16:34:51 -05:00
Andy Alt
d3f7fe78ef have cmake find OpenSSL (#284)
* set openssl root dir

apparently a common problem
https://github.com/alexcrichton/ssh2-rs/issues/28

https://stackoverflow.com/questions/29792009/cmake-osx-mac-openssl-brew

related to #263
2018-10-14 00:18:48 -05:00
MathuSum Mut
720870ce53 Revert "remove miniz and zlib from libzetaglest" 2018-10-10 13:22:08 +02:00
andy5995
769d4dab10 remove miniz and zlib from libzetaglest 2018-10-08 12:43:05 -05:00
andy5995
bda3154a69 remove libircclient from shared library
* removes libircclient from libzetaglest shared library because the
editor and g3d_viewer also link against libzetaglest. Those 2 binaries
don't need libircclient support

* libircclient is now built directly into only the zetaglest binary

* moved libircclient from source/shared_lib because it's no longer part
of the shared library

* libircclient put in dir "external/" because it is an "external" or
"3rd" party library. The @Supertux project does something similar
2018-10-07 23:50:59 -05:00
andy5995
ff26f9f3bf remove whitespace 2018-10-06 23:48:38 -05:00
andy5995
d1f86e52a7 rename output library (drop "liblib")
closes #266

Best to wait until the build is fixed to merge this.
2018-10-06 23:40:18 -05:00
andy5995
50a9339e09 cmake sharedlib:add -Wall flag 2018-10-04 00:10:57 -05:00
Andy Alt
004e68f5a0 cmake:add c++11 flag (#262)
* cmake:add c++11 flag

to prevent errors such as this:

https://travis-ci.org/ZetaGlest/zetaglest-source/builds/436849785
2018-10-03 21:18:37 -05:00
andy5995
4da0c7bc73 glew:use cmake include module 2018-10-03 01:35:42 -05:00
andy5995
77f85d7d09 lua:use include cmake module 2018-10-03 01:25:15 -05:00
andy5995
4be23261cc curl:use cmake module 2018-10-03 01:19:03 -05:00
andy5995
64bcd0af37 CMake:more cleanup
@mathusummut can you update the comment regarding Win building at the
top of the main CMake file please

Signed-off-by: andy5995 <andy400-dev@yahoo.com>
2018-09-26 01:03:16 -05:00
andy5995
80a4d65ec0 Cmake:removing unix condition
I want to see how this builds on osx with the unix condition removed
2018-09-25 14:43:22 -05:00
andy5995
57dd66268f cmake:add -x11 flag
Found this in a patch
http://slackbuilds.org/repository/14.2/games/megaglest/?search=megaglest
2018-09-25 13:45:00 -05:00
andy5995
be8a45bca0 cmake:use miniz if zlib isn't found 2018-09-25 13:26:33 -05:00
andy5995
2f5e6b6439 CMake:use external zlib if present 2018-09-25 02:07:33 -05:00
andy5995
754f8827f9 shared_lib/miniz:update miniz library
Update [miniz](https://github.com/richgel999/miniz) library. Thanks
to @richgel999 and the miniz contributors.
2018-09-18 22:37:23 -05:00
Andy Alt
7c359ca82d CMakeLists.txt:checking, tuning the build system (#232)
* build.zg.sh scripts deprected

* update for BSD

* removed checking for VLC (not implemented)

* docs updated

* Install.md created.

* scripts moved to scripts/ directory
2018-09-17 17:35:19 -05:00
andy5995
656820714b CMakeLists.txt:change shared lib to libzetaglest 2018-09-07 22:59:52 -05:00
Andy Alt
64cc6c3cb1 remove embedded libircclient (#207)
upgrade embedded libircclient from 1.3 to 1.10
2018-09-07 17:39:28 -05:00
andy5995
60e38945fe CMake:correct spelling of "zetaglest"
This also removes the git revision number stamping from cmake, support
for which was removed from the source code months ago.

This is to help prepare to fix #110 but doesn't fix it.
2018-05-09 09:09:36 -05:00
David Carlier
e92cefd664 Backporting a pending MegaGlest PR.
In some platforms, time types are already 64 bits.
2018-04-02 16:59:21 +01:00
filux
a719f29758 updated the supported linux's releases in the script; closes #170 2017-06-29 22:48:01 +02:00
SoftCoder
85b4e4eda7 - Implement solution for Issue #119 2017-02-05 16:51:15 -08:00
SoftCoder
8195121fca - Check for packaged streflop and use it before using embedded copy 2017-02-05 16:48:50 -08:00
filux
32d7085816 cmake patches from mageia [ci skip] 2016-03-05 13:57:08 +01:00
filux
1125a2b405 added switch for compilation [W]ithout wxWidgets; updated list of deps related with curl 2016-01-18 20:59:21 +01:00
filux
f594e8a037 removed one redundant message [ci skip] 2015-11-16 21:49:20 +01:00
filux
8a4ee15e59 Merge branch 'develop' into feature/sdl2 2015-11-05 20:45:53 +01:00
SoftCoder
952e0a6315 - editor and g3d viewer work in wxwidgets 3.0.2 2015-10-26 19:49:25 -07:00
SoftCoder
75077c4a50 - added support for miniupnpc 1.9, this fixes #79 (cherry-pick to develop & RC) 2015-10-22 17:34:14 +02:00
SoftCoder
49ce8e729b - added support for miniupnpc 1.9 2015-10-21 18:11:19 -07:00
filux
4bef525bf3 removed not required CURL module, renamed several cmake-build options for be more easy sortable by name 2015-09-27 19:46:35 +02:00
filux
4ad684deaf updated modules: LUA, GLEW 2015-09-22 01:04:22 +02:00
filux
6ac255095a implemented basic support for SDL2 in cmake files (only); changed a general idea of how and where are showed deprecation warnings 2015-09-18 19:17:52 +02:00
filux
5afa6c68ba added missing option for lua 5.3 2015-08-20 16:52:27 +02:00
filux
617bc9a89e extended support for lua to v5.3; removed some duplicate messages showing up during 'cmake configuration' time 2015-08-20 16:43:14 +02:00
filux
72539021f9 in default OpenSSL is not required, closed #67 2015-06-13 00:09:56 +02:00
Rémi Verschelde
56ac448177 Ensure libcurl also links against libssl and libcrypto
ssl and crypto seem to be lacking in ${CURL_LIBRARIES} at least on my distro,
and that causes underlinking issues.
2015-06-12 21:42:50 +02:00
filux
e26ea22378 more universal and matched entry, fixed #65 2015-06-05 01:54:05 +02:00
Michael Palimaka
fc07d9caf2 Fix build with >=cmake-3.2.
The FindOpenGL module no longer pulls in X11 libraries.
2015-06-05 00:47:52 +02:00
filux
34d52e40d7 updated support for new versions of ubuntu 2015-04-29 20:23:03 +02:00
filux
69e9dff754 better support for static build on debian 2015-01-31 11:53:59 +01:00
filux
9977fd2606 fixed 'Not a git repository' bug related with real out of source build from the git repository 2015-01-31 10:30:19 +01:00
SoftCoder
9cb0ba8833 - xerces included only if forced in cmake since it will be deprecated 2014-01-25 18:12:53 -08:00