Changeset 2546

Timestamp:

Dec 29, 2008, 5:43:40 PM (16 years ago)

Author:

rgrieder

Message:

Workaround to avoid the dependencies from OrxonoxStableHeaders.h on gcc when not using precompiled header files.

Location:

code/branches/buildsystem2

Files:

• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/pch (added)
• src/orxonox/pch/havepch (added)
• src/orxonox/pch/havepch/OrxonoxStableHeaders.h (moved) (moved from code/branches/buildsystem2/src/orxonox/OrxonoxStableHeaders.h)
• src/orxonox/pch/nopch (added)
• src/orxonox/pch/nopch/OrxonoxStableHeaders.h (added)
• visual_studio/vc8/orxonox.vsprops (modified) (1 diff)

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -17 +17 @@
 
 TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
+
+# Not using precompiled header files: Avoid dependencies
+INCLUDE_DIRECTORIES(pch/nopch)
 
 ADD_EXECUTABLE(orxonox ${ORXONOX_SRC_FILES})

code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops

@@ -9 +9 @@
                 Name="VCCLCompilerTool"
                 AdditionalOptions="/MP2 /Zm200"
+                AdditionalIncludeDirectories=""$(RootDir)\src\orxonox\pch\havepch""
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;ORXONOX_ENABLE_PCH;LUA_BUILD_AS_DLL"
                 UsePrecompiledHeader="2"