wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-24 08:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

[Basilisk] Issue MoonchildProductions/UXP#2165 - Support ICU as shared library in packaging.

Browse source 
Also removing obsolete MOZ_SYSTEM_ICU
This commit is contained in:
roytam1 2023-03-28 13:59:47 +08:00
commit 09138ab01d
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/basilisk/installer/Makefile.in
View file

@ -129,8 +129,8 @@ endif
DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT) DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT)
DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION) DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
ifdef MOZ_SYSTEM_ICU ifdef MOZ_SHARED_ICU
DEFINES += -DMOZ_SYSTEM_ICU DEFINES += -DMOZ_SHARED_ICU
endif endif
ifdef MOZ_ICU_DATA_ARCHIVE ifdef MOZ_ICU_DATA_ARCHIVE
DEFINES += -DMOZ_ICU_DATA_ARCHIVE DEFINES += -DMOZ_ICU_DATA_ARCHIVE

9
application/basilisk/installer/package-manifest.in
View file

@ -105,6 +105,15 @@
#ifdef MOZ_ICU_DATA_ARCHIVE #ifdef MOZ_ICU_DATA_ARCHIVE
@RESPATH@/@ICU_DATA_FILE@ @RESPATH@/@ICU_DATA_FILE@
#endif #endif
#ifdef MOZ_SHARED_ICU
#ifdef XP_WIN
@BINPATH@/icu@MOZ_ICU_VERSION@.dll
#elif defined(XP_MACOSX)
@BINPATH@/icu@MOZ_ICU_VERSION@.dylib
#elif defined(XP_UNIX)
@BINPATH@/libicu@MOZ_ICU_VERSION@.so
#endif
#endif
#ifdef MOZ_GTK3 #ifdef MOZ_GTK3
@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ @BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@