diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 07:05:18 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 07:05:18 +0000 |
| commit | 17d4c5068896b55b94a155372850e2a6ab803156 (patch) | |
| tree | f8513b0f712ad4f23205cda606e14c05ffc402c0 /testshl2 | |
| parent | 122adddbef72cf66affd2c7c77f146d6b3461f9b (diff) | |
CWS-TOOLING: integrate CWS mingwport15
Diffstat (limited to 'testshl2')
| -rw-r--r-- | testshl2/source/makefile.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/testshl2/source/makefile.mk b/testshl2/source/makefile.mk index 6b98d28b2341..3bc9a4f819ba 100644 --- a/testshl2/source/makefile.mk +++ b/testshl2/source/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.2.1 $ # # This file is part of OpenOffice.org. # @@ -75,11 +75,18 @@ APP1STDLIBS=$(SALLIB) # $(SOLARLIBDIR)$/c5t_testresult.lib .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(COM)" == "GCC" +APP1STDLIBS+= \ + $(SOLARLIBDIR)$/libc5t_testresult$(DLLPOSTFIX).a \ + $(SOLARLIBDIR)$/libc5t_no_regallfkt$(DLLPOSTFIX).a \ + $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a +.ELSE APP1LIBS= \ $(SOLARLIBDIR)$/c5t_no_regallfkt.lib \ $(SOLARLIBDIR)$/c5t_testresult.lib APP1LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib .ENDIF +.ENDIF .IF "$(GUI)" == "UNX" APP1STDLIBS+= \ @@ -107,8 +114,13 @@ APP3DEPN= APP3LIBS= .IF "$(GUI)"=="WNT" +.IF "$(COM)" == "GCC" +APP3STDLIBS+= \ + $(SOLARLIBDIR)$/libc5t_winstuff$(DLLPOSTFIX).a +.ELSE APP3LIBS += $(SOLARLIBDIR)$/c5t_winstuff.lib .ENDIF +.ENDIF # --- Targets ------------------------------------------------------ |