Changeset 115

Timestamp:

Oct 28, 2007, 11:26:54 PM (17 years ago)

Author:

anonymous

Message:

-m "cmake für windows angepasst"

Location:

code/trunk

Files:

• bin/run-script.bat (added)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• cmake/FindCEGUI_OGRE.cmake (modified) (1 diff)
• cmake/FindOGRE.cmake (modified) (1 diff)
• cmake/FindOIS.cmake (modified) (1 diff)

code/trunk/cmake/FindCEGUI.cmake

@@ -20 +20 @@
 ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR)
 
-# TODO: test wondows part.
-# windows part currently untested. (28.>Oct2007)
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for CEGUI")
-    SET(CEGUISDK $ENV{CEGUI_HOME})
-    STRING(REGEX REPLACE "[\\]" "/" CEGUISDK "${CEGUISDK}" )
-    SET(CEGUI_INCLUDE_DIR ${CEGUISDK}/include)
-    SET(CEGUI_LIB_DIR ${CEGUISDK}/lib)
-    SET(CEGUI_LIBRARIES debug OgreMain_d optimized OgreMain)
+    SET(CEGUI_INCLUDE_DIR ../ogre/Dependencies/include/CEGUI)
+    SET(CEGUI_LIB_DIR ../ogre/Samples/Common/bin/Release/lib)
+    SET(CEGUI_LIBRARIES debug CEGUIBase optimized CEGUIBase)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)

code/trunk/cmake/FindCEGUI_OGRE.cmake

@@ -20 +20 @@
 ENDIF (CEGUI_OGRE_LIBRARIES AND CEGUI_OGRE_INCLUDE_DIR)
 
-## TODO: test windows part
-# windows part is currently untested. (28.Oct.2007)
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for CEGUI_OGRE")
-    SET(CEGUI_OGRESDK $ENV{CEGUI_OGRE_HOME})
-    STRING(REGEX REPLACE "[\\]" "/" CEGUI_OGRESDK "${CEGUI_OGRESDK}" )
-    SET(CEGUI_OGRE_INCLUDE_DIR ${CEGUI_OGRESDK}/include)
-    SET(CEGUI_OGRE_LIB_DIR ${CEGUI_OGRESDK}/lib)
-    SET(CEGUI_OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
+    SET(CEGUI_OGRE_INCLUDE_DIR ../ogre/Dependencies/include/CEGUI)
+    SET(CEGUI_OGRE_LIB_DIR ../ogre/Samples/Common/bin/Release/lib)
+    SET(CEGUI_OGRE_LIBRARIES debug CEGUIBase optimized CEGUIBase)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)

code/trunk/cmake/FindOGRE.cmake

@@ -18 +18 @@
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OGRE")
-    SET(OGRESDK $ENV{OGRE_HOME})
-    STRING(REGEX REPLACE "[\\]" "/" OGRESDK "${OGRESDK}" )
-    SET(OGRE_INCLUDE_DIR ${OGRESDK}/include)
-    SET(OGRE_LIB_DIR ${OGRESDK}/lib)
+    SET(OGRE_INCLUDE_DIR ../ogre/OgreMain/include)
+    SET(OGRE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
 ELSE (WIN32) #Unix

code/trunk/cmake/FindOIS.cmake

@@ -20 +20 @@
 ENDIF (OIS_LIBRARIES AND OIS_INCLUDE_DIR)
 
-## TODO: test windows part
-# windows part is currently untested. (28.Oct.2007)
 IF (WIN32) #Windows
     MESSAGE(STATUS "Looking for OIS")
-    SET(OISSDK $ENV{OIS_HOME})
-    STRING(REGEX REPLACE "[\\]" "/" OISSDK "${OISSDK}" )
-    SET(OIS_INCLUDE_DIR ${OISSDK}/include)
-    SET(OIS_LIB_DIR ${OISSDK}/lib)
-    #SET(OIS_LIBRARIES debug OgreMain_d optimized OgreMain)
+    SET(OIS_INCLUDE_DIR ../ogre/Dependencies/include)
+    SET(OIS_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../ogre/Samples/Common/bin/Release)
+    SET(OIS_LIBRARIES debug OIS_d optimized OIS)
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)