Changeset 2360

Timestamp:

Dec 9, 2008, 12:40:00 AM (16 years ago)

Author:

landauf

Message:

some small adjustments for mingw but still a problem with finding the lua library when building the toluabind files.

Location:

code/branches/buildsystem/cmake

Files:

• CheckOrxonoxWinDeps.cmake (modified) (1 diff)
• FindDirectX.cmake (modified) (1 diff)

code/branches/buildsystem/cmake/CheckOrxonoxWinDeps.cmake

@@ -41 +41 @@
   SET(ENV{OPENALDIR} "${MINGW_LIBRARY_DIR}/openal-0.0.8/common")
   SET(ENV{LUA_DIR} "${MINGW_LIBRARY_DIR}/lua-5.1.3")
-  SET(ENV{OGGVORBISDIR} "${MINGW_LIBRARY_DIR}/libogg-1.1.3")
-  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
+  SET(ENV{OGGVORBISDIR} "${MINGW_LIBRARY_DIR}/oggvorbis-1.1.3-1.2.0")
+  SET(TCL_INCLUDE_PATH "${MINGW_LIBRARY_DIR}/tcl8.5.2/generic")
+  SET(TCL_LIBRARY_PATH "${MINGW_LIBRARY_DIR}/tcl8.5.2/win")
   SET(ENV{CEGUIDIR} "${MINGW_LIBRARY_DIR}/cegui-0.6.1")
   SET(ENV{OGREDIR} "${MINGW_LIBRARY_DIR}/ogre/OgreMain;${MINGW_LIBRARY_DIR}/ogre/Samples/Common/bin/Release")
-  #IF (NOT ENV{DXSDK_DIR})
-  #  SET(ENV{DXSDK_DIR} "${MINGW_LIBRARY_DIR}/DXSDK")
-  #ENDIF (NOT ENV{DXSDK_DIR})
+  SET(ZLIB_INCLUDE_DIR "${MINGW_LIBRARY_DIR}/zlib/include")
+  SET(ZLIB_LIB_DIR "${MINGW_LIBRARY_DIR}/zlib")
+  IF (NOT ENV{DXSDK_DIR})
+    SET(ENV{DXSDK_DIR} "${MINGW_LIBRARY_DIR}/DXSDK")
+  ENDIF (NOT ENV{DXSDK_DIR})
 ENDIF (MINGW)
 

code/branches/buildsystem/cmake/FindDirectX.cmake

@@ -12 +12 @@
     PATHS
     $ENV{DXSDK_DIR}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES include Include
   )
 
   FIND_PATH(DirectX_LIB_DIR dinput8.lib
+    PATHS
     $ENV{DXSDK_DIR}
-    PATH_SUFFIXES lib lib/x86
+    PATH_SUFFIXES lib Lib lib/x86 Lib/x86
   )