[Gemrb-commits] SF.net SVN: gemrb:[5393] gemrb/trunk

[<lyn...@us...>]

Revision: 5393
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5393&view=rev
Author:   lynxlupodian
Date:     2008-10-04 20:40:45 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
cmake: another patch by zefklop for better vorbis detection

Modified Paths:
--------------
    gemrb/trunk/CMakeLists.txt
    gemrb/trunk/cmake_config.h.in
    gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt

Modified: gemrb/trunk/CMakeLists.txt
===================================================================
--- gemrb/trunk/CMakeLists.txt	2008-10-04 20:21:17 UTC (rev 5392)
+++ gemrb/trunk/CMakeLists.txt	2008-10-04 20:40:45 UTC (rev 5393)
@@ -90,6 +90,10 @@
 ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST )
 ENDIF(NOT WIN32)
 
+IF(VORBIS_LIBRARY)
+ SET(HAS_VORBIS_SUPPORT 1)
+ENDIF(VORBIS_LIBRARY)
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 #Plugin addtion macro

Modified: gemrb/trunk/cmake_config.h.in
===================================================================
--- gemrb/trunk/cmake_config.h.in	2008-10-04 20:21:17 UTC (rev 5392)
+++ gemrb/trunk/cmake_config.h.in	2008-10-04 20:40:45 UTC (rev 5393)
@@ -9,3 +9,4 @@
 #cmakedefine HAVE_STRNDUP 1
 #endif
 #cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1
+#cmakedefine HAS_VORBIS_SUPPORT 1

Modified: gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt
===================================================================
--- gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt	2008-10-04 20:21:17 UTC (rev 5392)
+++ gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt	2008-10-04 20:40:45 UTC (rev 5393)
@@ -4,6 +4,6 @@
 
 ADD_GEMRB_PLUGIN (ACMImporter ${ACMImporter_files})
 
-TARGET_LINK_LIBRARIES(ACMImporter ${SDL_LIBRARY})
+TARGET_LINK_LIBRARIES(ACMImporter ${VORBIS_LIBRARY})
 
 INSTALL( TARGETS ACMImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.