Browse Source

Enabled C++11 on Linux

Ubuntu64_14_04 11 years ago
parent
commit
8afd8e09ce

+ 1 - 1
CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 
 project(GamePlay)
 project(GamePlay)
 
 

+ 1 - 0
gameplay/CMakeLists.txt

@@ -637,6 +637,7 @@ add_definitions(${GTK2_CFLAGS_OTHER})
 add_definitions(-D__linux__)
 add_definitions(-D__linux__)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 
+add_definitions(-std=c++11)
 add_definitions(-lstdc++)
 add_definitions(-lstdc++)
 
 
 add_library(gameplay STATIC
 add_library(gameplay STATIC

+ 1 - 0
samples/CMakeLists.txt

@@ -48,6 +48,7 @@ set(GAMEPLAY_LIBRARIES
     gobject-2.0
     gobject-2.0
 ) 
 ) 
 
 
+add_definitions(-std=c++11)
 add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 
 
 add_subdirectory(browser)
 add_subdirectory(browser)

+ 1 - 0
samples/browser/CMakeLists.txt

@@ -48,6 +48,7 @@ set(GAMEPLAY_LIBRARIES
     gobject-2.0
     gobject-2.0
 ) 
 ) 
 
 
+add_definitions(-std=c++11)
 add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 add_definitions(-lstdc++ -lgameplay -lm -llua -lz -lpng -lvorbis -logg -lBulletCollision -lBulletDynamics -lLinearMath -lopenal -LGLEW -lGL -lrt -ldl -lX11 -lpthread -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0)
 
 
 set( GAME_NAME sample-browser)
 set( GAME_NAME sample-browser)

+ 1 - 0
template/template-CMakeLists.txt

@@ -14,6 +14,7 @@ set(GAMEPLAY_EXT_LIBS_PATH "${GAMEPLAY_SRC_PATH}/external-deps")
 
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
     ADD_DEFINITIONS(-D__linux__)
     ADD_DEFINITIONS(-D__linux__)
+    ADD_DEFINITIONS(-std=c++11)
     SET(TARGET_OS "LINUX")
     SET(TARGET_OS "LINUX")
     SET(TARGET_OS_DIR "linux")
     SET(TARGET_OS_DIR "linux")
 ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Windows")
 ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Windows")