diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:16:37 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:16:37 +0000 |
| commit | 0a2bc18230c1ae5fcc85a66503ade36991eaa259 (patch) | |
| tree | 9a5312f6abf7551965e9e11efb91f8dd9445f158 /solenv | |
| parent | 4c9c5742e9006390e2caffd64ac26d1b110e8055 (diff) | |
INTEGRATION: CWS mingwport03 (1.199.60); FILE MERGED
2007/03/19 17:24:30 vg 1.199.60.4: RESYNC: (1.205-1.209); FILE MERGED
2007/01/08 23:38:46 vg 1.199.60.3: RESYNC: (1.204-1.205); FILE MERGED
2006/11/07 16:55:21 vg 1.199.60.2: RESYNC: (1.199-1.204); FILE MERGED
2006/10/24 15:25:55 vg 1.199.60.1: #i53572# MinGW port
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index d7fa18f06c2d..146ba61c4233 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.210 $ +# $Revision: 1.211 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:05:27 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:16:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -708,8 +708,12 @@ WINVERSIONNAMES=$(UNIXVERSIONNAMES) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32 +.ELSE SHELLLIB=gdi32.lib shell32.lib advapi32.lib comdlg32.lib .ENDIF +.ENDIF .IF "$(GUI)" != "MAC" SOLARLIBDEPN=\ @@ -840,6 +844,11 @@ ILIB!:=$(SOLARROOT)$/udk$/$(UDKVERSION)$/$(OUTPATH)$/lib;$(ILIB) LIB:=$(LB);$(SLB);$(ILIB) .ENDIF +# extend library path for MinGW Compiler +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB:=$(LB);$(BIN);$(ILIB) +.ENDIF + # --- Environment-Allgemein ---------------------------------------- .IF "$(CPUNAME)" == "" |