Commit Graph

89 Commits (2b9abf2a4843d7324de50d1b3d52fa9fcb00b185)

Author SHA1 Message Date
krzys-h 2b9abf2a48 Fixed CMake git branch detection with build dir outside of repository working dir 2014-06-25 22:49:16 +02:00
krzys-h 9a741a66a4 Changed version display in bottom-right corner to be actually version number instead of date 2013-12-27 11:15:36 +01:00
Piotr Dziwinski d9283e2afa Fix problem with gtest and pthread on some systems 2013-12-20 20:19:21 +01:00
Didier Raboud 343fa8f0cb Add a PLATFORM_GNU global variable matching all GNU systems such as Debian's Linux, kFreeBSD and Hurd 2013-11-27 18:53:28 +01:00
Piotr Dziwinski 8c25650ad5 Version bump (0.1.2) 2013-11-26 00:39:44 +01:00
Didier 'OdyX' Raboud 89e2855f95 Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt 2013-11-20 10:39:06 +01:00
Didier 'OdyX' Raboud 6b3e6694e3 On MacOSX, install files to Bundle-specific directories 2013-11-13 09:35:32 +01:00
Didier 'OdyX' Raboud ffdba25411 Add MacOSX bundle-specific installation paths 2013-11-13 09:35:32 +01:00
Piotr Dziwinski d8e50e4eeb Version bump (0.1.1) 2013-11-03 13:02:25 +01:00
Didier 'OdyX' Raboud 4680137ca4 On MacOSX, use SDL_Main 2013-10-29 14:54:11 +01:00
Didier 'OdyX' Raboud ee90f02bc4 Add an icon and executable information to the colobot.exe when build in MXE 2013-10-29 14:40:58 +01:00
Piotr Dziwinski 7fb83068ed Fix for CMakeLists error 2013-10-24 21:48:14 +02:00
Piotr Dziwinski 8d62da0c99 Added option to force to use bundled gmock/gtest
* resolves problem when version of gmock/gtest found installed in system
   disagrees with the bundled one
 * removed -DGTEST_HAVE_PTHREAD=0, seems that pthread is needed after all
2013-10-24 21:37:07 +02:00
Didier 'OdyX' Raboud 591ba30a00 Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script 2013-10-24 21:12:52 +02:00
Didier 'OdyX' Raboud b3b6a40d9e MacOSX: Add initial support in CMake build infra 2013-10-24 21:12:52 +02:00
Piotr Dziwinski a4b3b7d0af Typo fix 2013-06-27 19:43:06 +02:00
Piotr Dziwinski 26870551d7 Forgotten compile flag 2013-06-26 20:44:17 +02:00
Piotr Dziwinski 5c15855009 Post-alpha phase 2013-06-24 21:40:51 +02:00
Piotr Dziwinski b376486fd7 Colobot Gold 0.1.0-alpha 2013-06-24 21:32:14 +02:00
Piotr Dziwinski 81a6de41a5 Some further changes in CMakeLists
* removed DEV_BUILD autodetection (could be confusing)
 * ignore desktop subdirectory on Windows
 * some refactoring
2013-06-24 14:17:28 +02:00
Piotr Dziwinski 3e989c96df Fixed auto-detecting locale on Windows
* localename library is now used to determine the actual locale used
 * added patched version of FindGettext.cmake to fix
   installation path of translation files
2013-06-24 14:16:39 +02:00
Piotr Dziwinski 8cb2e54de8 Futher changes to CMake options
* OpenAL sound is now enabled by default
 * Boost is linked dynamically by default
2013-06-22 22:33:06 +02:00
Piotr Dziwinski bfcce26f89 Changes in build organization
* targets are now created in top-level build directory
 * more things are now configured through CMake options
 * changed debug build detection from NDEBUG to DEV_BUILD
 * moved po and desktop directories
 * moved last unit test out of src directory
2013-06-22 01:17:19 +02:00
Piotr Dziwinski 7874aca10c Enhanced logging, option to auto-start mission
* added logging of application events
 * changed debug mode flag to independent debug modes
 * added option to auto-start mission (load a mission immediately
   after startup)
 * removed "enum value out of range" prints
 * some refactoring
