Commit Graph

70 Commits

Author SHA1 Message Date
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
Mark Vejvoda
dac61b9f5d added some new cmake directives to optional turn off subprojects from the build process. The new cmake options include:
BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS
BUILD_MEGAGLEST_MODEL_VIEWER
BUILD_MEGAGLEST_MAP_EDITOR
BUILD_MEGAGLEST_CONFIGURATOR
BUILD_MEGAGLEST

By default these are all enabled (On). Turn turn off a module run cmake with the option turned off:
-DBUILD_MEGAGLEST_CONFIGURATOR=OFF
2011-10-17 16:59:22 +00:00
Mark Vejvoda
bc4f33bc9a - added new cmake build option (and fixed bugs from people who added code but did not respect NON streflop define) 2011-07-13 19:57:29 +00:00
Mark Vejvoda
23a26994b5 - updates for better handling with debian 2011-05-26 14:36:43 +00:00
Mark Vejvoda
e221011af2 - bugfixes so that the mingw compile builds 2011-05-24 22:51:45 +00:00
Mark Vejvoda
5f2d98533e - turn off svn rev tag if svn not found 2011-05-15 02:31:00 +00:00
Mark Vejvoda
4c7d09d37b - cleanup of cmake vars shown when doing -LH (marked some less important vars as advanced) 2011-05-15 02:24:54 +00:00
Mark Vejvoda
6ac5f70f68 - fixed to NOT execute svn command when WANT_SVN_STAMP if off 2011-05-15 02:10:29 +00:00
Mark Vejvoda
8c59da57cd - bugfixes to install related files to fix:
- missing glest.ini during make install (this file is handled by the data install)
 - properly handles destdir for all installed files
 - customizable paths for all installation destinations (the following can now be set):
   		MEGAGLEST_BIN_INSTALL_PATH   -  "bin/"  -  "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)")
		MEGAGLEST_DATA_INSTALL_PATH  - "share/megaglest/"  -  "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
		MEGAGLEST_DESKTOP_INSTALL_PATH  - "share/applications/"  - "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)")
		MEGAGLEST_ICON_INSTALL_PATH  -  "share/pixmaps/"   - "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)")
		CUSTOM_DATA_INSTALL_PATH  -  "'\\\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\\\"'"   -  "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)")
- Fixed startup scripts for tools (remove bin folder)
- Fixed source and data tarball scripts to include required files (missed the proper main ini files)
- Debian can now easily package up megaglest and build deb files
2011-05-14 17:31:40 +00:00
Mark Vejvoda
9a1afe1b0a - updated scripts as well as cmake so that source and data build both together and separate from in an svn tree or the sf tarballs 2011-05-04 21:00:34 +00:00
Mark Vejvoda
dfe194fa10 - cmake now somewhat split out into binaries and data, likely needs a little tweaking and final touches, good night for now :) 2011-05-04 07:51:48 +00:00
Mark Vejvoda
09ec5e095e - check if users system does NOT has SVN then do not use svn version stamping 2011-05-04 07:16:44 +00:00
Mark Vejvoda
42d4e45b84 - implemented some additional install files as requested by sven (more needs to come still) 2011-05-04 06:58:22 +00:00
Mark Vejvoda
fab36598b1 - lots of updates including:
- cmake system changes (after doing a make you may go: sudo make install to install in standard linux paths)
- updates to various pathing in order to more robustly support lhs

*WARNING, Linux dev's should run cmake like the following to avoid pathing issues as the default now is lhs paths:
cmake -DCMAKE_INSTALL_PREFIX= ..    (notice the SPACE before the ..)
2011-05-03 23:34:25 +00:00
Mark Vejvoda
bda831861a Stuff from pabs (debian games) round #1
- remove +x bit on many files that should not have it
- added gplv3 svg logo for completeness in svn
2011-05-03 07:58:59 +00:00
Mark Vejvoda
9b1893054f - renamed Linux binaries launch scripts start with start_megaglest_x and binaries start with megaglest_ 2011-04-09 19:13:10 +00:00
Mark Vejvoda
34e95f5cd5 - streflop was disabled (likely when we switched to cmake). Turn it on for now but we need to investigate more thoroughly if we really need this? 2011-02-11 19:16:06 +00:00
Mark Vejvoda
ba2b155f6f - updated cmake and source release script to package up some missing source files and added a new CMAKE optional parameter so people can compile the source release without SVN rev stamp because it is not an svn repo. Run cmake like this:
cmake -DWANT_SVN_STAMP=OFF ../
2011-02-02 20:12:45 +00:00
Mark Vejvoda
ada4140d84 - added glexemel to svn and CMake builds
- updated the G3D import script to properly bring in animations into Blender!
2011-01-14 06:56:19 +00:00