From b63fd3e0438b9ecea1c0a4f31eed05dea8807987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Fri, 26 Nov 2004 16:07:21 +0000
Subject: [PATCH] INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED
 2004/11/17 17:00:24 thb 1.2.2.4: #118514# Canvas module reorg 2004/08/23
 11:47:07 thb 1.2.2.3: RESYNC: (1.2-1.3); FILE MERGED 2004/04/12 15:12:22 thb
 1.2.2.2: #110496# Adaptions after canvas01 merge 2004/04/05 15:57:55 thb
 1.2.2.1: Resync with canvas01 changes

---
 canvas/source/java/makefile.mk | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/canvas/source/java/makefile.mk b/canvas/source/java/makefile.mk
index 388026c68d7d..b4cc852b9953 100644
--- a/canvas/source/java/makefile.mk
+++ b/canvas/source/java/makefile.mk
@@ -2,9 +2,9 @@
 #
 #  $RCSfile: makefile.mk,v $
 #
-#  $Revision: 1.3 $
+#  $Revision: 1.4 $
 #
-#  last change: $Author: rt $ $Date: 2004-07-23 14:31:15 $
+#  last change: $Author: rt $ $Date: 2004-11-26 17:07:21 $
 #
 #  The Contents of this file are made available subject to the terms of
 #  the BSD license.
@@ -45,12 +45,19 @@ PRJ		= ..$/..
 TARGET	= javacanvas
 PACKAGE = canvas
 
+USE_JAVAVER:=TRUE 
+
 # --- Settings -----------------------------------------------------
 
 .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" 
+
 JAVAFILES  = \
     SpriteBase.java \
     JavaCanvas.java \
@@ -61,6 +68,7 @@ JAVAFILES  = \
     CanvasSprite.java \
     CanvasCustomSprite.java \
     CanvasClonedSprite.java \
+    TextLayout.java \
     BackBuffer.java \
     LinePolyPolygon.java \
     BezierPolyPolygon.java \
@@ -76,7 +84,7 @@ JAVAFILES += x11/WindowAdapter.java
 
 .ENDIF		# "$(GUIBASE)"!="unx" 
 
-JARFILES 		= jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar 
+JARFILES 		= jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
 JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
 JARTARGET               = $(TARGET).uno.jar
@@ -84,6 +92,7 @@ JARCOMPRESS             = TRUE
 #JARCLASSDIRS            = $(PACKAGE) 
 CUSTOMMANIFESTFILE      = manifest
 
+.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" 
 .ENDIF # "$(SOLAR_JAVA)"=="TRUE"
 
 # --- Targets ------------------------------------------------------