From 161cc7418afc97b60fb9b7f39488c895b2b0261a Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 10 Aug 2018 17:38:49 -0300 Subject: [PATCH] Use LAF_OS_BACKEND_LINK_FLAGS to link aseprite --- laf | 2 +- src/CMakeLists.txt | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/laf b/laf index e27c266b0..c4e2d79a7 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit e27c266b0d5bfc16818a70cd8919b9884aa67bea +Subproject commit c4e2d79a702116ea21499baca4e84bfa8f429b1b diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 249af8c7b..0c14b3a7d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,16 +179,9 @@ endif() target_link_libraries(aseprite app-lib ${PLATFORM_LIBS}) add_dependencies(aseprite copy_data) -if(MSVC) - if(ENABLE_UI AND (LAF_OS_BACKEND STREQUAL "skia")) - # Linking with "wsetargv.obj" to add support to expand filename - # wildcards in argc/argv. - set_target_properties(aseprite - PROPERTIES LINK_FLAGS "-LINK wsetargv.obj -ENTRY:\"wWinMainCRTStartup\"") - else() - set_target_properties(aseprite - PROPERTIES LINK_FLAGS "-LINK wsetargv.obj -ENTRY:\"wmainCRTStartup\"") - endif() +if(LAF_OS_BACKEND_LINK_FLAGS) + set_target_properties(aseprite PROPERTIES LINK_FLAGS + ${LAF_OS_BACKEND_LINK_FLAGS}) endif() install(TARGETS aseprite