Commit Graph

835 Commits

Author SHA1 Message Date
filux
92b599a291 Merge pull request #58 from goetzk/buildable-package
Changes to make package build and run on osx
2015-02-17 22:35:19 +01:00
Karl Goetz
c21db67721 Changes to make package build and run on osx
MegaGlest is the correct spelling, the process of building a package upper
cases the binary so I'm removing my modification via an earlier branch.

This also sets CUSTOM_DATA_INSTALL_PATH to /Applications - this is the final
step in getting MegaGlest.app to launch after building and installing.

The previously hard coded path was ok for gnumake but failed when Xcode got
involved as it has build types (release/debug/et al) which the hard coding
didn't support. I've added an if/else catch for the two build types that i've
seen while working on megaglest and it should be trivial to add any others that
may be desirable.

There is still an outstanding issue of embedding dependencies or using system
provided dependancies which I haven't sorted out.
2015-02-15 18:33:56 +11:00
Karl Goetz
06bb4104dc Run dos2unix on COPYRIGHT.source_code.txt
COPYRIGHT.source_code.txt is inlined during the package building stage on OSX
when built using Xcode. To prevent it causing Rez to fail due to CRLF line
endings we unconditionally run dos2unix against the file during build. In the
cases where this wouldn't have caused a problem there is no regression and in
the cases where its necesary the file is fixed without manual intervention
2015-02-14 10:31:24 +11:00
filux
c453aa778b eliminated ugly icons from installer in linux's menu 2015-02-07 13:11:24 +01:00
titiger
615cac7138 Merge pull request #54 from filux/feature/new-version-management
changed version number management and same versioning for game, map-editor and g3dviewer
2015-02-02 22:37:04 +01:00
filux
7451e49213 mapeditor and g3dviever will have always same version number as game, also game and binary packages will have always same version 2015-02-02 22:20:57 +01:00
filux
da33c43230 a bit more manual but also cleaner way of updating version number 2015-02-02 22:13:17 +01:00
titiger
adb71b4add get rid of AccessControl.dll in repository
this is now downloaded on demand.
2015-02-02 00:17:05 +01:00
filux
5192c3f87f proposition of different version number management 2015-02-01 15:45:07 +01:00
filux
69e9dff754 better support for static build on debian 2015-01-31 11:53:59 +01:00
filux
5eeac92fb4 refreshed list of dependencies 2015-01-31 11:49:07 +01:00
filux
045f171b9a linux's binary without glest-dev.ini 2015-01-25 12:57:12 +01:00
titiger
ae5668ab52 version set to 3.12-dev 2015-01-23 21:18:57 +01:00
titiger
30a8667307 version set to 3.11.0 2015-01-20 23:10:36 +01:00
titiger
49bde874fc linux installer tests 2015-01-20 00:51:57 +01:00
titiger
7a34b3ea20 linux script to build windows installer 2015-01-20 00:51:31 +01:00
titiger
1a9c48fd3c windows installer without ebanner
ebanner has unclear license and you always had to install it. 
The AccessControl pugin is now added, so it gets much more easy to
create windows installers on linux.
2015-01-20 00:24:07 +01:00
Tom Reynolds
d3d0fbf9bf lossless images compression
keeping file formats, comments + EXIV meta data intact
2015-01-14 23:58:30 +01:00
SoftCoder
172dfe3411 - update a few scripts to exclude cegui data 2014-12-29 17:23:20 -08:00
titiger
74e522b2f8 "v" was too much in the version string 2014-12-26 21:58:07 +01:00
titiger
11b766b5bc v3.11-beta2.0 2014-12-26 21:33:54 +01:00
SoftCoder
7f0b199929 - disable use of streflop in x64 windows build 2014-12-22 16:30:49 -08:00
Karl Goetz
70e10c610e Change Mac specific CMakeLists for CPack
This commit includes several fixes and some shuffling of entries to improve
readability. The major changes are Removing MG_VERSION_H_CONTENTS which
*includes* the file with the version in it in favour of VER_* variables and
removing the CPack include at the end of the file.

CPack has to be included after all variables are set and this file is sourced
before all the common options are configured.

One more fixme is added - this and other runtime issues will have to be dealt
with when i test the packaging, so far I've only got it to build.
2014-12-23 07:17:48 +11:00
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
titiger
6267756646 trying to fix the ubuntu libtasn1.so.3 problem 2014-10-02 00:42:45 +02: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
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