summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* CMakeLists enhancementsPiotr Dziwinski2013-01-081-2/+14
| | | | | | | - compiler detection (clang and gcc version check) - compile flags only for src/ subdir - system and local include paths - fix for clang compilation
* Corrected OpenGL extension detectionPiotr Dziwinski2013-01-051-26/+19
| | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring
* Merge branch 'dev' into dev-graphicsPiotr Dziwinski2013-01-041-5/+34
|\
| * Add translated freedesktop 'Desktop Entry' fileDidier Raboud2012-12-271-0/+2
| | | | | | | | | | | | - Add po4a as build-dependency for travis (but it fallsback to english-only if not found) - Add (easy) french translation
| * sound fixerihel2012-12-201-1/+28
| |
| * removing plugins for gold version (for mxe cross compiling)erihel2012-12-201-3/+0
| |
| * Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-201-2/+2
| | | | | | | | make && make install should now give a working installation.
| * Fix RPath in installed colobotDidier Raboud2012-12-191-1/+1
| |
| * Install libCBot to a private directoryDidier Raboud2012-12-171-1/+2
| | | | | | | | | | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate.
| * Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-161-1/+1
| | | | | | | | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists
| * Merge branch 'master' into devPiotr Dziwinski2012-12-151-1/+3
| |\
| | * Add FindLTDL cmake moduleDidier Raboud2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68
| | * Handle translations with CMakes.Didier Raboud2012-12-131-0/+2
| | | | | | | | | | | | closes #81
* | | Engine optimization - rewritten model managementPiotr Dziwinski2012-12-261-0/+1
|/ / | | | | | | | | | | | | | | - new class CModelManager - rewritten engine object structure in CEngine - created shared model data instead of separate objects per each model instance - minor refactoring
* | Restext rewrite to runtime initialized arraysPiotr Dziwinski2012-10-171-1/+0
| |
* | Merge branch 'dev' of https://github.com/colobot/colobot into devZaba9992012-10-111-0/+2
|\|
| * Added "make install" target.Michał Zieliński2012-10-051-0/+2
| |
* | Added saving user scripts on game save. Fixed bug in writing script to file.Zaba9992012-10-111-0/+1
|/
* MXE support and CMake files refactoringPiotr Dziwinski2012-09-291-45/+25
| | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places
* Small fix in profile + profile_test rewritten to gtest.Zaba9992012-09-281-0/+1
|
* Removed metafile editor and loaderPiotr Dziwinski2012-09-221-1/+0
|
* * Fixed audio problemserihel2012-09-221-0/+3
| | | | | | * Added colobot.ini to CApp in Create function * Fixes to plugin manager * Fixed CProfile segfault
* changed paths for models and levels. Now it's possible to load level. Merged ↵Zaba9992012-09-201-1/+0
|\ | | | | | | with latest trunk
| * Namespace and styling fixPiotr Dziwinski2012-09-191-1/+0
| |
* | changed paths for models and levels. Now it's possible to load level.Zaba9992012-09-201-0/+2
|/
* changes needeto to cimpile on windows.Zaba9992012-09-171-0/+1
|
* Successful compilation & runningPiotr Dziwinski2012-09-151-1/+1
| | | | | | | - temporarily mocked CSoundInterface and CPluginInterface - added CRobotMain to application - successfully compiles & runs, but doesn't display correctly at the moment
* CMainDialog rewritePiotr Dziwinski2012-09-151-2/+2
| | | | - rewritten CMainDialog and updated CRobotMain
* Merge dev-common and various fixes to achieve compilationPiotr Dziwinski2012-09-151-34/+33
|\ | | | | | | | | | | | | | | - merged changes from dev-common - fixed many compilation errors (CBrain, UI, ...) - temporarily commented out some problematic code (e.g. input bindings) - (partially) fixed #include styling - everything compiles except for CRobotMain, CMainDialog and CStudio
| * Tests rewrite and Doxygen in src/mathPiotr Dziwinski2012-09-111-0/+1
| | | | | | | | | | | | - rewritten tests to use new framework - updated/reformatted Doxygen - removed legacy conversions
| * Refactoring in src/commonPiotr Dziwinski2012-09-091-6/+8
| | | | | | | | | | - refactored CInstanceManager and some headers - removed old headers
* | Merge branch 'dev-object' into devMichał Konopacki2012-09-151-61/+61
|\ \ | | | | | | | | | | | | | | | Conflicts: src/object/robotmain.cpp src/object/robotmain.h
| * | Fixes in [object/auto]Michał Konopacki2012-09-131-26/+26
| | |
| * | [object/motion] Folder compilesMichał Konopacki2012-09-131-9/+9
| | |
| * | all tasks compile.Zaba9992012-09-121-7/+7
| | |
| * | commented part of tasks that does not compile.Zaba9992012-09-111-7/+7
| | |
| * | half of task compile.Zaba9992012-09-111-26/+26
| | |
* | | Merge branch 'dev-ui' into devMichał Konopacki2012-09-151-2/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/CMakeLists.txt src/common/misc.cpp src/common/misc.h src/object/robotmain.cpp src/object/robotmain.h src/script/cbottoken.cpp src/script/cbottoken.h src/ui/button.cpp src/ui/button.h src/ui/check.cpp src/ui/check.h src/ui/color.cpp src/ui/color.h src/ui/compass.cpp src/ui/compass.h src/ui/control.cpp src/ui/control.h src/ui/displayinfo.cpp src/ui/displayinfo.h src/ui/displaytext.cpp src/ui/displaytext.h src/ui/edit.cpp src/ui/edit.h src/ui/gauge.cpp src/ui/gauge.h src/ui/interface.cpp src/ui/interface.h src/ui/key.cpp src/ui/map.h src/ui/shortcut.h src/ui/slider.h src/ui/target.cpp src/ui/target.h src/ui/window.cpp src/ui/window.h
| * | Merge branch 'dev' of https://github.com/adiblol/colobot into dev-uierihel2012-09-031-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/restext.cpp src/common/restext.h
| * | | latest changes; few more classes should compile nowerihel2012-08-311-2/+2
| | | |
| * | | * wrong enum used for text alignmenterihel2012-08-181-4/+4
| | | | | | | | | | | | | | | | * wrong event function used
| * | | * minor changes to control.cpp to compile it without errorserihel2012-08-181-5/+6
| | | |
* | | | commented new part in cmakelist and reverted stubs in camera.cpp. Will be ↵Zaba9992012-09-101-5/+5
| | | | | | | | | | | | | | | | commited later after implementation is finished in dev-object branch.
* | | | Merge with changes from Zaba999 fork.Zaba9992012-09-101-5/+6
| | | |
* | | | Commenting out src/object/auto temporarilyPiotr Dziwinski2012-09-091-26/+26
| | | |
* | | | [src/object/auto] Folder rewrittenMichał Konopacki2012-09-091-26/+26
| |_|/ |/| |
* | | Merge branch 'dev' into dev-graphicsPiotr Dziwinski2012-09-091-1/+2
|\ \ \ | | |/ | |/|
| * | Move strings out of restext. Add i18n via gettextAlexander Monakov2012-08-251-1/+2
| |/
* | CModelFile fixes; test frameworkPiotr Dziwinski2012-09-081-0/+3
| | | | | | | | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* | New model file formatPiotr Dziwinski2012-08-311-1/+4
|/ | | | | | | - added new binary and text formats for models - fixes and improvements in CModelFile - tool for converting model files - minor additions and fixes
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 13:36:29 +0000