Changeset 1813

Timestamp:

Sep 21, 2008, 9:15:00 PM (16 years ago)

Author:

rgrieder

Message:

Added all necessary dependencies so that the tolua bind files are always regenerated when needed.

Location:

code/trunk/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/core/CMakeLists.txt

@@ -58 +58 @@
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
   COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
-  DEPENDS tolua
+  DEPENDS tolua_orxonox tolua/tolua.pkg
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )

code/trunk/src/orxonox/CMakeLists.txt

@@ -70 +70 @@
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
   COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
-  DEPENDS tolua ${CMAKE_SOURCE_DIR}/src/orxonox/tolua/tolua.pkg
+  DEPENDS tolua_orxonox tolua/tolua.pkg
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -281 +281 @@
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, this);
 
-        //Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
+        Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
 
         // create a full screen default viewport

code/trunk/src/tolua/CMakeLists.txt

@@ -35 +35 @@
   DEPENDS
     toluagen_orxonox
+        tolua-5.1.pkg
     lua/compat-5.1.lua
     lua/compat.lua
@@ -41 +42 @@
     lua/verbatim.lua
     lua/code.lua
-    lua/ypedef.lua
+    lua/typedef.lua
     lua/container.lua
     lua/package.lua