mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-03 21:46:20 +00:00
Fix FTBFS with --as-needed linker option
Libraries must be placed after object files in command line. More information: https://bugs.gentoo.org/show_bug.cgi?id=445814 Conflicts: src/CMakeLists.txt
This commit is contained in:
parent
b381d3a7b3
commit
9ba5ef44ca
@ -152,6 +152,10 @@ endif()
|
|||||||
# All libraries for .exe files
|
# All libraries for .exe files
|
||||||
set(all_libs ${aseprite_libraries} ${libs3rdparty} ${sys_libs})
|
set(all_libs ${aseprite_libraries} ${libs3rdparty} ${sys_libs})
|
||||||
|
|
||||||
|
if(LIBALLEGRO4_LINK_FLAGS)
|
||||||
|
set(all_libs ${all_libs} ${LIBALLEGRO4_LINK_FLAGS})
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(aseprite-library
|
add_library(aseprite-library
|
||||||
app.cpp
|
app.cpp
|
||||||
app_menus.cpp
|
app_menus.cpp
|
||||||
@ -414,10 +418,6 @@ endif(UNIX)
|
|||||||
|
|
||||||
add_executable(aseprite WIN32 main.cpp ${win32_resources} ${x11_resources})
|
add_executable(aseprite WIN32 main.cpp ${win32_resources} ${x11_resources})
|
||||||
target_link_libraries(aseprite ${all_libs})
|
target_link_libraries(aseprite ${all_libs})
|
||||||
if(LIBALLEGRO4_LINK_FLAGS)
|
|
||||||
set_target_properties(aseprite
|
|
||||||
PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
install(TARGETS aseprite
|
install(TARGETS aseprite
|
||||||
RUNTIME DESTINATION bin)
|
RUNTIME DESTINATION bin)
|
||||||
@ -454,8 +454,7 @@ function(find_unittests dir dependencies)
|
|||||||
add_executable(${testname} ${testsourcefile})
|
add_executable(${testname} ${testsourcefile})
|
||||||
target_link_libraries(${testname} gtest ${ARGV})
|
target_link_libraries(${testname} gtest ${ARGV})
|
||||||
if(LIBALLEGRO4_LINK_FLAGS)
|
if(LIBALLEGRO4_LINK_FLAGS)
|
||||||
set_target_properties(${testname}
|
target_link_libraries(${testname} ${LIBALLEGRO4_LINK_FLAGS})
|
||||||
PROPERTIES LINK_FLAGS ${LIBALLEGRO4_LINK_FLAGS})
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(extra_definitions)
|
if(extra_definitions)
|
||||||
|
Loading…
Reference in New Issue
Block a user