Changeset 6040 for sandbox_light/src/external

Timestamp:

Nov 5, 2009, 10:15:05 PM (15 years ago)

Author:

rgrieder

Message:

Also synchronised sandbox_light with current trunk.

Location:

sandbox_light

Files:

• . (modified) (1 prop)
• src/external/ogremath/CMakeLists.txt (modified) (2 diffs)
• src/external/tolua/CMakeLists.txt (modified) (2 diffs)

sandbox_light/src/external/ogremath/CMakeLists.txt

@@ -18 +18 @@
  #
 
-SET(OGREMATH_SRC_FILES
+SET_SOURCE_FILES(OGREMATH_SRC_FILES
+COMPILATION_BEGIN OgreCompilation.cc
   OgreColourValue.cpp
   OgreMath.cpp
@@ -27 +28 @@
   OgreVector3.cpp
   OgreVector4.cpp
+COMPILATION_END
 )
 
 IF(WIN32)
-  LIST(APPEND OGREMATH_SRC_FILES WIN32/OgreTimer.cpp)
+  ADD_SOURCE_FILES(OGREMATH_SRC_FILES WIN32/OgreTimer.cpp)
 ELSEIF(APPLE)
-  LIST(APPEND OGREMATH_SRC_FILES OSX/OgreTimer.cpp)
+  ADD_SOURCE_FILES(OGREMATH_SRC_FILES OSX/OgreTimer.cpp)
 ELSEIF(UNIX)
-  LIST(APPEND OGREMATH_SRC_FILES GLX/OgreTimer.cpp)
+  ADD_SOURCE_FILES(OGREMATH_SRC_FILES GLX/OgreTimer.cpp)
 ENDIF()
 

sandbox_light/src/external/tolua/CMakeLists.txt

@@ -20 +20 @@
 ################### Tolua++ library ###################
 
-SET(TOLUA++_FILES
+SET_SOURCE_FILES(TOLUA++_FILES
   tolua_event.h
   tolua++.h
-
+COMPILATION_BEGIN ToluaCompilation.c
   tolua_event.c
   tolua_is.c
@@ -29 +29 @@
   tolua_push.c
   tolua_to.c
+COMPILATION_END
 )
-GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
-
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
 
 ORXONOX_ADD_LIBRARY(tolua++_orxonox