mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libraries order to avoid linking error in updater library

Browse Source
This commit is contained in:
David Capello 2015-06-12 18:43:10 -03:00
parent 9a6ac48bfa
commit 8da36f990b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/CMakeLists.txt
View File

@ -30,7 +30,19 @@ if(MSVC)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif(MSVC)
# Libraries in this directory
if(ENABLE_UPDATER)
set(updater_lib updater-lib)
add_definitions(-DENABLE_UPDATER)
else()
set(updater_lib)
endif()
# Aseprite libraries
#
# TODO These libraries are in a specific order to avoid linking errors
# on Unix-like platforms. We could avoid this specific order if for
# each library we specify its dependencies using target_link_libraries()
#
set(aseprite_libraries
app-lib
fixmath-lib
@ -44,6 +56,7 @@ set(aseprite_libraries
ui-lib
she
gfx-lib
${updater_lib}
net-lib
base-lib)
@ -172,13 +185,6 @@ else()
if(CURL_STATICLIB)
add_definitions(-DCURL_STATICLIB)
endif()
set(aseprite_libraries ${aseprite_libraries} net-lib)
endif()
if(ENABLE_UPDATER)
set(aseprite_libraries ${aseprite_libraries} updater-lib)
add_definitions(-DENABLE_UPDATER)
endif()
if(ENABLE_WEBSERVER)