tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): update amalgam symbol filters for mln namespace rename (#4531)

Browse Source
This commit is contained in:
Taku Fukada
2026-08-28 18:37:51 +09:00
committed by GitHub
parent c3b588321b
commit 6010a2e687
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linux/linux.cmake
View File

@@ -182,7 +182,7 @@ target_link_libraries(
) )
if(MLN_CREATE_AMALGAMATION) if(MLN_CREATE_AMALGAMATION)
if ("${ARMERGE}" STREQUAL "MLN_CREATE_AMALGAMATION") if(NOT ARMERGE)
message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON") message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON")
endif() endif()
message(STATUS "Found armerge: ${ARMERGE}") message(STATUS "Found armerge: ${ARMERGE}")
@@ -218,7 +218,7 @@ if(MLN_CREATE_AMALGAMATION)
add_custom_command( add_custom_command(
TARGET mbgl-core TARGET mbgl-core
POST_BUILD POST_BUILD
COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a
$<TARGET_FILE:mbgl-core> $<TARGET_FILE:mbgl-core>
$<TARGET_FILE:mbgl-freetype> $<TARGET_FILE:mbgl-freetype>
$<TARGET_FILE:mbgl-vendor-csscolorparser> $<TARGET_FILE:mbgl-vendor-csscolorparser>

4
platform/macos/macos.cmake
View File

@@ -146,7 +146,7 @@ add_test(
find_program(ARMERGE NAMES armerge) find_program(ARMERGE NAMES armerge)
if(MLN_CREATE_AMALGAMATION) if(MLN_CREATE_AMALGAMATION)
if ("${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND") if(NOT ARMERGE)
message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON") message(FATAL_ERROR "armerge required when MLN_CREATE_AMALGAMATION=ON")
endif() endif()
message(STATUS "Found armerge: ${ARMERGE}") message(STATUS "Found armerge: ${ARMERGE}")
@@ -161,7 +161,7 @@ if(MLN_CREATE_AMALGAMATION)
add_custom_command( add_custom_command(
TARGET mbgl-core TARGET mbgl-core
POST_BUILD POST_BUILD
COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a COMMAND ${ARMERGE} --keep-symbols 'mln.*' --output libmbgl-core-amalgam.a
$<TARGET_FILE:mbgl-core> $<TARGET_FILE:mbgl-core>
$<TARGET_FILE:mbgl-freetype> $<TARGET_FILE:mbgl-freetype>
$<TARGET_FILE:mbgl-vendor-csscolorparser> $<TARGET_FILE:mbgl-vendor-csscolorparser>