From: Christoph Sommer <mail@christoph-sommer.de>
Date: Thu, 22 Nov 2007 01:43:29 +0000 (+0000)
Subject: Experimenting with reversing library order in FindOggVorbis.cmake. Please test if... 
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2fe261e59aa7ae4b250145107f8ca2af7289be18;p=supertux.git

Experimenting with reversing library order in FindOggVorbis.cmake. Please test if this breaks things for other systems...

SVN-Revision: 5187
---

diff --git a/mk/cmake/FindOggVorbis.cmake b/mk/cmake/FindOggVorbis.cmake
index 1659ff965..a9ca2ad0f 100644
--- a/mk/cmake/FindOggVorbis.cmake
+++ b/mk/cmake/FindOggVorbis.cmake
@@ -21,7 +21,9 @@ find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
 find_library(VORBISENC_LIBRARY NAMES vorbisenc)
 if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
    set(OGGVORBIS_FOUND TRUE)
-   set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
+#  [sommer] (for SuperTux) reversed order of libraries, so that cmake 2.4.5 for Windows generates an MSYS Makefile that will link correctly
+#  set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
+   set(OGGVORBIS_LIBRARIES ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY})
    set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
    set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES})
    check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)