From 9451ee1a9732bad2e7ef9a4a080fd039eec3a840 Mon Sep 17 00:00:00 2001 From: Anselme Date: Mon, 14 Mar 2016 08:28:41 +0100 Subject: [PATCH] fixed liker issue with sfml dependencies --- template.cmake | 82 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/template.cmake b/template.cmake index ef97ed8..ae8b760 100644 --- a/template.cmake +++ b/template.cmake @@ -81,7 +81,7 @@ set(INCLUDE_PATHS ${INCLUDE_ROOT}) # endforeach() if(USE_ENGINE) - find_library(ENGINE_LIBRARY + find_library(SPARROW_ENGINE_LIBRARY NAMES SparrowEngine PATHS @@ -159,24 +159,74 @@ if(USE_SFML) 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) - find_library(SFML_DEPENDENCIES - NAMES - winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg - PATHS - ${LIB_PATHS} - ) - LIST(APPEND LIB_DEPENDENCIES_LIST ) + find_library(SFML_DEP_WINMM + NAMES winmm + PATHS ${LIB_PATHS} + ) + 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) - find_library(SFML_DEPENDENCIES - NAMES - freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg - PATHS - ${LIB_PATHS} - ) - endif() + 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 + LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_DEPENDENCIES}) # order is VERY important endif() if(USE_BULLET)