mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 04:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now updater-lib is always compiled as it's required for app.os.fullName in scripts (fix #4486)

Browse Source 
ENABLE_UPDATER flag now only controls the "check update" portion of
the updater-lib. Probably the user agent string could be moved to the
ver-lib in the future.
This commit is contained in:
David Capello 2024-05-22 12:41:23 -03:00
parent c44040fdc7
commit 8fce589069
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -117,6 +117,10 @@ if(REQUIRE_CURL)
add_subdirectory(net) add_subdirectory(net)
endif() endif()
# We need the updater library to check for updates (when
# ENABLE_UPDATER) or for the app.os object (ENABLE_SCRIPTING).
add_subdirectory(updater)
if(GEN_EXE) if(GEN_EXE)
add_executable(gen IMPORTED) add_executable(gen IMPORTED)
set_target_properties(gen PROPERTIES IMPORTED_LOCATION ${GEN_EXE}) set_target_properties(gen PROPERTIES IMPORTED_LOCATION ${GEN_EXE})
@ -127,10 +131,6 @@ else()
set(GEN_DEP gen) set(GEN_DEP gen)
endif() endif()
if(ENABLE_UPDATER)
add_subdirectory(updater)
endif()
if(ENABLE_STEAM) if(ENABLE_STEAM)
add_subdirectory(steam) add_subdirectory(steam)
endif() endif()

5
src/app/CMakeLists.txt
View File

@ -717,6 +717,7 @@ target_link_libraries(app-lib
laf-os laf-os
ui-lib ui-lib
ver-lib ver-lib
updater-lib
undo undo
${CMARK_LIBRARIES} ${CMARK_LIBRARIES}
${TINYXML_LIBRARY} ${TINYXML_LIBRARY}
@ -756,10 +757,6 @@ if(ENABLE_SCRIPTING)
endif() endif()
endif() endif()
if(ENABLE_UPDATER)
target_link_libraries(app-lib updater-lib)
endif()
if(ENABLE_STEAM) if(ENABLE_STEAM)
# We need the ENABLE_STEAM flag in main module too so AppOptions are # We need the ENABLE_STEAM flag in main module too so AppOptions are
# equal in both modules, app-lib and main (that's why this flag is # equal in both modules, app-lib and main (that's why this flag is

22
src/updater/CMakeLists.txt
View File

@ -1,15 +1,15 @@
# ASEPRITE # ASEPRITE
# Copyright (C) 2020-2021 Igara Studio S.A. # Copyright (C) 2020-2024 Igara Studio S.A.
# Copyright (C) 2001-2017 David Capello # Copyright (C) 2001-2017 David Capello
set(UPDATER_LIB_SOURCES # By default the updater-lib will contain only the functions related
check_update.cpp # the user agent string.
user_agent.cpp) add_library(updater-lib user_agent.cpp)
target_link_libraries(updater-lib laf-base ver-lib)
add_library(updater-lib ${UPDATER_LIB_SOURCES}) # Only when ENABLE_UPDATER is ON we'll enable the "check for update"
# portion of the library.
target_link_libraries(updater-lib if(ENABLE_UPDATER)
laf-base target_sources(updater-lib PRIVATE check_update.cpp)
net-lib target_link_libraries(updater-lib net-lib ${TINYXML_LIBRARY})
ver-lib endif()
${TINYXML_LIBRARY})