Changeset 2896 for code/trunk/cmake

Timestamp:

Apr 6, 2009, 1:59:00 AM (16 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/BuildConfig.cmake (modified) (1 diff)
• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• cmake/FindDirectX.cmake (modified) (1 prop)
• cmake/LibraryConfigTardis.cmake (modified) (1 prop)

code/trunk/cmake/BuildConfig.cmake

@@ -90 +90 @@
 ################ Compiler Config ################
 
-OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
+OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)" FALSE)
 
 INCLUDE(FlagUtilities)

code/trunk/cmake/BuildConfigGCC.cmake

@@ -63 +63 @@
 ADD_COMPILER_FLAGS("-Wno-sign-compare" GCC_NO_SYSTEM_HEADER_SUPPORT CACHE)
 
+# For newer GCC (4.3 and above), don't display hundreds of annoying deprecated
+# messages. Other versions don't seem to show any such warnings at all.
+ADD_COMPILER_FLAGS("-Wno-deprecated" CXX)
+
 # Increase warning level if requested
 IF(EXTRA_COMPILER_WARNINGS)