Changeset 8068

Timestamp:

Mar 13, 2011, 3:54:54 PM (13 years ago)

Author:

landauf

Message:

adjusted a few library names and search paths for mingw dependencies

Location:

code/branches/kicklib/cmake

Files:

• PackageConfigMinGW.cmake (modified) (1 diff)
• tools/FindOgg.cmake (modified) (1 diff)
• tools/FindPOCO.cmake (modified) (1 diff)
• tools/FindVorbis.cmake (modified) (2 diffs)

code/branches/kicklib/cmake/PackageConfigMinGW.cmake

@@ -48 +48 @@
   # to specify the libraries ourselves.
   SET(TCL_LIBRARY  ${DEP_BINARY_DIR}/tcl85.dll CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/zlib1.dll CACHE FILEPATH "")
+  SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/libzlib.dll CACHE FILEPATH "")
 
 ENDIF(MINGW)

code/branches/kicklib/cmake/tools/FindOgg.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
-  NAMES ogg
+  NAMES ogg ogg-0
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib

code/branches/kicklib/cmake/tools/FindPOCO.cmake

@@ -29 +29 @@
 FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
   PATHS $ENV{POCODIR}
-  PATH_SUFFIXES include
+  PATH_SUFFIXES include Foundation/include
 )
 FIND_LIBRARY(POCO_LIBRARY_OPTIMIZED

code/branches/kicklib/cmake/tools/FindVorbis.cmake

@@ -22 +22 @@
 )
 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
-  NAMES vorbis
+  NAMES vorbis vorbis-0
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
@@ -32 +32 @@
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
-  NAMES vorbisfile
+  NAMES vorbisfile vorbisfile-3
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib