diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:50:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:50:47 +0000 |
| commit | dd5e429a6f38b2e42741bb2e5883388e23dcf084 (patch) | |
| tree | 5fced3bfa900fcb713e37325ee5a89d9d73c5d8a /canvas | |
| parent | 1e17ada02531efc152ceacf1e8d996902095d0ee (diff) | |
INTEGRATION: CWS pj82 (1.9.46); FILE MERGED
2007/06/21 07:43:46 pjanik 1.9.46.1: #i78738#: Add WindowAdapter for Mac OS X Aqua (from aquavcl01), clean
the OS cases switch, whitespace celanup.
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/java/makefile.mk | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/canvas/source/java/makefile.mk b/canvas/source/java/makefile.mk index 723d91b588ff..d566735271c7 100644 --- a/canvas/source/java/makefile.mk +++ b/canvas/source/java/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2006-08-14 16:14:56 $ +# last change: $Author: hr $ $Date: 2007-06-27 13:50:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,7 +40,7 @@ PRJ = ..$/.. TARGET = javacanvas PACKAGE = canvas -USE_JAVAVER:=TRUE +USE_JAVAVER:=TRUE # --- Settings ----------------------------------------------------- @@ -50,7 +50,7 @@ USE_JAVAVER:=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 "$(JAVANUMVER:s/.//)" >= "000100040000" JAVAFILES = \ SpriteBase.java \ @@ -68,30 +68,34 @@ JAVAFILES = \ BezierPolyPolygon.java \ SpriteRunner.java -.IF "$(GUIBASE)"!="unx" +.IF "$(GUIBASE)"=="unx" -JAVAFILES += win/WindowAdapter.java +JAVAFILES += x11/WindowAdapter.java -.ELSE # "$(GUIBASE)"!="unx" +.ELIF "$(GUIBASE)"=="aqua" -JAVAFILES += x11/WindowAdapter.java +JAVAFILES += aqua/WindowAdapter.java + +.ELSE + +JAVAFILES += win/WindowAdapter.java -.ENDIF # "$(GUIBASE)"!="unx" +.ENDIF # "$(GUIBASE)"=="unx" 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 JARCOMPRESS = TRUE -#JARCLASSDIRS = $(PACKAGE) +#JARCLASSDIRS = $(PACKAGE) CUSTOMMANIFESTFILE = manifest -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" +.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" .ENDIF # "$(SOLAR_JAVA)"=="TRUE" # --- Targets ------------------------------------------------------ .INCLUDE: target.mk -#dist: $(JAVA_FILES:b:+".class") +#dist: $(JAVA_FILES:b:+".class") # +jar -cvfm $(CLASSDIR)/JavaCanvas.jar $(JARMANIFEST) $(JAVACLASSFILES) |