diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-20 16:36:21 +0000 |
| commit | ecff07abeeb54ccf0b42aa7a6acd6d7074d261c7 (patch) | |
| tree | 3fb49a08b5fd5e3ff96368ee02750e80af89aa20 /setup_native/source/win32/customactions/reg4msdoc/makefile.mk | |
| parent | 3093e9cc7b8bda8299f6d9e97be7723d3614f2f8 (diff) | |
CWS-TOOLING: integrate CWS mingwport16
2009-01-15 13:11:20 +0100 releng r266363 : tidy-up tabs
2008-11-28 15:33:23 +0100 tono r264557 : i95203: mingw build without stlport
2008-11-22 07:19:50 +0100 tono r264180 : i96436: make mingw bridge conform with reg-struct-return
2008-11-22 05:14:58 +0100 tono r264179 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 17:09:04 +0100 tono r264153 : i95203: mingw build without stlport
2008-11-21 16:59:55 +0100 tono r264152 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:59:18 +0100 tono r264151 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:57:01 +0100 tono r264150 : i96436: make mingw bridge conform with reg-struct-return
2008-11-21 16:53:19 +0100 tono r264149 : i96100: mingw port for icu 4.0
2008-11-13 13:41:13 +0100 tono r263643 : i95203: mingw: Build without stlport
2008-11-13 13:29:38 +0100 tono r263640 : i96100: MinGW port for icu 4.0
2008-11-13 13:17:10 +0100 tono r263634 : i96098: MinGW port fix for new Windows API
2008-11-09 15:22:59 +0100 tono r263497 : i95198: mingwport do not interfere with Cygwin
2008-11-09 14:44:54 +0100 tono r263496 : i95190: mingwport avoid use of MS assembler
2008-11-09 14:32:26 +0100 tono r263495 : i95190: mingwport trivial build fixes
Diffstat (limited to 'setup_native/source/win32/customactions/reg4msdoc/makefile.mk')
| -rw-r--r-- | setup_native/source/win32/customactions/reg4msdoc/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk index ebb56841d770..31dca4a271b7 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk @@ -43,7 +43,10 @@ MINGW_NODLL=YES .INCLUDE : settings.mk -CFLAGS+=-DUNICODE -D_UNICODE -D_STLP_USE_STATIC_LIB +CFLAGS+=-DUNICODE -D_UNICODE +.IF "$(USE_SYSTEM_STL)" != "YES" +CFLAGS+=-D_STLP_USE_STATIC_LIB +.ENDIF # --- Files -------------------------------------------------------- @@ -70,8 +73,11 @@ SHL1STDLIBS= $(KERNEL32LIB)\ $(ADVAPI32LIB)\ $(SHELL32LIB)\ $(MSILIB)\ - $(SHLWAPILIB)\ - $(LIBSTLPORTST) + $(SHLWAPILIB) + +.IF "$(USE_SYSTEM_STL)" != "YES" +SHL1STDLIBS+=$(LIBSTLPORTST) +.ENDIF SHL1LIBS = $(SLB)$/$(TARGET).lib |