Menu
▾
▴
[Performous-commit] Vincent Le Ligeour : Added some Windows build stuff
|
From: Yoda-JM <yo...@us...> - 2009-09-25 13:58:30
|
Module: performous
Branch: master
Commit: 6c8f3d4f5f0c2edcfe2805581eabffc1d4b6fa85
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Sep 25 15:58:01 2009 +0200
Added some Windows build stuff
---
cmake/Modules/FindBoost.cmake | 6 +++---
cmake/Modules/FindGLEW.cmake | 2 +-
cmake/Modules/FindJpeg.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindOpenGL.cmake | 4 ++--
cmake/Modules/FindPThread.cmake | 21 +++++++++++++++++++++
cmake/Modules/FindPng.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindSDL.cmake | 2 +-
cmake/Modules/FindTiff.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindZ.cmake | 28 ++++++++++++++++++++++++++++
tools/cover_conv.cpp | 3 +++
10 files changed, 143 insertions(+), 7 deletions(-)
diff --git a/cmake/Modules/FindBoost.cmake b/cmake/Modules/FindBoost.cmake
index 9cda27d..bf38344 100644
--- a/cmake/Modules/FindBoost.cmake
+++ b/cmake/Modules/FindBoost.cmake
@@ -76,7 +76,7 @@
# MESSAGE(STATUS "Finding Boost libraries.... ")
-SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" "1.36.0" "1.36" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
+SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" "1.36.0" "1.36" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
############################################
#
@@ -284,7 +284,7 @@ ELSE (_boost_IN_CACHE)
SET (_boost_COMPILER "-vc90")
ENDIF(MSVC90)
IF (MINGW)
- SET (_boost_COMPILER "-mgw")
+ SET (_boost_COMPILER "-mgw44")
ENDIF(MINGW)
IF (CYGWIN)
SET (_boost_COMPILER "-gcc")
@@ -317,7 +317,7 @@ ELSE (_boost_IN_CACHE)
SET( _boost_STATIC_TAG "")
IF (WIN32)
- SET (_boost_ABI_TAG "g")
+ SET (_boost_ABI_TAG "")
SET( _boost_STATIC_TAG "-s")
ENDIF(WIN32)
SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
diff --git a/cmake/Modules/FindGLEW.cmake b/cmake/Modules/FindGLEW.cmake
index badee76..7fb93a1 100644
--- a/cmake/Modules/FindGLEW.cmake
+++ b/cmake/Modules/FindGLEW.cmake
@@ -19,7 +19,7 @@ find_path(GLEW_INCLUDE_DIR
)
find_library(GLEW_LIBRARY
- NAMES GLEW
+ NAMES GLEW GLEW32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindJpeg.cmake b/cmake/Modules/FindJpeg.cmake
new file mode 100644
index 0000000..c5cc9b6
--- /dev/null
+++ b/cmake/Modules/FindJpeg.cmake
@@ -0,0 +1,28 @@
+# - Try to find Jpeg
+# Once done, this will define
+#
+# Jpeg_FOUND - system has Jpeg
+# Jpeg_INCLUDE_DIRS - the Jpeg include directories
+# Jpeg_LIBRARIES - link these to use Jpeg
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(Jpeg_PKGCONF jpeg)
+
+find_path(Jpeg_INCLUDE_DIR
+ NAMES jconfig.h
+ PATHS ${Jpeg_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Jpeg_LIBRARY
+ NAMES jpeg
+ PATHS ${Jpeg_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Jpeg_PROCESS_INCLUDES Jpeg_INCLUDE_DIR)
+set(Jpeg_PROCESS_LIBS Jpeg_LIBRARY)
+libfind_process(Jpeg)
+
diff --git a/cmake/Modules/FindOpenGL.cmake b/cmake/Modules/FindOpenGL.cmake
index b660117..c37c380 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
+ NAMES GL OpenGL32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
find_library(OpenGL_GLU_LIBRARY
- NAMES GLU
+ NAMES GLU GLU32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindPThread.cmake b/cmake/Modules/FindPThread.cmake
new file mode 100644
index 0000000..a404e28
--- /dev/null
+++ b/cmake/Modules/FindPThread.cmake
@@ -0,0 +1,21 @@
+# - Try to find PThread
+# Once done, this will define
+#
+# PThread_FOUND - system has PThread
+# PThread_LIBRARIES - link these to use PThread
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(Png_PKGCONF PThread)
+
+find_library(PThread_LIBRARY
+ NAMES pthreadGC2
+ PATHS ${PThread_PKGCONF_LIBRARY_DIRS}
+)
+
+set(PThread_PROCESS_LIBS PThread_LIBRARY)
+libfind_process(PThread)
+
diff --git a/cmake/Modules/FindPng.cmake b/cmake/Modules/FindPng.cmake
new file mode 100644
index 0000000..0f52098
--- /dev/null
+++ b/cmake/Modules/FindPng.cmake
@@ -0,0 +1,28 @@
+# - Try to find Png
+# Once done, this will define
+#
+# Png_FOUND - system has Png
+# Png_INCLUDE_DIRS - the Png include directories
+# Png_LIBRARIES - link these to use Png
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(Png_PKGCONF Png)
+
+find_path(Png_INCLUDE_DIR
+ NAMES pngconf.h
+ PATHS ${Png_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Png_LIBRARY
+ NAMES png12
+ PATHS ${Png_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Png_PROCESS_INCLUDES Png_INCLUDE_DIR)
+set(Png_PROCESS_LIBS Png_LIBRARY)
+libfind_process(Png)
+
diff --git a/cmake/Modules/FindSDL.cmake b/cmake/Modules/FindSDL.cmake
index e89c44a..2d4e557 100644
--- a/cmake/Modules/FindSDL.cmake
+++ b/cmake/Modules/FindSDL.cmake
@@ -39,7 +39,7 @@ if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
if (SDL_SDLmain_LIBRARY)
set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} SDL_SDLmain_LIBRARY)
endif (SDL_SDLmain_LIBRARY)
- set(SDL_PROCESS_LIBS SDL_SDL_LIBRARY)
+ set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} SDL_SDL_LIBRARY)
endif(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
set(SDL_PROCESS_INCLUDES SDL_INCLUDE_DIR)
diff --git a/cmake/Modules/FindTiff.cmake b/cmake/Modules/FindTiff.cmake
new file mode 100644
index 0000000..dcc7988
--- /dev/null
+++ b/cmake/Modules/FindTiff.cmake
@@ -0,0 +1,28 @@
+# - Try to find Tiff
+# Once done, this will define
+#
+# Tiff_FOUND - system has Tiff
+# Tiff_INCLUDE_DIRS - the Tiff include directories
+# Tiff_LIBRARIES - link these to use Tiff
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(Tiff_PKGCONF tiff)
+
+find_path(Tiff_INCLUDE_DIR
+ NAMES tiffconf.h
+ PATHS ${Tiff_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Tiff_LIBRARY
+ NAMES libtiff
+ PATHS ${Tiff_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Tiff_PROCESS_INCLUDES Tiff_INCLUDE_DIR)
+set(Tiff_PROCESS_LIBS Tiff_LIBRARY)
+libfind_process(Tiff)
+
diff --git a/cmake/Modules/FindZ.cmake b/cmake/Modules/FindZ.cmake
new file mode 100644
index 0000000..63db9d6
--- /dev/null
+++ b/cmake/Modules/FindZ.cmake
@@ -0,0 +1,28 @@
+# - Try to find Z
+# Once done, this will define
+#
+# Z_FOUND - system has Z
+# Z_INCLUDE_DIRS - the Z include directories
+# Z_LIBRARIES - link these to use Z
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(Z_PKGCONF Z)
+
+find_path(Z_INCLUDE_DIR
+ NAMES zconf.h
+ PATHS ${Z_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Z_LIBRARY
+ NAMES z
+ PATHS ${Z_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Z_PROCESS_INCLUDES Z_INCLUDE_DIR)
+set(Z_PROCESS_LIBS Z_LIBRARY)
+libfind_process(Z)
+
diff --git a/tools/cover_conv.cpp b/tools/cover_conv.cpp
index 81a5699..d0bacf2 100644
--- a/tools/cover_conv.cpp
+++ b/tools/cover_conv.cpp
@@ -1,5 +1,8 @@
#include <boost/lexical_cast.hpp>
#include <iostream>
+#ifdef __WIN32__
+# include <windows.h>
+#endif
#include "ss_cover.hh"
|
