diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:55:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:55:43 +0000 |
| commit | 5dd991acb1036517ce3717a5f0dc7a64df8f4edf (patch) | |
| tree | 8de7d72e7dc389097e04647ed60609a42a6a1cd8 /jvmaccess | |
| parent | 81c1f04d00becf133691f922a9363d8acee64343 (diff) | |
INTEGRATION: CWS mingwport03 (1.7.24); FILE MERGED
2007/03/20 11:15:22 vg 1.7.24.2: RESYNC MERGED 1.7 1.8
Everything below this line will be added to the revision comment.
2006/09/07 15:08:32 vg 1.7.24.1: #i53572# MinGW port
Diffstat (limited to 'jvmaccess')
| -rw-r--r-- | jvmaccess/util/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index 71694451b..0f535f5c0 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2007-01-31 08:38:28 $ +# last change: $Author: vg $ $Date: 2007-03-26 15:55:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,7 +55,7 @@ SHL1IMPLIB = i$(TARGET) SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB) .IF "$(OS)" == "WNT" -SHL1STDLIBS += advapi32.lib +SHL1STDLIBS += $(ADVAPI32LIB) .ENDIF # WNT .IF "$(COMNAME)" == "msci" @@ -70,6 +70,8 @@ SHL1VERSIONMAP = gcc3_linux_intel.map SHL1VERSIONMAP = gcc3_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3" SHL1VERSIONMAP = gcc3_linux_intel.map +.ELIF "$(GUI)$(COM)" == "WNTGCC" +SHL1VERSIONMAP = mingw.map .ENDIF DEF1NAME = $(SHL1TARGET) |