diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-06 16:41:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-06 16:41:42 +0000 |
| commit | 14a775aa12c594915cfe4ec3afa2e5c0dc940533 (patch) | |
| tree | 73dfd532979fb27fb49189d616226235488cc994 /canvas/source/java | |
| parent | a601405b1284cedbc62d777755d7cd4f7902139a (diff) | |
INTEGRATION: CWS gcj5 (1.5.20); FILE MERGED
2005/06/02 07:43:17 cmc 1.5.20.1: #i50224# gcj has the required bits to build java canvas now, while sun.awt imports are unnecessary
Diffstat (limited to 'canvas/source/java')
| -rw-r--r-- | canvas/source/java/makefile.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/canvas/source/java/makefile.mk b/canvas/source/java/makefile.mk index a073641521a5..3f5bbccc1534 100644 --- a/canvas/source/java/makefile.mk +++ b/canvas/source/java/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: obo $ $Date: 2005-01-25 15:07:13 $ +# last change: $Author: hr $ $Date: 2005-06-06 17:41:42 $ # # The Contents of this file are made available subject to the terms of # the BSD license. @@ -56,10 +56,6 @@ USE_JAVAVER:=TRUE # 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 \ @@ -95,7 +91,6 @@ JARCOMPRESS = TRUE #JARCLASSDIRS = $(PACKAGE) CUSTOMMANIFESTFILE = manifest -.ENDIF # gcj .ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" .ENDIF # "$(SOLAR_JAVA)"=="TRUE" |