This commit is contained in:
Lendemor 2016-03-20 17:28:35 +01:00
commit f4eb424df5

View File

@ -80,7 +80,7 @@ set(INCLUDE_PATHS ${INCLUDE_ROOT})
# endforeach() # endforeach()
if(USE_ENGINE) if(USE_ENGINE)
find_library(ENGINE_LIBRARY find_library(SPARROW_ENGINE_LIBRARY
NAMES NAMES
SparrowEngine SparrowEngine
PATHS PATHS
@ -159,29 +159,78 @@ if(USE_SFML)
add_definitions(-DSFML_STATIC) add_definitions(-DSFML_STATIC)
if(WIN32) find_library(SFML_DEP_FREETYPE
find_library(SFML_DEPENDENCIES NAMES freetype
NAMES PATHS ${LIB_PATHS}
winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg )
PATHS find_library(SFML_DEP_JPEG
${LIB_PATHS} NAMES jpeg
) PATHS ${LIB_PATHS}
LIST(APPEND LIB_DEPENDENCIES_LIST ) )
elseif(UNIX) find_library(SFML_DEP_OPENAL
find_library(SFML_DEPENDENCIES NAMES openal openal32
NAMES PATHS ${LIB_PATHS}
freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg )
PATHS find_library(SFML_DEP_FLAC
${LIB_PATHS} NAMES flac FLAC
) PATHS ${LIB_PATHS}
endif() )
find_library(SFML_DEP_VORBISENC
NAMES vorbisenc
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_VORBISFILE
NAMES vorbisfile
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_VORBIS
NAMES vorbis
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_OGG
NAMES ogg
PATHS ${LIB_PATHS}
)
LIST(APPEND LIB_DEPENDENCIES_LIST if(WIN32)
${SFML_LIBRARY_WINDOW} find_library(SFML_DEP_WINMM
${SFML_LIBRARY_GRAPHICS} NAMES winmm
${SFML_LIBRARY_SYSTEM} PATHS ${LIB_PATHS}
${SFML_LIBRARY_AUDIO} )
${SFML_DEPENDENCIES}) # order is VERY important find_library(SFML_DEP_GDI
NAMES gdi32
PATHS ${LIB_PATHS}
)
LIST(APPEND LIB_DEPENDENCIES_LIST
${SFML_DEP_WINMM}
${SFML_DEP_GDI}
${SFML_DEP_FREETYPE}
${SFML_DEP_JPEG}
${SFML_DEP_OPENAL}
${SFML_DEP_FLAC}
${SFML_DEP_VORBISENC}
${SFML_DEP_VORBISFILE}
${SFML_DEP_VORBIS}
${SFML_DEP_OGG}
)
elseif(UNIX)
LIST(APPEND LIB_DEPENDENCIES_LIST
${SFML_DEP_FREETYPE}
${SFML_DEP_JPEG}
${SFML_DEP_OPENAL}
${SFML_DEP_FLAC}
${SFML_DEP_VORBISENC}
${SFML_DEP_VORBISFILE}
${SFML_DEP_VORBIS}
${SFML_DEP_OGG}
)
endif()
LIST(APPEND LIB_DEPENDENCIES_LIST
${SFML_LIBRARY_WINDOW}
${SFML_LIBRARY_GRAPHICS}
${SFML_LIBRARY_SYSTEM}
${SFML_LIBRARY_AUDIO}
${SFML_DEPENDENCIES}) # order is VERY important
endif() endif()
if(USE_BULLET) if(USE_BULLET)