Commit Graph

88 Commits

Author SHA1 Message Date
filux 976fb4a20e Merge pull request #52 from filux/fpic-related-errors
merge after information that it's also required for Ubuntu 15.04+
2015-04-29 20:32:15 +02:00
filux 966da32472 better support for macos, this also closes #36 2015-02-24 09:45:17 +01:00
filux 9bb9a0d8dd cure for errors like 'relocation R_X86_64_32 against '...' can not be used when making a shared object; recompile with -fPIC' 2015-01-31 12:01:41 +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
filux 652f482240 fixed #48, fixed #49
Source tarball: "fatal: Not a git repository" at each compilation step; CMake gets the version wrong in 3.11.0.
2015-01-25 09:01:23 +01:00
Karl Goetz c4b6fbba26 Change coment on Apple test
This is just a niceity ; the comment no longer accurately captured what the
code was doing.
2014-12-23 07:18:17 +11:00
Karl Goetz f95dbab580 Split up CPack generator configuration
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.
2014-12-23 07:17:57 +11:00
Mark Vejvoda b7571e5bf9 Merge pull request #41 from goetzk/remove-duplicate-custom-data-install-path-definition
Remove duplicate DCUSTOM_DATA_INSTALL_PATH
2014-12-17 06:47:48 -08:00
Karl Goetz 953c055ced Remove duplicate DCUSTOM_DATA_INSTALL_PATH
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
2014-12-17 21:11:32 +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
Mark Vejvoda a72c882461 Merge pull request #38 from goetzk/change-linker-invocation-through-xcode
Don't strip binaries when building through Xcode
2014-12-15 14:10:56 -08:00
Karl Goetz 56a5cc6f98 Don't strip binaries when building through Xcode
Without this change building the Release version results in an error (which
claims to be a warning) due to using -s which is obsolete.
This removes -s when building through xcode - gnumake and other platforms are
(presumably) unaffected.
2014-12-15 20:36:27 +11:00
Karl Goetz d6f61233ce Change test for GIT_VERSION_CMD an xcode check
Following the work I did on GH ' Remove special casing on GIT_VERSION_CMD #33 '
I've done more experiements and test rebuilds. I've found that the test should
actually be to find out if we are working with Xcode specifically as using the
gnu build chain is working correctly with the code in the 'else' clause - the
codepath i tested before doing my original changes - but doesn't work using the
special 'apple' version.

This change should mean both methods of building work correctly.
2014-12-15 20:35:18 +11:00
Karl Goetz 00f116eeee Only use DEB generator if CPACK_GENERATOR is unset
When trying to build a dmg package on an apple system the values set in
mk/macos/CMakeLists.txt are masked by those coded in the main CMakeLists file.
This change means the values are only set if they haven't been already (eg by
using the apple CMakeLists).

I feel it would probably be better to move this lot ot mk/linux/CMakeLists and
then conditionally import the correct file - I'm happy to redo the change that
way if there is agreement on that.
2014-12-15 13:04:05 +11:00
Mark Vejvoda 3ecc553ba9 Merge pull request #33 from goetzk/git-version-cmd-fix
Remove special casing on GIT_VERSION_CMD
2014-12-06 21:15:23 -08:00
Karl Goetz 4919307d8f Reintroduce ELSE clause
Had a chat with softcoder who explained what was going on. We should now be
almost identical to the original but the compiler specific test has been
removed.
2014-12-07 16:06:13 +11:00
Karl Goetz 35347ed36b Re-add IF check around GIT_VERSION_CMD
Previous removal included a APPLE check which I'm told needs to remain.
2014-12-07 15:43:04 +11:00
Karl Goetz e920cba84b Remove special casing on GIT_VERSION_CMD
This special casing has been causing cmake -GXcode to fail.
2014-12-07 14:27:32 +11:00
Karl Goetz 81c94a5772 Remove special CUSTOM_DATA_INSTALL_PATH for OSX
The special codepath for CUSTOM_DATA_INSTALL_PATH on OSX means the path is
generated multiple backslashes which cause problems later on in the compile.
Having the same codepath as everything else appears to resolve this problem.
2014-12-07 14:25:23 +11:00
Christoph Korn 4ea86ae90f Pass the custom data install path to the compiler
The CUSTOM_DATA_INSTALL_PATH constant is checked at different
places in the code but was not actually passed to the compiler.
This resulted in searching the data files in /usr/games instead
of /usr/share/games/megaglest (in Ubuntu and Debian).

