summaryrefslogtreecommitdiff
path: root/sj2
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-06-01 08:13:23 +0000
committerOliver Bolte <obo@openoffice.org>2004-06-01 08:13:23 +0000
commitef431b783bd3c99dbd87f5a729888913c0e81b14 (patch)
tree3094c91ce74d9c3cf9df38afc6fc73e8d128bced /sj2
parent03e13a7c32a8f508d4335d0e7e169c27daf62670 (diff)
INTEGRATION: CWS jl6 (1.3.70); FILE MERGED
2004/05/04 14:49:06 jl 1.3.70.6: #116645# applets and j2re1.5 2004/04/28 13:50:05 jl 1.3.70.5: RESYNC: (1.3-1.4); FILE MERGED 2004/03/18 08:22:58 jl 1.3.70.4: #115008# 2004/03/18 08:18:40 jl 1.3.70.3: #115008# build widget.cxx only on UNX 2004/03/17 11:59:18 jl 1.3.70.2: #115008# makefile builds widget.cxx 2004/03/03 08:52:51 jl 1.3.70.1: #115008# prototype for embedding applet without plugin.jar
Diffstat (limited to 'sj2')
-rw-r--r--sj2/source/jscpp/makefile.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/sj2/source/jscpp/makefile.mk b/sj2/source/jscpp/makefile.mk
index fab7370d83..6ae6bc455f 100644
--- a/sj2/source/jscpp/makefile.mk
+++ b/sj2/source/jscpp/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: kz $ $Date: 2004-03-25 14:55:47 $
+# last change: $Author: obo $ $Date: 2004-06-01 09:13:23 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -82,16 +82,17 @@ UNOTYPES= \
CXXFILES= \
sjapplet.cxx \
- sjapplet_impl.cxx
+ sjapplet_impl.cxx
+#.IF "$(GUI)"=="UNX"
+#CXXFILES += widget.cxx
+#.ENDIF
+
SLOFILES= \
$(SLO)$/sjapplet.obj \
$(SLO)$/sjapplet_impl.obj
-# .IF "$(GUI)"=="WNT"
-# SLOFILES += $(SLO)$/sun_awt_windows_package.obj
-# .ENDIF
# --- Targets ------------------------------------------------------