Changeset 1975 for code/branches/buildsystem/src/CMakeLists.txt

Timestamp:

Oct 20, 2008, 5:53:16 PM (16 years ago)

Author:

adrfried

Message:

lua removed and using extern one

File:

• code/branches/buildsystem/src/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem/src/CMakeLists.txt

@@ -3 +3 @@
 INCLUDE_DIRECTORIES(ois) # for ois library subfolders
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(lua) # for tolua library and generator
+#INCLUDE_DIRECTORIES(lua) # for tolua library and generator
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
 
 ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
-ADD_SUBDIRECTORY(lua)
+#ADD_SUBDIRECTORY(lua)
 ADD_SUBDIRECTORY(tolua)
 
@@ -16 +17 @@
 # So first, find out what CEGUI version we have.
 
-IF (WIN32)
-    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
-ELSE (WIN32)
-    IF (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
-    ELSE (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
-    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
-ENDIF (WIN32)
-
+#IF (WIN32)
+#    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
+#    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+#ELSE (WIN32)
+#    IF (${CEGUI_VERSION} LESS 0.6.0)
+#        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
+#        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
+#    ELSE (${CEGUI_VERSION} LESS 0.6.0)
+#        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
+#        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+#    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
+#ENDIF (WIN32)
 
 # Our own libraries