Commit Graph

14 Commits

Author SHA1 Message Date
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
Mark Vejvoda
4b40f19eda - fix for Mac OsX 2013-01-07 02:54:02 +00:00
Mark Vejvoda
77911f2144 get cpack working in macosx 2011-10-28 16:33:57 +00:00
Mark Vejvoda
5b7329594c - merging in changes from weltall for macosx 2011-10-18 01:13:38 +00:00
Forjan Frederic
477679d139 update extraction of the version for the installer 2010-10-24 04:14:16 +00:00
mnaumann
6c0c291e44 FreeBSD and Mac OS X support by GeoVah pt2., thanks a bunch! 2010-09-27 20:31:38 +00:00
mnaumann
65ec94e22f FreeBSD and Mac OS X support by GeoVah, thanks a bunch! 2010-09-27 20:28:08 +00:00
Mark Vejvoda
b115292ee5 - added GeoVah's initila Mac osX support (via cmake) 2010-09-16 15:15:42 +00:00