diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-01-19 12:20:03 +0100 |
| commit | e9336ecd0609725f9503ede9df365af2a55f71e8 (patch) | |
| tree | c04d5027c5f859ebb235e3534bb75b298667f278 /icu/makefile.mk | |
| parent | 1f6be0be35ae65ae7e93540dfa8e669da1a970ed (diff) | |
| parent | 2f324e58ca1102a272f9c375b87910bb2e8fe6a3 (diff) | |
CWS-TOOLING: integrate CWS mingwport33
Notes
Notes:
split repo tag: libs-extern-sys_ooo/DEV300_m98
Diffstat (limited to 'icu/makefile.mk')
| -rw-r--r-- | icu/makefile.mk | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 7542aeb1ccd1..b4a9d7dd3bbf 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -149,9 +149,9 @@ icu_LDFLAGS+=-shared-libgcc icu_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api .ENDIF icu_LDFLAGS+=-L$(COMPATH)$/lib -icu_LIBS=-lmingwthrd +icu_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -icu_LIBS+=-lstdc++_s +icu_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2 CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no' @@ -253,6 +253,30 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary .ENDIF +.IF "$(GUI)$(COM)"=="WNTGCC" +ALLTAR : \ + $(LB)$/icudata.lib \ + $(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icule$(ICU_BUILD_LIBPOST).lib \ + $(LB)$/icutu$(ICU_BUILD_LIBPOST).lib + +$(LB)$/icudata.lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icuuc$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icule$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ + +$(LB)$/icutu$(ICU_BUILD_LIBPOST).lib : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $@ +.ENDIF + # Since you never know what will be in a patch (for example, it may already # patch at configure level) or in the case of a binary patch, we remove the # entire package directory if a patch is newer. |