This commit also fixes setting the variable. It is still wrong
for Apple I think. But I can not test it.
2014-04-22 22:44:23 +02:00
Paul Wise c190c2eabb Also support -DCMAKE_BUILD_TYPE=None which is used by Debian
Fixes: https://bugs.debian.org/739068
2014-03-27 10:35:22 +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 6542ae5110 - re-enabled streflop as it is keeping us stable 2014-01-31 18:05:49 -08:00
SoftCoder 8c2e2581f3 - turn off streflop in linux and test to see how it goes 2014-01-25 19:07:25 -08:00
SoftCoder 10204be941 - check for cmake file not only folder 2014-01-25 18:52:31 -08:00
SoftCoder 92daccf963 - cleanup of cmake scripts and proper organizing of files 2014-01-21 23:21:56 -08:00
SoftCoder a6b02a598b - cmake bugfix for proper consistent order of build version info so windows and linux are the same 2013-12-25 00:25:57 -08:00
SoftCoder c887b0c357 - attempt to cleanup a few warnings
- attempt to get git rev info each compile (not just when running cmake)
2013-12-11 23:16:56 -08:00
Will 62a1dab85a tweak to build with kdevelop on osx 2013-12-05 23:48:12 +01:00
Will bf1c7df8bb merged upstream 2013-12-04 23:57:24 +01:00
SoftCoder 6ae1d179bb - updated for proper build on Mac 2013-12-04 14:54:02 -08:00
William Edwards e71e7104dc Trying to build on OSX 2013-12-04 22:38:06 +01:00
SoftCoder f217db38f1 - changed to git version stamp 2013-11-29 13:13:30 -08:00
Mark Vejvoda ab64b9343f - updated to support building with clang compiler (And cleaned up clang warnings from initial compile). Edit build-mg.sh and read the clang section as to how to build. 2013-11-19 21:57:28 +00:00
Mark Vejvoda fe07998816 - updated with patches from hasufell related to fribidi detection 2013-11-19 16:23:31 +00:00
Mark Vejvoda 983b4ca9a2 - experimental CLANG compile support 2013-11-19 08:04:38 +00:00
Mark Vejvoda 9268aaf279 - a few minor bug fixes related to code warnings
- code cleanup based on additional gcc warnings
- enabled additional gcc compiler warnings
2013-11-19 06:14:06 +00:00
Mark Vejvoda 65266ca41e - added cppunit into build system and started writing some unit tests (requires new dependency cppunit) 2013-04-30 01:27:14 +00:00
Mark Vejvoda 75dbf96730 - cmake bug fix for open suse (and fedora) 2013-03-05 19:56:23 +00:00
Mark Vejvoda e3c03b5916 - fix cmake script to properly set version # 2013-02-08 06:45:33 +00:00
Mark Vejvoda 5a2adde414 - added cpack info in cmake script
- cleaned up warnings in xml parser
2013-01-04 05:55:45 +00:00
Mark Vejvoda 410eb87bf2 - updated to add version info and cpack instructions to cmake 2013-01-03 21:57:58 +00:00
Mark Vejvoda d322f73284 - bug fixes and patches from hasufell related to:
- fontconfig not working
- new cmake option to control inclusion of libvlc
- new commandline option to force where to look for fonts: --font-path=x
- removal of libluajit from cmake
2012-11-14 19:20:08 +00:00
Mark Vejvoda 3b8dd289ac - updated cmake to check for support of backtraces in gcc compiler
- fixed numerous bugs / warnings from cppcheck
2012-04-16 19:29:37 +00:00
Mark Vejvoda cd5bce3b91 - removed configurator from cmake file
- applied libircclient patch from forums 'the Chakra project'
2012-04-11 18:58:38 +00:00
Mark Vejvoda 4bd6b53f9d - added insanely fast rapidxml as a supported xml engine to use. Currently its ONLY used for loading saved game xml and the currently class ONLY handles loading (not saving) xml's. 2012-03-14 21:52:13 +00:00
Mark Vejvoda 4ad42518c0 - updated for better handling of streflop on different platforms
- attempt for bugfix on windows when socket send buffer is continuously full
2012-02-10 06:21:06 +00:00
Mark Vejvoda 7d0cf06fe1 - added a check for streflop usage for the following (in the order shown):
- SSE support
  - X86 (streflop's X87) support
  - Soft emulation is the default fallback if sse and x86 are not valid for the compiler
2011-12-24 03:20:21 +00:00
Mark Vejvoda f38c8c9f63 - bugfixes to build on debians multi-platform build system 2011-12-23 04:51:44 +00:00
Mark Vejvoda 8965e0071e - fixed help2man in cmake
- added the ability to build the data source archive (for debian)
2011-12-15 18:01:07 +00:00