build sqlite3 and lzma on Windows anyway
and use the same config.h in all platforms. Compiling these libraries only takes a few seconds so no need to exclude Windows here it should also fix the win arm64 build This patch reverts commite4421ce01dAuthor: Xisco Fauli <xiscofauli@libreoffice.org> Date: Mon Nov 10 22:35:22 2025 +0100 sqlite3: don't create a static library on Windows and part of commit1cb84d60d9Author: Xisco Fauli <xiscofauli@libreoffice.org> Date: Thu Oct 30 20:11:23 2025 +0100 external: add lzma Change-Id: Ia66242d4fef78cf8d99f853db4c9eee2e24c62ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194023 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
@@ -146,7 +146,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
|
||||
))
|
||||
endif
|
||||
|
||||
ifneq ($(OS),WNT)
|
||||
ifneq ($(filter LZMA,$(BUILD_TYPE)),)
|
||||
ifneq ($(SYSTEM_LZMA),)
|
||||
|
||||
@@ -226,7 +225,6 @@ endef
|
||||
|
||||
endif # SYSTEM_SQLITE3
|
||||
endif # SQLITE3
|
||||
endif # !WNT
|
||||
|
||||
ifeq (SANE,$(filter SANE,$(BUILD_TYPE)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user