[Performous-commit] unknown : Fixed GLEW to detect under MinGW

[Tapio V. <aa...@us...>]

Module: performous
Branch: dance
Commit: 5bbc7b330e828975e27c4a6a9ef39c2b1a70c1d6

Author: unknown <Alde@.(none)>
Date:   Tue Dec  1 21:26:46 2009 +0100

Fixed GLEW to detect under MinGW
Fixed OpenGL to detect under MinGW
Updated CMakeLists.txt in game folder to build correct dependencies under Windows
Updated lib/libda/CMakeLists.txt to link with Boost system and filesystem (fix for Windows)
Updated CMakeLists.txt in lib/libda/plugins/CMakeLists.txt to link with libplugin++.a
Fixed libs/libda/plugins/audio_dev_pa19.cpp with #include<stdint.h>
Fixed tools/CMakeLists.txt to add correct dependencies under Windows

---

 cmake/Modules/FindGLEW.cmake          |    5 +++--
 cmake/Modules/FindOpenGL.cmake        |    4 ++--
 game/CMakeLists.txt                   |    2 +-
 libs/libda/CMakeLists.txt             |    2 +-
 libs/libda/plugins/CMakeLists.txt     |    3 +++
 libs/libda/plugins/audio_dev_pa19.cpp |    1 +
 tools/CMakeLists.txt                  |    6 +++---
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmake/Modules/FindGLEW.cmake b/cmake/Modules/FindGLEW.cmake
index 7fb93a1..8040c33 100644
--- a/cmake/Modules/FindGLEW.cmake
+++ b/cmake/Modules/FindGLEW.cmake
@@ -14,12 +14,13 @@ include(LibFindMacros)
 libfind_pkg_check_modules(OpenGL_PKGCONF gl)
 
 find_path(GLEW_INCLUDE_DIR
-  NAMES GL/glew.h
+  NAMES glew.h
   PATHS ${OpenGL_INCLUDE_DIRS}
+  PATH_SUFFIXES GL
 )
 
 find_library(GLEW_LIBRARY
-  NAMES GLEW GLEW32
+  NAMES GLEW GLEW32.a GLEW32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/cmake/Modules/FindOpenGL.cmake b/cmake/Modules/FindOpenGL.cmake
index c37c380..7ac1128 100644
--- a/cmake/Modules/FindOpenGL.cmake
+++ b/cmake/Modules/FindOpenGL.cmake
@@ -20,12 +20,12 @@ find_path(OpenGL_INCLUDE_DIR
 )
 
 find_library(OpenGL_GL_LIBRARY
-  NAMES GL OpenGL32
+  NAMES GL libOpenGL32.a OpenGL32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
 find_library(OpenGL_GLU_LIBRARY
-  NAMES GLU GLU32
+  NAMES GLU libGLU32.a GLU32
   PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
 )
 
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index b2c5dd8..4e48a6c 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
 endif()
 
 # Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
 	list(APPEND LIBS ${${lib}_LIBRARIES})
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 76fe7eb..e6ea492 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -56,7 +56,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREAD ON)
-find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time)
+find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time system filesystem)
 include_directories(${Boost_INCLUDE_DIRS})
 
 if(SLAVE_LIB)
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 3abb7ff..9dbd2f6 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -148,6 +148,9 @@ if(PLUGIN_PORTAUDIO)
 	install(TARGETS da_audio_dev_pa${Portaudio_VERSION} DESTINATION ${LibDA_PLUGIN_DIR})
 	if(APPLE OR WIN32)
 		target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da)
+		if(WIN32)
+			target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} plugin++)
+		endif(WIN32)
 	endif(APPLE OR WIN32)
 endif(PLUGIN_PORTAUDIO)
 
diff --git a/libs/libda/plugins/audio_dev_pa19.cpp b/libs/libda/plugins/audio_dev_pa19.cpp
index 2383c13..cdebacd 100644
--- a/libs/libda/plugins/audio_dev_pa19.cpp
+++ b/libs/libda/plugins/audio_dev_pa19.cpp
@@ -1,4 +1,5 @@
 #include <libda/audio_dev.hpp>
+#include <stdint.h>
 #include <portaudio.h>
 #include <ostream>
 #include <sstream>
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5798c96..16c32ee 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Boost 1.34 REQUIRED COMPONENTS filesystem program_options)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Find all the libs that don't require extra parameters
-foreach(lib LibXML++ Magick++)
+foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype)
 	find_package(${lib})
 	if (${lib}_FOUND)
 		include_directories(${${lib}_INCLUDE_DIRS})
@@ -25,7 +25,7 @@ if (LibXML++_FOUND)
 	if (Boost_FOUND)
 		if (Magick++_FOUND)
 			add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp)
-			target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES})
+			target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
 			set(targets ${targets} ss_extract)
 		else (Magick++_FOUND)
 			message("No Magick++ found, not building ss_extract")
@@ -36,7 +36,7 @@ if (LibXML++_FOUND)
 
 	if (Magick++_FOUND)
 		add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp)
-		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES})
+		target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES})
 		set(targets ${targets} ss_cover_conv)
 	else (Magick++_FOUND)
 		message("No Magick++ found, not building ss_cover_conv")