fixed liker issue with sfml dependencies

This commit is contained in:
Anselme 2016-03-14 08:28:41 +01:00
parent fa12432926
commit 9451ee1a97

View File

@ -81,7 +81,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,24 +159,74 @@ if(USE_SFML)
add_definitions(-DSFML_STATIC) add_definitions(-DSFML_STATIC)
find_library(SFML_DEP_FREETYPE
NAMES freetype
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_JPEG
NAMES jpeg
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_OPENAL
NAMES openal openal32
PATHS ${LIB_PATHS}
)
find_library(SFML_DEP_FLAC
NAMES flac
PATHS ${LIB_PATHS}
)
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}
)
if(WIN32) if(WIN32)
find_library(SFML_DEPENDENCIES find_library(SFML_DEP_WINMM
NAMES NAMES winmm
winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg PATHS ${LIB_PATHS}
PATHS )
${LIB_PATHS} find_library(SFML_DEP_GDI
) NAMES gdi32
LIST(APPEND LIB_DEPENDENCIES_LIST ) 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) elseif(UNIX)
find_library(SFML_DEPENDENCIES LIST(APPEND LIB_DEPENDENCIES_LIST
NAMES ${SFML_DEP_FREETYPE}
freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg ${SFML_DEP_JPEG}
PATHS ${SFML_DEP_OPENAL}
${LIB_PATHS} ${SFML_DEP_FLAC}
) ${SFML_DEP_VORBISENC}
endif() ${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 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)