[Performous-commit] Lasse Karkkainen : LIB_SUFFIX improvements

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: dance
Commit: 20e1891ced34a83b3c57154b299b3a135eaa5a14

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Nov 20 05:40:35 2009 +0200

LIB_SUFFIX improvements

---

 CMakeLists.txt               |    2 ++
 libs/plugin++/CMakeLists.txt |    2 ++
 libs/plugin++/src/loader.cc  |    6 +++++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48ac49..d2b391d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,8 @@ add_subdirectory(data)
 add_subdirectory(game)
 add_subdirectory(docs)
 
+set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 for lib64)")
+
 option(ENABLE_EDITOR "Enable experimental song editor (doesn't work)" OFF)
 
 if (ENABLE_EDITOR)
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index b92b983..4817fae 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -4,6 +4,8 @@ cmake_policy(VERSION 2.6)
 
 include_directories(include)
 
+set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 for lib64)")
+
 if(CMAKE_COMPILER_IS_GNUCXX)
 	message(STATUS "GCC detected, adding compile flags")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wextra")
diff --git a/libs/plugin++/src/loader.cc b/libs/plugin++/src/loader.cc
index b39c8eb..c7bdb4c 100644
--- a/libs/plugin++/src/loader.cc
+++ b/libs/plugin++/src/loader.cc
@@ -15,6 +15,10 @@ namespace fs = boost::filesystem;
 #define PATHSEP ';'
 #else
 #define PATHSEP ':'
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+#define UNIX_LIBPATH "/usr/lib" LIB_SUFFIX ":/usr/local/lib" LIB_SUFFIX
 #endif
 
 /// Break var (a delimited path string) into paths (appends folder if supplied).
@@ -56,7 +60,7 @@ loader::loader(fs::path const& folder) {
 #ifndef _WIN32
 	    // Try UNIX library paths
         parse(paths, std::getenv("LD_LIBRARY_PATH"), folder);
-        parse(paths, "/usr/lib" LIB_SUFFIX ":/usr/local/lib" LIB_SUFFIX, folder);
+        parse(paths, UNIX_LIBPATH, folder);
 #endif
     }
     // Load the contents of each folder