diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-27 18:09:50 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-27 18:09:50 +0200 |
| commit | ab8e55a651f71921406bd216ca30f966db81c691 (patch) | |
| tree | 78fc12d70ab9def2771f7176818d4231da0e2299 /CMakeLists.txt | |
| parent | 4ddcd9f810fa588ccf90442f7b4e5ddf385e85f2 (diff) | |
| parent | 6b846aa62924df0dea4af78c6333f0bd141bda78 (diff) | |
| download | colobot-ab8e55a651f71921406bd216ca30f966db81c691.tar.gz colobot-ab8e55a651f71921406bd216ca30f966db81c691.tar.bz2 colobot-ab8e55a651f71921406bd216ca30f966db81c691.zip | |
Merge branch 'dev' into dev-opengl
Pulled changes & resolved conflicts
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8264ef7..82a6e80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ find_package(PNG REQUIRED) set(CMAKE_BUILD_TYPE debug) # Global compile flags -set(CMAKE_CXX_FLAGS_RELEASE "-O2") -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0") +set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -std=gnu++0x") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -std=gnu++0x") # Subdirectory with sources add_subdirectory(src bin) |