[Performous-commit] Lasse Karkkainen : Now it compiles on my machine. (ship it!)

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

Module: performous
Branch: master
Commit: 0ac4ac5a1df537c0904db8efa5f1a1deb62934ed

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Jul 10 23:16:48 2009 +0300

Now it compiles on my machine. (ship it!)

---

 silkystrings/CMakeLists.txt       |    2 ++
 silkystrings/src/CMakeLists.txt   |    3 ++-
 silkystrings/src/SongIterator.cpp |    9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/silkystrings/CMakeLists.txt b/silkystrings/CMakeLists.txt
index 7c569b8..0e29fc4 100644
--- a/silkystrings/CMakeLists.txt
+++ b/silkystrings/CMakeLists.txt
@@ -3,6 +3,8 @@ PROJECT(silkystrings)
 INCLUDE(FindSDL)
 INCLUDE(FindSDL_mixer)
 
+SET(BOOST_SUFFIX -mt)
+
 IF (CMAKE_COMPILER_IS_GNUCXX)
   ADD_DEFINITIONS (-g)
 ENDIF (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/silkystrings/src/CMakeLists.txt b/silkystrings/src/CMakeLists.txt
index 4c49f3b..7ea3083 100644
--- a/silkystrings/src/CMakeLists.txt
+++ b/silkystrings/src/CMakeLists.txt
@@ -35,7 +35,7 @@ ADD_LIBRARY(silkystrings-convenience
 )
 
 IF (NOT WIN32)
-  SET (GLFW_EXTRA_LIBS Xxf86vm)
+  SET (GLFW_EXTRA_LIBS Xxf86vm Xrandr)
 ENDIF (NOT WIN32)
 
 TARGET_LINK_LIBRARIES(silkystrings-convenience
@@ -52,6 +52,7 @@ IF (CMAKE_COMPILER_IS_GNUCXX)
 ENDIF (CMAKE_COMPILER_IS_GNUCXX)
 
 INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_BINARY_DIR}
   ${FREETYPE2_INCLUDE_DIR}
   ${GLFW_INCLUDE_DIR}
   ${BOOST_INCLUDE_DIR}
diff --git a/silkystrings/src/SongIterator.cpp b/silkystrings/src/SongIterator.cpp
index 9b78610..5709930 100644
--- a/silkystrings/src/SongIterator.cpp
+++ b/silkystrings/src/SongIterator.cpp
@@ -54,8 +54,9 @@ Launcher::SongIterator Launcher::SongIterator::operator++(){
 }
 
 bool Launcher::SongIterator::checkValidity(){
-	return  exists(*iter/"guitar.ogg") &&
-			exists(*iter/"notes.mid") &&
-			exists(*iter/"song.ini") &&
-			exists(*iter/"song.ogg");
+	boost::filesystem::path p = *iter;
+	return  exists(p/"guitar.ogg") &&
+			exists(p/"notes.mid") &&
+			exists(p/"song.ini") &&
+			exists(p/"song.ogg");
 }