[Sumover-dev] [svn commit] r4843 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Sun May 16 07:50:18 2010
New Revision: 4843

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/configure.in.tk

Log:
Removed pass-1 tcl2cpp embedded tcl files Makefile rule.

pass-1 tcl2cpp embedded tcl files are not required with UCL Tcl/Tk 8.0 as they are already embed in the libtcl and libtk libraries that get linked in.

With Tcl/Tk >= 8.4, pass-1 tcl2cpp embedded tcl files don't work at runtime when the scripts explicitly try to source other tcl files (ZipVFS should be used instead).

Note: The pass-2 tcl2cpp embedded tcl files Makefile rule is fine with VIC's own tcl files, so is kept.


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Sun May 16 07:50:18 2010
@@ -71,21 +71,6 @@
 
 LIBRARY_TK = @V_LIBRARY_TK@
 LIBRARY_TCL = @V_LIBRARY_TCL@
-TK_LIBRARY_FILES = \
-		$(LIBRARY_TCL)/init.tcl \
-		$(LIBRARY_TK)/tk.tcl \
-		$(LIBRARY_TK)/button.tcl \
-		$(LIBRARY_TK)/dialog.tcl \
-		$(LIBRARY_TK)/entry.tcl \
-		$(LIBRARY_TK)/focus.tcl \
-		$(LIBRARY_TK)/listbox.tcl \
-		$(LIBRARY_TK)/menu.tcl \
-		$(LIBRARY_TK)/palette.tcl \
-		$(LIBRARY_TK)/scale.tcl \
-		$(LIBRARY_TK)/tearoff.tcl \
-		$(LIBRARY_TK)/text.tcl \
-		$(LIBRARY_TK)/optMenu.tcl \
-		$(LIBRARY_TK)/scrlbar.tcl
 TK_BASE_RC = @V_TKBASE_RC@
 
 LIB_GRABBER = @V_LIB_GRABBER@
@@ -284,14 +269,6 @@
 	$(CXX) -o $@ $(CFLAGS) tcl/tcl2cpp/tcl2cpp.c
 
 #
-# pass-1 embedded tcl files
-#
-tk.o: $(TK_LIBRARY_FILES) tcl2c++
-	base=tk; rm -f $@ $$base.cpp ; \
-		./tcl2c++ 1 $(TK_LIBRARY_FILES) > $$base.cpp ; \
-		$(CXX) -o $@ -c $(CFLAGS) $$base.cpp ; rm -f $$base.cpp
-
-#
 # pass-2 embedded tcl files
 #
 TCL_VIC_OBJS=$(TCL_VIC:.tcl=.o) ui-vdd.o ui-h261_play.o

Modified: vic/branches/mpeg4/configure.in.tk
==============================================================================
--- vic/branches/mpeg4/configure.in.tk	(original)
+++ vic/branches/mpeg4/configure.in.tk	Sun May 16 07:50:18 2010
@@ -49,10 +49,10 @@
 fi
 
 if test "$zvfs" == "no" ; then
-	V_TCL2CPP_OBJS="\$(TCL_VIC:.tcl=.o) tk.o" 
-	V_TCL2CPP_VDD_OBJS="ui-vdd.o tk.o" 
-	V_TCL2CPP_H261_PLAY_OBJS="ui-h261_play.o tk.o" 
-	V_TCL2CPP_JPEG_PLAY_OBJS="ui-jpeg_play.o tk.o" 
+	V_TCL2CPP_OBJS="\$(TCL_VIC:.tcl=.o)" 
+	V_TCL2CPP_VDD_OBJS="ui-vdd.o" 
+	V_TCL2CPP_H261_PLAY_OBJS="ui-h261_play.o" 
+	V_TCL2CPP_JPEG_PLAY_OBJS="ui-jpeg_play.o" 
 fi
 
 SC_PATH_TKCONFIG