summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #114 from OdyX/dev-update-cmake-with-datakrzys-h2013-01-091-9/+12
|\ | | | | Let CMake rely on data's CMakeLists.txt if it exists
| * Let CMake rely on data's CMakeLists.txt if it existsDidier Raboud2013-01-021-4/+7
| | | | | | | | - Also update data to latest 'dev', where the CMakeLists exists
| * Revert "Minor cmake grammar fix"Didier Raboud2012-12-301-5/+5
| | | | | | | | | | | | It appears I was really wrong. Damn. This reverts commit 277629f9fec069afce32a21fd6baeb4f24d5784c.
* | CMakeLists enhancementsPiotr Dziwinski2013-01-081-4/+21
| | | | | | | | | | | | | | - compiler detection (clang and gcc version check) - compile flags only for src/ subdir - system and local include paths - fix for clang compilation
* | Merge dev and dev-graphicsPiotr Dziwinski2013-01-071-1/+1
|\ \
| * | Small fix in detecting language. Fixes needed to compile code using clangMarcin Zawadzki2013-01-051-1/+1
| |/
* / Corrected OpenGL extension detectionPiotr Dziwinski2013-01-051-35/+11
|/ | | | | | - corrected multitexture and VBO detection - GLEW is now a required library - minor CMakeLists refactoring
* Fix for TEST_VIRTUALPiotr Dziwinski2012-12-291-1/+1
|
* Create a central versionDidier Raboud2012-12-271-0/+26
| | | | | | | | | 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
* Minor cmake grammar fixDidier Raboud2012-12-271-5/+5
| | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them. Re-do a7d837460f5eeba060900031322d088ba330964c
* sound fixerihel2012-12-201-0/+2
|
* removing plugins for gold version (for mxe cross compiling)erihel2012-12-201-1/+0
|
* Installation path fixes and CMakeLists refactoringPiotr Dziwinski2012-12-201-16/+38
| | | | make && make install should now give a working installation.
* Put common CXX flags in common variablesDidier Raboud2012-12-191-2/+3
| | | | | CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it.
* Don't enforce CMake build type on users.Didier Raboud2012-12-191-1/+3
| | | | Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
* Merge pull request #97 from OdyX/dev-minor-cmake-grammar-fixkrzys-h2012-12-181-2/+2
|\ | | | | Minor cmake grammar fix
| * Minor cmake grammar fixDidier Raboud2012-12-181-2/+2
| | | | | | | | It is redundant to have CMAKE_INSTALL_PREFIX in path definitions; drop them.
* | Allow building and installation of documentationDidier Raboud2012-12-171-0/+13
|/ | | | | | | Run `make doc` for the building. Then `make install` will install the generated documentation. - Move Doxyfile to Doxyfile.in, put CMAKE_CURRENT_SOURCE_DIR into it.
* Install libCBot to a private directoryDidier Raboud2012-12-171-2/+4
| | | | | | | | closes #90 - Make it configurable; - Move stanzas above the src directory inclusion, otherwise the value doesn't propagate.
* Set a default datadir, in sync with the data installation path.Didier Raboud2012-12-161-2/+3
|
* GMock: fixed using system packagePiotr Dziwinski2012-12-161-1/+5
|
* Split gtest and gmock, fixed using system packagesPiotr Dziwinski2012-12-161-5/+24
| | | | | | - split the bundled gtest and gmock libraries - allowed the use of system gmock - refactoring in CMakeLists
* Merge branch 'master' into devPiotr Dziwinski2012-12-151-2/+7
|\
| * Reverted lib/, fixed gtest path in CMakeLists.txtPiotr Dziwinski2012-12-141-3/+3
| | | | | | | | | | Some gtest system packages use name gtest-all.cc. lib/ directory should be left in repository.
| * Merge pull request #85 from OdyX/cmake_find_ltdlMichał Zieliński2012-12-141-0/+1
| |\ | | | | | | Add FindLTDL cmake module
| | * Add FindLTDL cmake moduleDidier Raboud2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | As mentionned in FindLTDL.cmake, this is code that is hereby relicensed under GPLv3. closes #68
| * | Use system-provided Google test library.Didier Raboud2012-12-141-2/+6
| |/ | | | | | | | | | | | | | | | | This avoids library duplication, in favour of a shared (source) library: libgtest-dev is available at least on Debian, Ubuntu, Gentoo, Fedora, at the time of committing. If the library is not found in system paths, a copy of it in lib/gtest can work too.
* | 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/+3
|/
* MXE support and CMake files refactoringPiotr Dziwinski2012-09-291-13/+98
| | | | | | - added support for cross-compiling with MXE (http://mxe.cc/) - refactored CMake files, adding some options and moving definitions to more suitable places
* Profile rewritten to boost. Read/write to ini should work.Zaba9992012-09-271-1/+1
| | | | Load/Save should work.
* changed paths for models and levels. Now it's possible to load level. Merged ↵Zaba9992012-09-201-0/+8
| | | | with latest trunk
* CModelFile fixes; test frameworkPiotr Dziwinski2012-09-081-1/+7
| | | | | | - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework
* Compile fixPiotr Dziwinski2012-08-121-1/+1
|
* Merge branch 'dev-opengl' into deverihel2012-08-121-0/+1
|\
| * Basic font renderingPiotr Dziwinski2012-08-031-0/+1
| | | | | | | | | | - added basic font rendering - minor refactoring & fixes
* | * changed 0, NULL to nullptrerihel2012-08-091-1/+1
|/ | | | | | | * changed profile.cpp to use SimpleIni to load config files * added new CProfile singleton class for loading config * added SimpleIni to lib/ dir * added config loading tests
* Switched to new style castsPiotr Dziwinski2012-07-301-2/+2
| | | | | | - rewrote old C-style casts to new ..._cast<> - corrected some dangerous casts - added -Wold-style-cast to compile flags
* GLEWPiotr Dziwinski2012-07-281-5/+15
| | | | Added GLEW for loading OpenGL extensions
* Merge branch 'dev' into dev-openglPiotr Dziwinski2012-07-271-2/+2
|\ | | | | | | Pulled changes & resolved conflicts
| * Dependency on WINAPI completely removed.Zaba9992012-07-101-2/+3
| |
| * Fixed code compilation without fpermissive flag.Zaba9992012-07-041-2/+2
| | | | | | | | | | Removed Winapi, but now library don't work - work in progress. Some translations.
* | Multitexturing supportPiotr Dziwinski2012-07-041-0/+1
| | | | | | | | | | | | | | | | - added CImage class for loading/saving images and a simple test for it - added libpng library to build - added Gfx::Texture struct - updated the Gfx::CDevice interface to include new features - implemented the new features in Gfx::CGLDevice
* | CDevice interface and stub of implementationPiotr Dziwinski2012-07-011-0/+2
| | | | | | | | | | | | | | | | - added CDevice abstract interface - began implementation of CGLDevice - added stub for Texture struct - created CGLDeviceConfig - changed particule -> particle & other minor changes
* | Switched back to old standard; addded -WallPiotr Dziwinski2012-06-301-2/+2
| | | | | | | | | | - removed -std=c++11 - added -Wall and removed most reported warnings
* | Event handling, CApplication and switch to c++-11Piotr Dziwinski2012-06-301-2/+2
|/ | | | | | - added/changed event structs and event queue in common/event.h - added event handling and some minor functions in CApplication - switched to --std=c++11 because of union in Event struct
* Removed old code and build targetPiotr Dziwinski2012-06-261-4/+3
| | | | | | | - removed directory with old target - changed CMakeLists.txt to new target only and temporarily commented out reference to CBot - updated README
* SDL projectPiotr Dziwinski2012-06-251-2/+9
| | | | | | | | - added (very basic) SDL template in CApplication and CEngine - split project into two targets: colobot_old (dependent on DirectX and WinAPI) and colobot_new (dependent on SDL and OpenGL) - moved sound.h/cpp to old/ and created new template in Snd namespace - added platform-independent dialog boxes in app/system.h/cpp
* Adding new MinGW branchPiotr Dziwinski2012-04-151-0/+14