Before there were many iming issues because the timed particle system
where not queued often enough. Now all timed particle systems are
queued each time a new SkillCycle starts.
I've taken the liberty of splitting up the CPACK_GENERATOR test so shared
configuration and win32 configuration are outside that test. The existing
grouping forced duplication of variables in the mac config file and required
the cpack generator to be unset, then set to deb, then set to nsis on win32.
These changes should help make things much more understandable.
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.
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
Within 5 lines CUSTOM_DATA_INSTALL_PATH is defined twice resulting in lots of
compiler warnings; eg
[ 11%] Building CXX object source/shared_lib/sources/streflop/CMakeFiles/streflop.dir/libm/flt-32/s_atanf.cpp.o
In file included from <built-in>:175:
<command line>:7:9: warning: 'CUSTOM_DATA_INSTALL_PATH' macro redefined
^
<command line>:2:9: note: previous definition is here
^
This removes the second definition.
Conflicts:
CMakeLists.txt
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.
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.