mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 03:32:35 +01:00
Code Issues Projects Releases Wiki Activity
5,678 Commits 1 Branch 32 Tags
Commit Graph

1016 Commits

Author SHA1 Message Date
Karl Goetz
1d591d4a8c Fix some erors in Info.plist 
This fixes a couple of issues, none too major:
- The MegaGlest executable is `megaglest` so that string was updated
- MG_VERSION_H_CONTENTS *includes* the file with the version in it (which I
  didn't realise when I changed it last time as I couldn't get things building
  still). This changes to using VER_* variables
- Update copyright to 2015 (I'm gambling on the project lasting another 2 weeks)
- Change CFBundleSignature to MGGL; a four letter contraction of MeGaGLest
 2014-12-23 07:17:34 +11:00
Mark Vejvoda
17a45c8da3 Merge pull request #40 from goetzk/remove-mac-specific-version-detection-code 
Remove mac specific version detection code
 2014-12-17 06:47:35 -08:00
Karl Goetz
ada9b55740 Revert change to quoting 
Accidentally included a change of quoting which isn't related to the diff at
hand; reverted with this commit.
 2014-12-17 20:28:20 +11:00
Karl Goetz
5b4b382d2c Remove unneeded comments 
These comments indicated TODO items and are no longer needed in the final change.
 2014-12-17 20:25:21 +11:00
Karl Goetz
0ce6fd3c5d Change library search path on MacOS 
When using mac ports GL/gl.h ends up outside the cmake search paths for
libraries and includes. By adding them to mk/macos/CMakeLists.txt they are now
available and make it possible to build g3d_viewer along with the rest of
megaglest. To make this work properly I had to move the inclusion of
mk/macos/CMakeLists.txt further up the master CMakeLists.txt so merged both IF
APPLE tests in to one.

This has built successfully through xcode and gnumake.
 2014-12-17 20:21:22 +11:00
Karl Goetz
4c10c9c2b3 Remove MEGAGLEST_VERSION for MG_VERSION_H_CONTENTS 
I noticed that mk/macos/CMakeLists.txt has special code for extracting the
megaglest version , but its already done in CMakeLists.txt. This removes the
duplicate detection and changes the users of MEGAGLEST_VERSION to
MG_VERSION_H_CONTENTS.
 2014-12-17 20:20:34 +11:00
titiger
58cba20cf4 update version in script 2014-12-03 01:30:03 +01:00
SoftCoder
829f23db4e - updated deps for ubuntu 14.04 and higher 2014-11-29 22:45:31 -08:00
SoftCoder
645778a490 - added new files to vc2012 project 2014-11-28 20:05:33 -08:00
Tom Reynolds
86ce576a45 include more info in coverity build "description" 2014-11-10 09:39:19 +01:00
titiger
9f633ada18 key settings to toggle HP bars 2014-11-07 02:00:36 +01:00
titiger
250294bc9e fix for librtmp.so.0 missing 
https://forum.megaglest.org/index.php?topic=9578.0
 2014-11-02 22:26:38 +01:00
filux
1724fddb65 Merge remote-tracking branch 'upstream/develop' into develop 2014-10-16 21:16:49 +00:00
titiger
6267756646 trying to fix the ubuntu libtasn1.so.3 problem 2014-10-02 00:42:45 +02:00
filux
9988ea9cbf resolved conflicts to upstream/develop 2014-09-27 11:19:29 +00:00
Tom Reynolds
30d362652d And another... 2014-09-25 02:22:57 +02:00
Tom Reynolds
2738169c6b Another try... 2014-09-25 02:09:16 +02:00
Tom Reynolds
9ae185e37b add shared ini's when packaging bin's 2014-09-25 00:48:39 +02:00
Tom Reynolds
7c73b47a13 buildDeps: Fix openSUSE + add current Ubuntu/Mint 2014-07-24 22:14:36 +02:00
Tom Reynolds
a4c7652db5 SuSE is now OpenSuse is now openSUSE 2014-07-24 21:59:15 +02:00
titiger
49fc7d4bce Suse 13.x is supported too now 2014-07-23 23:24:47 +02:00
titiger
b72f4857d7 multi projectiles with different timings and particle systems 2014-07-18 01:04:36 +02:00
filux
4a3875c114 All paths to flags probably are fixed now. & Removed 2 old scripts related with svn. 2014-03-27 20:26:01 +01:00
filux
fdd5eb52fe Removed masterserver's code (separation from the source). 2014-03-27 20:12:04 +01:00
Tom Reynolds
fa0a8ac9e7 No prompt for file removal 2014-03-16 06:16:24 +01:00
Tom Reynolds
cf53540438 Windows: delete Release\*.tlog before building 2014-03-16 06:13:31 +01:00
Tom Reynolds
d348edc634 build-mg.sh: no more warning when clang is not installed [ci skip] 2014-02-15 02:38:42 +01:00
Tom Reynolds
cc64e6cc8e fix detection for CXX=clang 2014-02-12 00:55:29 +01:00
SoftCoder
3c6bac9435 - removed unused compiler setting from vc++ 2012 projects 2014-02-07 15:48:44 -08:00
SoftCoder
63863bac89 - updated unit test to compile on windows 
- updated vc++ 2012 compile flags and changed asm to use unsigned
 2014-02-07 15:42:00 -08:00
SoftCoder
b1cafabb01 - added cmake compile warning when users uses clang as clang currently does NOT support some critical GCC settings we require. 2014-02-06 19:14:14 -08:00
SoftCoder
e42b802b81 - fixed make binary script for win64 2014-02-04 14:53:56 -08:00
Tom Reynolds
497ea1734e Update server list 2014-02-02 22:35:50 +01:00
SoftCoder
bf5001a49a - fixed windows build with bad paths 2014-02-01 10:57:56 -08:00
SoftCoder
2b59eda69b - added new unit test to msvc builds 2014-02-01 10:31:58 -08:00
SoftCoder
78ed6d4601 - attempt to add streflop to win64 build 
- CRAZY attempt to add x64 (win64) support to streflop via some new asm code!
 2014-02-01 01:28:30 -08:00
SoftCoder
6542ae5110 - re-enabled streflop as it is keeping us stable 2014-01-31 18:05:49 -08:00
Tom Reynolds
7dd40cd1be more git ignores for Windows 2014-01-30 23:43:26 +01:00
SoftCoder
e63b3d7499 - added support for team unit sharing 2014-01-27 14:15:05 -08:00
SoftCoder
338f156a95 - changing version to v3.10.0-dev for new development 2014-01-27 11:21:22 -08:00
filux
aa5403d8ef Merge remote branch 'upstream/master'. 
Conflicts:
	mk/linux/.gitignore
	mk/windoze/coverity-scan.bat
 2014-01-27 08:23:42 +01:00
SoftCoder
d8c9ffa922 - updated vc++ 2012 build script to point to correct dep file 2014-01-26 22:09:59 -08:00
Tom Reynolds
57397b3f28 Update .gitignore's 2014-01-27 06:42:10 +01:00
Tom Reynolds
d97ad0015c replace remaining references to .coverity-submit by .coverity-scan 2014-01-27 06:13:14 +01:00
Tom Reynolds
f284bea230 update paths for coverity-scan.bat 2014-01-27 05:41:30 +01:00
SoftCoder
0a245e76d2 Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source 2014-01-26 08:09:15 -08:00
filux
8ec938a940 Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat 2014-01-26 09:46:53 +01:00
SoftCoder
42dae7cda6 - updated git ignore 2014-01-25 21:27:39 -08:00
SoftCoder
dd0e527412 - removed including streflop in windows builds 2014-01-25 19:55:01 -08:00
Tom Reynolds
4c64df640b .coverity-submit is now .coverity-scan for windows, too 2014-01-26 04:19:07 +01:00