2013-06-16 21:54:36 +02:00
krzys-h c3e95d40a2 Added relative install paths for MXE build 2013-05-03 22:23:36 +02:00
erihel f1873a52d5 * Minor changes to cmake files 2013-04-12 12:07:57 +02:00
erihel bc760e3513 * Added X11 to libs in CMakefiles for linux build 2013-04-11 21:55:49 +02:00
erihel 01309c8bd0 * Added clipboard support (issue #60)
* Fixed keyboard shortcuts while code editing in game
2013-04-11 13:37:15 +02:00
Piotr Dziwinski 8301a3639b Moved boost flags to CMakeLists 2013-03-27 20:54:04 +01:00
Piotr Dziwinski 00a2abd21f Fixed GCC 4.6 compilation 2013-03-25 09:49:42 +01:00
Didier Raboud 8aba2424bb Bugfix DESKTOP option initialisation 2013-03-24 22:25:39 +01:00
Piotr Dziwinski 195d6cded0 Fixed timer functions on win32
* changed win32 implementation to QueryPerformaceTimer system function
 * refactored system utils code
 * proper tests for time utils and update event creation in application
 * should fix issue #134
2013-03-24 12:00:12 +01:00
Piotr Dziwinski 87bc927d87 Updated README files, optional libsndfile
* updated readme files
 * moved sndfile to optional
 * changed install paths on Windows
2013-03-22 22:24:35 +01:00
Piotr Dziwinski 4a30800cf1 Fixes for compiling on MSYS
* fixed SDL_main() and putenv() issues
 * disabled desktop subdir for MSYS
 * disabled building CBot_console for now
2013-03-22 19:17:08 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
Piotr Dziwinski 209c6412ae Refactoring in tests infrastructure
* all tests are now in /test/ subdirectory
 * unit tests concatenated to one executable (TODO: ui, common)
 * preparation for test environments (OpenGL and others)
 * removed old TestCBot
2013-02-03 20:03:36 +01:00
erihel 9f75a29e88 * Fixed sound pitch causing segfault
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
2013-01-16 01:45:38 +01:00
erihel 58f35e44ae * Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
Didier Raboud 4444fde9d7 Use correct C++11/C++0x flags depending on the used compiler
See http://gcc.gnu.org/projects/cxx0x.html for details.
2013-01-10 10:13:21 +01:00
krzys-h 871542abf5 Merge pull request #114 from OdyX/dev-update-cmake-with-data
Let CMake rely on data's CMakeLists.txt if it exists
2013-01-09 04:36:06 -08:00
Piotr Dziwinski 1285712aa2 CMakeLists enhancements
- compiler detection (clang and gcc version check)
 - compile flags only for src/ subdir
 - system and local include paths
 - fix for clang compilation
2013-01-08 22:12:09 +01:00
Piotr Dziwinski 5a6b3f005a Merge dev and dev-graphics 2013-01-07 19:43:04 +01:00
Marcin Zawadzki ff5c890854 Small fix in detecting language. Fixes needed to compile code using clang 2013-01-05 23:03:26 +01:00
Piotr Dziwinski 8818a8e5db Corrected OpenGL extension detection
- corrected multitexture and VBO detection
- GLEW is now a required library
- minor CMakeLists refactoring
2013-01-05 23:03:06 +01:00
Didier Raboud ffb4d9ff4f Let CMake rely on data's CMakeLists.txt if it exists
- Also update data to latest 'dev', where the CMakeLists exists
2013-01-02 14:35:46 +01:00
Didier Raboud 16d97f9121 Revert "Minor cmake grammar fix"
It appears I was really wrong. Damn.

This reverts commit 277629f9fe.
2012-12-30 12:16:43 +01:00
Piotr Dziwinski e1325dc364 Fix for TEST_VIRTUAL 2012-12-29 14:35:14 +01:00
Didier Raboud e62996858b Create a central version
Make it 0.1.0~pre-alpha for now.

- Add it to runtime program
- Add it to -help option
- Add it to manpage
- Update translations
2012-12-27 17:12:42 +01:00
Didier Raboud 277629f9fe Minor cmake grammar fix
It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.

Re-do a7d837460f
2012-12-27 10:35:04 +01:00
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00