2
0
Эх сурвалжийг харах

Merge branch 'master' into fix-gltf2-sparse-indicesType

Kim Kulling 3 жил өмнө
parent
commit
b22098c234
1 өөрчлөгдсөн 1 нэмэгдсэн , 2 устгасан
  1. 1 2
      CMakeLists.txt

+ 1 - 2
CMakeLists.txt

@@ -288,12 +288,11 @@ ELSEIF( CMAKE_COMPILER_IS_MINGW )
     message(WARNING "MinGW is old, if you experience errors, update MinGW.")
     message(WARNING "MinGW is old, if you experience errors, update MinGW.")
   ENDIF()
   ENDIF()
   IF(NOT ASSIMP_HUNTER_ENABLED)
   IF(NOT ASSIMP_HUNTER_ENABLED)
-    SET(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
     SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
     SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
   ENDIF()
   ENDIF()
   SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
   SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wa,-mbig-obj -O3 ${CMAKE_CXX_FLAGS}")
   SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
   SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
-  ADD_DEFINITIONS( -U__STRICT_ANSI__ )
 ENDIF()
 ENDIF()
 
 
 IF ( IOS AND NOT ASSIMP_HUNTER_ENABLED)
 IF ( IOS AND NOT ASSIMP_HUNTER_ENABLED)