Fix building with osx+cmake on travis.
(cherry-picked from commit f5d74cd5ed
)
This commit is contained in:
parent
b53e875bc6
commit
f262321864
2 changed files with 32 additions and 7 deletions
|
@ -285,8 +285,8 @@ add_library(wesnoth-game ${LIBRARY_TYPE} EXCLUDE_FROM_ALL ${libwesnoth-game_STAT
|
|||
if(ENABLE_GAME)
|
||||
add_executable(wesnoth WIN32 wesnoth.cpp)
|
||||
|
||||
target_link_libraries(wesnoth
|
||||
-Wl,--start-group
|
||||
if(NOT APPLE)
|
||||
set(static-libs -Wl,--start-group
|
||||
wesnoth-client
|
||||
lua
|
||||
wesnoth-core
|
||||
|
@ -294,7 +294,19 @@ if(ENABLE_GAME)
|
|||
wesnoth-sdl
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client
|
||||
-Wl,--end-group
|
||||
-Wl,--end-group)
|
||||
else()
|
||||
set(static-libs wesnoth-client
|
||||
lua
|
||||
wesnoth-core
|
||||
wesnoth-game
|
||||
wesnoth-sdl
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client)
|
||||
endif(NOT APPLE)
|
||||
|
||||
target_link_libraries(wesnoth
|
||||
${static-libs}
|
||||
${game-external-libs}
|
||||
)
|
||||
set_target_properties(wesnoth
|
||||
|
@ -367,8 +379,8 @@ if(ENABLE_TESTS)
|
|||
|
||||
add_executable(boost_unit_tests ${test_SRC})
|
||||
|
||||
target_link_libraries(boost_unit_tests
|
||||
-Wl,--start-group
|
||||
if(NOT APPLE)
|
||||
set(static-libs -Wl,--start-group
|
||||
wesnoth-client
|
||||
lua
|
||||
wesnoth-core
|
||||
|
@ -376,7 +388,19 @@ if(ENABLE_TESTS)
|
|||
wesnoth-sdl
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client
|
||||
-Wl,--end-group
|
||||
-Wl,--end-group)
|
||||
else()
|
||||
set(static-libs wesnoth-client
|
||||
lua
|
||||
wesnoth-core
|
||||
wesnoth-game
|
||||
wesnoth-sdl
|
||||
${WIDGETS_LIB}
|
||||
wesnoth-client)
|
||||
endif(NOT APPLE)
|
||||
|
||||
target_link_libraries(boost_unit_tests
|
||||
${static-libs}
|
||||
${game-external-libs}
|
||||
boost_unit_test_framework
|
||||
)
|
||||
|
|
|
@ -23,9 +23,10 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
|||
brew install ccache
|
||||
travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
|
||||
else
|
||||
brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer openssl glew
|
||||
brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer openssl glew ccache
|
||||
export CXXFLAGS="-I/usr/local/opt/openssl/include $CFLAGS"
|
||||
export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
|
||||
export PATH="/usr/local/opt/openssl/include:$PATH"
|
||||
fi
|
||||
else
|
||||
if [ "$NLS" != "true" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue