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 2cf0c06aa89b9ae3f33fca84e30b7d3c8bc840ea Author: Damjan Jovanovic <[email protected]> AuthorDate: Tue Dec 31 20:15:26 2024 +0200 Update the icu build files for Win64. Patch by: me --- main/icu/createmakWin64.cfg | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/main/icu/createmakWin64.cfg b/main/icu/createmakWin64.cfg index 1085fa92fb..53845fd652 100644 --- a/main/icu/createmakWin64.cfg +++ b/main/icu/createmakWin64.cfg @@ -35,6 +35,12 @@ CDEF1FLAGS= -D "_WINDOWS" -D "_MBCS" [CFlags_common] CPP_PROJ=-nologo -MD -Za -Zi -W3 -GF -O2 -Ob2 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c +[CFlags_samples_cal] +CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) + +[CFlags_samples_date] +CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) + [CFlags_i18n] CPP_PROJ=-MD -W3 -Oi -Op -GF -FD -GS -Gy -Za -Zi $(EXCEPTIONSWITCH) $(COPT) $(CPP_PROJ_INCLUDES) $(CDEFS) -Fp".\Release/i18n.pch" $(CPDBOBJ) -c @@ -77,6 +83,9 @@ CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c [CFlags_tools_genccode] CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) +[CFlags_tools_gencfu] +CPP_PROJ=-MD -O2 $(CTOOLSFLAGS) + [CFlags_tools_gencmn] CPP_PROJ=-O2 -Za $(CTOOLSFLAGS) @@ -147,6 +156,12 @@ COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll [LinkFlags_common] LINK32_FLAGS=icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a800000" /implib:"$(OUTDIR)\icuuc.lib" /libpath:"..\..\lib" +[LinkFlags_samples_cal] +LINK32_FLAGS=..\..\..\lib\icuuc.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib" + +[LinkFlags_samples_date] +LINK32_FLAGS=..\..\..\lib\icuuc.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib" + [LinkFlags_i18n] LINK32_FLAGS=icuuc.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUTDIR)\icuin.lib" /libpath:"..\..\lib" @@ -195,6 +210,9 @@ LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\tooluti [LinkFlags_tools_genccode] LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" +[LinkFlags_tools_gencfu] +LINK32_FLAGS=icuuc.lib icutu.lib icuin.lib $(COMMONLINKFLAGS_CONSOLE_NOPDB) /libpath:"..\..\..\lib" + [LinkFlags_tools_gennames] LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" @@ -262,7 +280,16 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icuin.lib" [AdditionalLinkObjects_layout] - "$(OUTDIR)\icuuc.lib" + "..\..\lib\icuuc.lib" \ + "..\..\lib\icuin.lib" + +[AdditionalLinkObjects_samples_cal] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icuin.lib" + +[AdditionalLinkObjects_samples_date] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icuin.lib" [AdditionalLinkObjects_io] "$(OUTDIR)\icuuc.lib" @@ -300,6 +327,11 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU "..\..\..\lib\icuuc.lib" \ "..\..\..\lib\icutu.lib" +[AdditionalLinkObjects_tools_gencfu] + "..\..\..\lib\icuuc.lib" \ + "..\..\..\lib\icutu.lib" \ + "..\..\..\lib\icuin.lib" \ + [AdditionalLinkObjects_tools_gencmn] "..\..\..\lib\icuuc.lib" \ "..\..\..\lib\icutu.lib"
