diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:07:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:07:13 +0000 |
| commit | 829fa0501d6c524a68794a42b8976f3a6b7576dd (patch) | |
| tree | 17dd8b3bb7f2ba66bf7771684490c0ed935dba72 /canvas/source/java | |
| parent | b3aaa3081a1780237b76606f0659390b412a0a3a (diff) | |
INTEGRATION: CWS gcj1 (1.3.10); FILE MERGED
2005/01/06 19:25:59 cmc 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2004/12/02 09:00:19 cmc 1.3.10.1: #i38188# This dir cannot be build with gcj because of sun.awt
Diffstat (limited to 'canvas/source/java')
| -rw-r--r-- | canvas/source/java/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/canvas/source/java/makefile.mk b/canvas/source/java/makefile.mk index b4cc852b9953..a073641521a5 100644 --- a/canvas/source/java/makefile.mk +++ b/canvas/source/java/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2004-11-26 17:07:21 $ +# last change: $Author: obo $ $Date: 2005-01-25 15:07:13 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -52,11 +52,14 @@ USE_JAVAVER:=TRUE .INCLUDE: settings.mk .IF "$(SOLAR_JAVA)"=="TRUE" - # Since Canvas needs newer features like # e.g. java.awt.image.BufferStrategy, # disabled for now for everything <1.4 .IF "$(JAVANUMVER:s/.//)" >= "000100040000" +.IF "$(JDK)" == "gcj" +all: + @echo This dir cannot be build with gcj because of sun.awt +.ELSE JAVAFILES = \ SpriteBase.java \ @@ -92,6 +95,7 @@ JARCOMPRESS = TRUE #JARCLASSDIRS = $(PACKAGE) CUSTOMMANIFESTFILE = manifest +.ENDIF # gcj .ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" .ENDIF # "$(SOLAR_JAVA)"=="TRUE" |