This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d0f9ce409d7b7a9ca9e9a2cc97c3eeb3c8de5bce Author: Damjan Jovanovic <[email protected]> AuthorDate: Wed Jan 1 06:45:57 2025 +0200 Don't use $(OUTDIR) when referring to objects. It's often wrong in the *.vcproj files, and differs between x86 and x86-64. Rather use a path instead. Patch by: me --- main/icu/createmak.cfg | 14 +++++++------- main/icu/createmakWin64.cfg | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/icu/createmak.cfg b/main/icu/createmak.cfg index 4fe20cb059..41f331c684 100644 --- a/main/icu/createmak.cfg +++ b/main/icu/createmak.cfg @@ -269,10 +269,10 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU if exist [email protected] mt.exe -manifest [email protected] -outputresource:$@;<MANIFEST> [AdditionalLinkObjects_common] - $(OUTDIR)\icudata.lib + "..\..\lib\icudata.lib" [AdditionalLinkObjects_i18n] - "$(OUTDIR)\icuuc.lib" + "..\..\lib\icuuc.lib" [AdditionalLinkObjects_extra_uconv] "$(INTDIR)\uconvmsg.lib" \ @@ -292,12 +292,12 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icuin.lib" [AdditionalLinkObjects_io] - "$(OUTDIR)\icuuc.lib" + "..\..\lib\icuuc.lib" [AdditionalLinkObjects_layoutex] - "$(OUTDIR)\icuuc.lib" \ - "$(OUTDIR)\icuin.lib" \ - "$(OUTDIR)\icule.lib" + "..\..\lib\icuuc.lib" \ + "..\..\icuin.lib" \ + "..\..\icule.lib" [AdditionalLinkObjects_test_cintltst] "..\..\..\lib\icuuc.lib" \ @@ -407,7 +407,7 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icutu.lib" [AdditionalLinkObjects_tools_toolutil] - "$(OUTDIR)\icuuc.lib" + "..\..\..\lib\icuuc.lib" [Rules] diff --git a/main/icu/createmakWin64.cfg b/main/icu/createmakWin64.cfg index 53845fd652..666a7e7c14 100644 --- a/main/icu/createmakWin64.cfg +++ b/main/icu/createmakWin64.cfg @@ -269,10 +269,10 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU if exist [email protected] mt.exe -manifest [email protected] -outputresource:$@;<MANIFEST> [AdditionalLinkObjects_common] - $(OUTDIR)\icudata.lib + "..\..\lib\icudata.lib" [AdditionalLinkObjects_i18n] - "$(OUTDIR)\icuuc.lib" + "..\..\lib\icuuc.lib" [AdditionalLinkObjects_extra_uconv] "$(INTDIR)\uconvmsg.lib" \ @@ -292,12 +292,12 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icuin.lib" [AdditionalLinkObjects_io] - "$(OUTDIR)\icuuc.lib" + "..\..\lib\icuuc.lib" [AdditionalLinkObjects_layoutex] - "$(OUTDIR)\icuuc.lib" \ - "$(OUTDIR)\icuin.lib" \ - "$(OUTDIR)\icule.lib" + "..\..\lib\icuuc.lib" \ + "..\..\icuin.lib" \ + "..\..\icule.lib" [AdditionalLinkObjects_test_cintltst] "..\..\..\lib\icuuc.lib" \ @@ -407,7 +407,7 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icutu.lib" [AdditionalLinkObjects_tools_toolutil] - "$(OUTDIR)\icuuc.lib" + "..\..\..\lib\icuuc.lib" [Rules]
