mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-31 11:41:46 +02:00
Code Issues Projects Releases Wiki Activity

removed not required CURL module, renamed several cmake-build options for be more easy sortable by name

Browse Source
This commit is contained in:
filux
2015-09-27 19:46:35 +02:00
parent 4ad684deaf
commit 4bef525bf3
21 changed files with 358 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mk/cmake/Modules/FindOGG.cmake
View File

@@ -6,10 +6,6 @@
# VORBIS_FILE_LIBRARY
#
IF(WANT_STATIC_LIBS)
OPTION(OGG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON)
ENDIF()
# check for cache to avoid littering log
IF(OGG_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY)
SET(OGG_BE_QUIET TRUE)
@@ -17,14 +13,14 @@ ENDIF()
FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
IF (OGG_STATIC AND NOT OGG_LIBRARY)
FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
IF (STATIC_OGG AND NOT OGG_LIBRARY)
FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg.a ogg)
ELSE()
FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
ENDIF()
IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
IF (STATIC_OGG AND NOT VORBIS_LIBRARY)
FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis.a vorbis)
ELSE()
FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis)
ENDIF()
@@ -33,8 +29,8 @@ ENDIF()
#IF(NOT APPLE)
# comment above is full of lies
IF (OGG_STATIC AND NOT VORBIS_FILE_LIBRARY)
FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile)
IF (STATIC_OGG AND NOT VORBIS_FILE_LIBRARY)
FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES libvorbisfile.a vorbisfile.a vorbisfile)
ELSE()
FIND_LIBRARY(VORBIS_FILE_LIBRARY NAMES vorbisfile)
ENDIF()