فهرست منبع

Fixed VS2008 build.

Lasse Öörni 14 سال پیش
والد
کامیت
c3b1d57a17
3فایلهای تغییر یافته به همراه17 افزوده شده و 13 حذف شده
  1. 7 5
      CMakeLists.txt
  2. 1 1
      Engine/Graphics/CMakeLists.txt
  3. 9 7
      ThirdParty/Assimp/CMakeLists.txt

+ 7 - 5
CMakeLists.txt

@@ -51,11 +51,13 @@ endif ()
 # Macro for precompiled headers
 # Macro for precompiled headers
 macro (enable_pch)
 macro (enable_pch)
     if (MSVC)
     if (MSVC)
-        foreach(FILE ${CPP_FILES})
-            if (${FILE} MATCHES "Precompiled.cpp$")
-                set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YcPrecompiled.h")
-            else ()
-                set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YuPrecompiled.h")
+        foreach(FILE ${SOURCE_FILES})
+            if (${FILE} MATCHES "[A-Za-z0-9 _/]*[.]cpp")
+                if (${FILE} MATCHES "Precompiled.cpp$")
+                    set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YcPrecompiled.h")
+                else ()
+                    set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YuPrecompiled.h")
+                endif ()
             endif ()
             endif ()
         endforeach ()
         endforeach ()
     endif ()
     endif ()

+ 1 - 1
Engine/Graphics/CMakeLists.txt

@@ -27,7 +27,7 @@ endif ()
 # Define target & libraries to link
 # Define target & libraries to link
 add_library (${TARGET_NAME} STATIC ${SOURCE_FILES})
 add_library (${TARGET_NAME} STATIC ${SOURCE_FILES})
 target_link_libraries (${TARGET_NAME} Container Core Math Resource Scene)
 target_link_libraries (${TARGET_NAME} Container Core Math Resource Scene)
-	
+
 if (USE_OPENGL)
 if (USE_OPENGL)
     target_link_libraries (${TARGET_NAME} GLee GLFW)
     target_link_libraries (${TARGET_NAME} GLee GLFW)
 else ()
 else ()

+ 9 - 7
ThirdParty/Assimp/CMakeLists.txt

@@ -620,18 +620,20 @@ SET ( CONTRIB_FILES
 )
 )
 
 
 ADD_LIBRARY( Assimp STATIC
 ADD_LIBRARY( Assimp STATIC
-    ${SOURCE_FILES}
-    ${CONTRIB_FILES}
+	${SOURCE_FILES}
+	${CONTRIB_FILES}
 	${PUBLIC_HEADERS}
 	${PUBLIC_HEADERS}
 	${COMPILER_HEADERS}
 	${COMPILER_HEADERS}
 )
 )
 
 
 if (MSVC)
 if (MSVC)
     foreach(FILE ${SOURCE_FILES})
     foreach(FILE ${SOURCE_FILES})
-        if (${FILE} MATCHES "AssimpPCH.cpp$")
-            set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YcAssimpPCH.h")
-        else()
-            set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YuAssimpPCH.h")
-        endif()
+        if (${FILE} MATCHES "[A-Za-z0-9 _/]*[.]cpp")
+            if (${FILE} MATCHES "AssimpPCH.cpp$")
+                set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YcAssimpPCH.h")
+            else ()
+                set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YuAssimpPCH.h")
+            endif ()
+        endif ()
     endforeach ()
     endforeach ()
 endif ()
 endif ()