Просмотр исходного кода

All externals building and copying to the right place.

Cameron Hart 14 лет назад
Родитель
Сommit
86d9aef62b

+ 2 - 2
CMake/ExternalGLExt.cmake

@@ -1,12 +1,12 @@
 # download some headers missing from Windows
-SET(GLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/include/GL/glext.h)
+SET(GLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/Include/GL/glext.h)
 IF(NOT EXISTS ${GLEXT_H})
     FILE(DOWNLOAD http://www.opengl.org/registry/api/glext.h 
         ${GLEXT_H}
         SHOW_PROGRESS)
 ENDIF(NOT EXISTS ${GLEXT_H})
 
-SET(WGLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/include/GL/wglext.h)
+SET(WGLEXT_H ${POLYCODE_DEPS_CORE_PREFIX}/Include/GL/wglext.h)
 IF(NOT EXISTS ${WGLEXT_H})
     FILE(DOWNLOAD http://www.opengl.org/registry/api/wglext.h 
         ${WGLEXT_H}

+ 3 - 3
CMake/ExternalOggVorbis.cmake

@@ -65,15 +65,15 @@ INSTALL(FILES ${install_dir}/lib/libvorbisfile${CMAKE_STATIC_LIBRARY_SUFFIX}
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/liboggd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libvorbisd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libvorbisfiled${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug)
 
 # install release shared library

+ 1 - 1
CMake/ExternalOpenAL.cmake

@@ -33,7 +33,7 @@ INSTALL(FILES ${install_dir}/lib/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug
     RENAME OpenAL32d${CMAKE_SHARED_LIBRARY_SUFFIX})
 

+ 2 - 2
CMake/ExternalPNG.cmake

@@ -55,11 +55,11 @@ INSTALL(FILES ${install_dir}/lib/libpng15${CMAKE_STATIC_LIBRARY_SUFFIX}
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/zlibd1${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libpng15d${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug)
 
 # install release shared library

+ 1 - 1
CMake/ExternalPhysFS.cmake

@@ -34,7 +34,7 @@ INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX}
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
     CONFIGURATIONS Debug
     RENAME physfsd${CMAKE_SHARED_LIBRARY_SUFFIX})
 

+ 9 - 5
CMake/libvorbis.cmake

@@ -16,11 +16,15 @@ FIND_PATH(OGG_INCLUDE_DIR NAMES ogg/ogg.h)
 FIND_LIBRARY(OGG_RELEASE_LIBRARY NAMES libogg)
 FIND_LIBRARY(OGG_DEBUG_LIBRARY NAMES liboggd)
 
-IF(OGG_RELEASE_LIBRARY AND OGG_DEBUG_LIBRARY)
-    SET(OGG_LIBRARY debug ${OGG_DEBUG_LIBRARY} optimized ${OGG_RELEASE_LIBRARY})
-ELSE()
-    SET(OGG_LIBRARY ${OGG_RELEASE_LIBRARY})
-ENDIF()
+IF(OGG_DEBUG_LIBRARY)
+    LIST(APPEND OGG_LIBRARY debug ${OGG_DEBUG_LIBRARY})
+ENDIF(OGG_DEBUG_LIBRARY)
+IF(OGG_RELEASE_LIBRARY)
+    LIST(APPEND OGG_LIBRARY  optimized ${OGG_RELEASE_LIBRARY})
+ENDIF(OGG_RELEASE_LIBRARY)
+
+MESSAGE("CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
+MESSAGE("OGG_LIBRARY=${OGG_LIBRARY}")
 
 SET(libvorbis_SRCS
     lib/analysis.c