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 | 314e33493a9f3ea455fc2aead0d1b0fd683db2be (patch) | |
| tree | be19cd93f360dec57c3a59008a2697588fd29e0d /sal | |
| parent | bb490edf4371d7a792a3fb4d7ac9dd0abed129f8 (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 'sal')
| -rw-r--r-- | sal/util/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 04382b956ddd..f56e6f88f058 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -97,7 +97,12 @@ SHL1VERSIONMAP= $(TARGET).map SHL1RPATH=URELIB .IF "$(GUI)"=="WNT" + +.IF "$(COM)"=="GCC" +UWINAPILIB= -luwinapi +.ELSE UWINAPILIB= $(LB)$/uwinapi.lib +.ENDIF SHL1STDLIBS= \ $(UWINAPILIB)\ @@ -169,11 +174,7 @@ SHL1OBJS= \ .ENDIF # UNX .ENDIF # lincinc -.IF "$(GUI)"=="WNT" -SHL1DEPN= $(UWINAPILIB) -.ELSE SHL1DEPN= -.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) |