Changeset 2645

Timestamp:

Feb 12, 2009, 2:03:07 PM (16 years ago)

Author:

rgrieder

Message:

• Bugfix: CMake searches the install path per default when finding libraries. That means having Orxonox built my MSVC already installed will screw your mingw compilation.

—> Removed install path from the search paths for Windows

• Bugfix: Media path default value was still pointing to the development media directory.

Tested mingw and msvc 2008 binaries on another windows xp box (no installed depdencies, no visual studio, no mingw installed, no DirectX SDK, just DX9.0c). It runs without initial orxonox.ini, as should be the case anyway.
Now its time to test this on Linux, though there will be files written to usr/bin

Location:

code/branches/buildsystem2

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (1 diff)

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -28 +28 @@
 INCLUDE(CompareVersionStrings)
 INCLUDE(FindPackageHandleStandardArgs)
+
+# Prevent CMake from finding libraries in the installation folder on windows
+# There might already be an installation from another compiler
+LIST(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
 ############## Platform Scripts #################

code/branches/buildsystem2/src/OrxonoxConfig.h.in

@@ -188 +188 @@
 namespace orxonox
 {
-    const char* const ORXONOX_MEDIA_PATH("@ORXONOX_MEDIA_DIRECTORY@");
+#ifdef ORXONOX_PLATFORM_WINDOWS
+    const char* const ORXONOX_MEDIA_PATH("../media");
+#elif defined(ORXONOX_PLATFORM_LINUX)
+    const char* const ORXONOX_MEDIA_PATH("../share/orxonox");
+#else
+    /* TODO: Apple? */
+    const char* const ORXONOX_MEDIA_PATH("../share/orxonox");
+#endif
     
 #ifdef NDEBUG