Changeset 2623

Timestamp:

Jan 30, 2009, 12:27:17 PM (16 years ago)

Author:

rgrieder

Message:

• Fixed FindDirectX for use with CMake 2.6.0 (2.6.2 worked without problems). The script was finding the dlls in system32 instead of the libs in the DXSDK_DIR when configuring MinGW.
• Small fix in ceguilua CMLs
• CMake 2.6.0 fix when specifying BOOST_ROOT

Location:

code/branches/buildsystem2

Files:

• cmake/FindDirectX.cmake (modified) (1 diff)
• cmake/LibraryConfigMSVC.cmake (modified) (1 diff)
• src/ceguilua/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/cmake/FindDirectX.cmake

@@ -12 +12 @@
 
 FIND_PATH(DIRECTX_INCLUDE_DIR dinput.h
-  PATHS
-  $ENV{DXSDK_DIR}
+  PATHS $ENV{DXSDK_DIR}
   PATH_SUFFIXES include
 )
 FIND_LIBRARY(DIRECTX_LIBRARY_input dinput8
-  PATHS
-  $ENV{DXSDK_DIR}
+  PATHS $ENV{DXSDK_DIR}
+  PATH_SUFFIXES lib Lib lib/x86 Lib/x86
+  NO_DEFAULT_PATH # Or else CMake 2.6.0 will find the dll in system32 on windows
+)
+FIND_LIBRARY(DIRECTX_LIBRARY_input dinput8
+  PATHS $ENV{DXSDK_DIR}
   PATH_SUFFIXES lib Lib lib/x86 Lib/x86
 )
 FIND_LIBRARY(DIRECTX_LIBRARY_guid dxguid
-  PATHS
-  $ENV{DXSDK_DIR}
+  PATHS $ENV{DXSDK_DIR}
+  PATH_SUFFIXES lib Lib lib/x86 Lib/x86
+  NO_DEFAULT_PATH # Or else CMake 2.6.0 will find the dll in system32 on windows
+)
+FIND_LIBRARY(DIRECTX_LIBRARY_guid dxguid
+  PATHS $ENV{DXSDK_DIR}
   PATH_SUFFIXES lib Lib lib/x86 Lib/x86
 )

code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake

@@ -45 +45 @@
   # Note: When setting ENV${} variables, make sure to use quotes when
   #       having multiple directories.
-  SET(BOOST_ROOT             ${MSVC_LIBRARY_DIR}/boost-1.35.0)
-  SET(BOOST_LIBRARYDIR       ${MSVC_LIBRARY_DIR}/boost-1.35.0/lib)
+  SET(ENV{BOOST_ROOT}        ${MSVC_LIBRARY_DIR}/boost-1.35.0)
   SET(ENV{CEGUIDIR}          ${MSVC_LIBRARY_DIR}/cegui-0.6.1)
   SET(ENV{ENETDIR}           ${MSVC_LIBRARY_DIR}/enet-1.2)

code/branches/buildsystem2/src/ceguilua/CMakeLists.txt

@@ -28 +28 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CEGUILUA_BINARY_DIR}/lua_CEGUI.cpp
-  COMMAND tolua++gen_orxonox -n CEGUI
+  COMMAND tolua++app_orxonox -n CEGUI
                              -w ${CEGUILUA_BINARY_DIR}
                              -o lua_CEGUI.cpp