[Sumover-dev] [svn commit] r3950 - in vic/branches/mpeg4: render
render/mkcube win32 win32/lib
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Mon Dec 11 09:31:44 GMT 2006
Author: barz
Date: Mon Dec 11 09:30:38 2006
New Revision: 3950
Removed:
vic/branches/mpeg4/win32/lib/avcodec.dll
vic/branches/mpeg4/win32/lib/avutil.dll
vic/branches/mpeg4/win32/lib/swscale.dll
Modified:
vic/branches/mpeg4/Tcl.cpp
vic/branches/mpeg4/main.cpp
vic/branches/mpeg4/rate-variable.cpp
vic/branches/mpeg4/render/mkcube/mkcube.vcproj
vic/branches/mpeg4/render/vw.cpp
vic/branches/mpeg4/tkStripchart.c
vic/branches/mpeg4/vic.sln
vic/branches/mpeg4/vic.vcproj
vic/branches/mpeg4/vic_tcl.h
vic/branches/mpeg4/win32/win32.c
vic/branches/mpeg4/win32/win32X.c
Log:
using tcl/tk 8.4.14 for win32 (buggy)
Modified: vic/branches/mpeg4/Tcl.cpp
==============================================================================
--- vic/branches/mpeg4/Tcl.cpp (original)
+++ vic/branches/mpeg4/Tcl.cpp Mon Dec 11 09:30:38 2006
@@ -215,7 +215,11 @@
}
}
+#ifdef TCLTK80
+int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, char** av)
+#else
int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, const char** av)
+#endif
{
TclObject* tc = (TclObject*)cd;
return (tc->command(ac, (const char*const*)av));
Modified: vic/branches/mpeg4/main.cpp
==============================================================================
--- vic/branches/mpeg4/main.cpp (original)
+++ vic/branches/mpeg4/main.cpp Mon Dec 11 09:30:38 2006
@@ -414,12 +414,23 @@
Tk_DefineBitmap(tcl, Tk_GetUid("fwd"), fwd, 7, 10);
}
+
+#ifdef TCLTK80
+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
+#else
extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
+#endif
#ifdef WIN32
+#ifdef TCLTK80
extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, char** av);
extern "C" int WinReg(ClientData, Tcl_Interp *, int, char **);
+#else
+extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, const char** av);
+extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, const char** av);
+extern "C" int WinReg(ClientData, Tcl_Interp *, int, const char **);
+#endif
#endif
extern "C" {
Modified: vic/branches/mpeg4/rate-variable.cpp
==============================================================================
--- vic/branches/mpeg4/rate-variable.cpp (original)
+++ vic/branches/mpeg4/rate-variable.cpp Mon Dec 11 09:30:38 2006
@@ -61,13 +61,23 @@
public:
RateVariable(const char* name) : TclObject(name) { }
protected:
+#ifdef TCLTK80
+ static char* update_rate_var(ClientData, Tcl_Interp*, char* name1,
+ char* name2, int flags);
+#else
static char* update_rate_var(ClientData, Tcl_Interp*, const char* name1,
const char* name2, int flags);
+#endif
int command(int argc, const char*const* argv);
} rate_variable_cmd("rate_variable");
+#ifdef TCLTK80
+char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl,
+ char* name1, char* name2, int flags)
+#else
char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl,
const char* name1, const char* name2, int flags)
+#endif
{
rv_data* rv = (rv_data*)clientData;
if (rv == NULL)
Modified: vic/branches/mpeg4/render/mkcube/mkcube.vcproj
==============================================================================
--- vic/branches/mpeg4/render/mkcube/mkcube.vcproj (original)
+++ vic/branches/mpeg4/render/mkcube/mkcube.vcproj Mon Dec 11 09:30:38 2006
@@ -22,7 +22,7 @@
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG"
BasicRuntimeChecks="3"
- RuntimeLibrary="4"
+ RuntimeLibrary="5"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Debug/mkcube.pch"
AssemblerListingLocation=".\Debug/"
Modified: vic/branches/mpeg4/render/vw.cpp
==============================================================================
--- vic/branches/mpeg4/render/vw.cpp (original)
+++ vic/branches/mpeg4/render/vw.cpp Mon Dec 11 09:30:38 2006
@@ -230,7 +230,7 @@
int sx, int sy, int x, int y,
int w, int h) const
{
-#ifdef MAC_OSX_TK
+#if defined(MAC_OSX_TK) || defined(WIN32)
TkPutImage(NULL, 0, dpy, window, gc, image_, sx, sy, x, y, w, h);
#else
XPutImage(dpy, window, gc, image_, sx, sy, x, y, w, h);
@@ -637,7 +637,7 @@
void CaptureWindow::grab_image()
{
-#ifndef MAC_OSX_TK
+#if !defined(MAC_OSX_TK) && !defined(WIN32)
XImage* image = image_->ximage();
#ifdef USE_SHM
if (image->obdata != 0)
Modified: vic/branches/mpeg4/tkStripchart.c
==============================================================================
--- vic/branches/mpeg4/tkStripchart.c (original)
+++ vic/branches/mpeg4/tkStripchart.c Mon Dec 11 09:30:38 2006
@@ -365,9 +365,14 @@
*
*--------------------------------------------------------------
*/
+#ifdef TCLTK80
int
Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
- const char **argv) //SV-XXX: FreeBSD
+ char **argv)
+#else
+Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
+ const char **argv)
+#endif
{
Tk_Window tkwin = (Tk_Window) clientData;
Tk_Window new;
Modified: vic/branches/mpeg4/vic.sln
==============================================================================
--- vic/branches/mpeg4/vic.sln (original)
+++ vic/branches/mpeg4/vic.sln Mon Dec 11 09:30:38 2006
@@ -31,16 +31,6 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcllib", "..\tcl-8.0\win\tcllib.vcproj", "{C43930C7-EE14-4481-8CCA-D4302463933F}"
- ProjectSection(ProjectDependencies) = postProject
- {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24} = {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tklib", "..\tk-8.0\win\tklib.vcproj", "{00B544C2-1004-44DF-8178-5729656719CF}"
- ProjectSection(ProjectDependencies) = postProject
- {C43930C7-EE14-4481-8CCA-D4302463933F} = {C43930C7-EE14-4481-8CCA-D4302463933F}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vic", "vic.vcproj", "{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}"
ProjectSection(ProjectDependencies) = postProject
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E} = {ADCF9943-C94E-4A1D-A918-2FB858E09E8E}
@@ -50,11 +40,17 @@
{814B39A0-6391-4F9C-8878-6127C2786C7B} = {814B39A0-6391-4F9C-8878-6127C2786C7B}
{BB0587A3-E09F-4850-BBB0-7F57A70C5406} = {BB0587A3-E09F-4850-BBB0-7F57A70C5406}
{7222D8AB-7B2C-4331-9930-8B99A0C582F2} = {7222D8AB-7B2C-4331-9930-8B99A0C582F2}
- {00B544C2-1004-44DF-8178-5729656719CF} = {00B544C2-1004-44DF-8178-5729656719CF}
- {C43930C7-EE14-4481-8CCA-D4302463933F} = {C43930C7-EE14-4481-8CCA-D4302463933F}
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24} = {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtcl", "..\tcl8.4.14\win\tcl.vcproj", "{48E7C350-9FF6-4391-B6D1-B270D1357173}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtk", "..\tk8.4.14\win\libtk.vcproj", "{3C8BC72E-5CF6-40DD-849F-06DB17C970B6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -63,9 +59,11 @@
Debug IPv6 Musica = Debug IPv6 Musica
Debug IPv6 Win2000 = Debug IPv6 Win2000
Debug IPv6 XP = Debug IPv6 XP
+ Debug Static = Debug Static
Release = Release
Release IPv6 Win2000 = Release IPv6 Win2000
Release IPv6 XP = Release IPv6 XP
+ Release Static = Release Static
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug.ActiveCfg = Debug|Win32
@@ -79,12 +77,16 @@
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug IPv6 Win2000.Build.0 = Debug IPv6 Win2000|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug IPv6 XP.ActiveCfg = Debug IPv6 XP|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug IPv6 XP.Build.0 = Debug IPv6 XP|Win32
+ {FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release.ActiveCfg = Release|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release.Build.0 = Release|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release IPv6 Win2000.ActiveCfg = Release IPv6 Win2000|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release IPv6 Win2000.Build.0 = Release IPv6 Win2000|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release IPv6 XP.ActiveCfg = Release IPv6 XP|Win32
{FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release IPv6 XP.Build.0 = Release IPv6 XP|Win32
+ {FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release Static.ActiveCfg = Release IPv6 XP|Win32
+ {FAD6EF6B-9CE4-4B06-94AF-3E8891C2E852}.Release Static.Build.0 = Release IPv6 XP|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug.ActiveCfg = Debug|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug IPv6.ActiveCfg = Debug|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug IPv6.Build.0 = Debug|Win32
@@ -96,12 +98,16 @@
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release.ActiveCfg = Release|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release.Build.0 = Release|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release IPv6 Win2000.Build.0 = Release|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release IPv6 XP.ActiveCfg = Release|Win32
{7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release IPv6 XP.Build.0 = Release|Win32
+ {7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release Static.ActiveCfg = Release|Win32
+ {7222D8AB-7B2C-4331-9930-8B99A0C582F2}.Release Static.Build.0 = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug.ActiveCfg = Debug|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug IPv6.ActiveCfg = Debug|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug IPv6.Build.0 = Debug|Win32
@@ -113,12 +119,16 @@
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release.ActiveCfg = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release.Build.0 = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release IPv6 Win2000.Build.0 = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release IPv6 XP.ActiveCfg = Release|Win32
{BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release IPv6 XP.Build.0 = Release|Win32
+ {BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release Static.ActiveCfg = Release|Win32
+ {BB0587A3-E09F-4850-BBB0-7F57A70C5406}.Release Static.Build.0 = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug.ActiveCfg = Debug|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug IPv6.ActiveCfg = Debug|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug IPv6.Build.0 = Debug|Win32
@@ -130,12 +140,16 @@
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {393A6547-F832-4EEB-98B1-B330124E10A1}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {393A6547-F832-4EEB-98B1-B330124E10A1}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release.ActiveCfg = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release.Build.0 = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release IPv6 Win2000.Build.0 = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release IPv6 XP.ActiveCfg = Release|Win32
{393A6547-F832-4EEB-98B1-B330124E10A1}.Release IPv6 XP.Build.0 = Release|Win32
+ {393A6547-F832-4EEB-98B1-B330124E10A1}.Release Static.ActiveCfg = Release|Win32
+ {393A6547-F832-4EEB-98B1-B330124E10A1}.Release Static.Build.0 = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug.ActiveCfg = Debug|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug IPv6.ActiveCfg = Debug|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug IPv6.Build.0 = Debug|Win32
@@ -147,12 +161,16 @@
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release.ActiveCfg = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release.Build.0 = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release IPv6 Win2000.Build.0 = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release IPv6 XP.ActiveCfg = Release|Win32
{ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release IPv6 XP.Build.0 = Release|Win32
+ {ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release Static.ActiveCfg = Release|Win32
+ {ADCF9943-C94E-4A1D-A918-2FB858E09E8E}.Release Static.Build.0 = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug.ActiveCfg = Debug|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug IPv6.ActiveCfg = Debug|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug IPv6.Build.0 = Debug|Win32
@@ -164,12 +182,16 @@
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {814B39A0-6391-4F9C-8878-6127C2786C7B}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release.ActiveCfg = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release.Build.0 = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release IPv6 Win2000.Build.0 = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release IPv6 XP.ActiveCfg = Release|Win32
{814B39A0-6391-4F9C-8878-6127C2786C7B}.Release IPv6 XP.Build.0 = Release|Win32
+ {814B39A0-6391-4F9C-8878-6127C2786C7B}.Release Static.ActiveCfg = Release|Win32
+ {814B39A0-6391-4F9C-8878-6127C2786C7B}.Release Static.Build.0 = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug.ActiveCfg = Debug|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug IPv6.ActiveCfg = Debug|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug IPv6.Build.0 = Debug|Win32
@@ -181,12 +203,16 @@
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug Static.ActiveCfg = Debug|Win32
+ {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Debug Static.Build.0 = Debug|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release.ActiveCfg = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release.Build.0 = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release IPv6 Win2000.Build.0 = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release IPv6 XP.ActiveCfg = Release|Win32
{0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release IPv6 XP.Build.0 = Release|Win32
+ {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release Static.ActiveCfg = Release|Win32
+ {0D7D2FE9-B3AC-48E2-A236-D747A74F3A24}.Release Static.Build.0 = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug.ActiveCfg = Debug|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug IPv6.ActiveCfg = Debug|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug IPv6.Build.0 = Debug|Win32
@@ -198,46 +224,16 @@
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug IPv6 Win2000.Build.0 = Debug|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug IPv6 XP.ActiveCfg = Debug|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {789C456B-855C-4A90-BFF7-83B73907BA89}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {789C456B-855C-4A90-BFF7-83B73907BA89}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release.ActiveCfg = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release.Build.0 = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release IPv6 Win2000.ActiveCfg = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release IPv6 Win2000.Build.0 = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release IPv6 XP.ActiveCfg = Release|Win32
{789C456B-855C-4A90-BFF7-83B73907BA89}.Release IPv6 XP.Build.0 = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug.ActiveCfg = Debug|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6.ActiveCfg = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6.Build.0 = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 MSR.ActiveCfg = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 MSR.Build.0 = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 Musica.ActiveCfg = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 Musica.Build.0 = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 Win2000.ActiveCfg = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 Win2000.Build.0 = Debug IPv6|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 XP.ActiveCfg = Debug|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Debug IPv6 XP.Build.0 = Debug|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release.ActiveCfg = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release.Build.0 = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release IPv6 Win2000.ActiveCfg = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release IPv6 Win2000.Build.0 = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release IPv6 XP.ActiveCfg = Release|Win32
- {C43930C7-EE14-4481-8CCA-D4302463933F}.Release IPv6 XP.Build.0 = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug.ActiveCfg = Debug|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6.ActiveCfg = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6.Build.0 = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 MSR.ActiveCfg = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 MSR.Build.0 = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 Musica.ActiveCfg = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 Musica.Build.0 = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 Win2000.ActiveCfg = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 Win2000.Build.0 = Debug IPv6|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 XP.ActiveCfg = Debug|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Debug IPv6 XP.Build.0 = Debug|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release.ActiveCfg = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release.Build.0 = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release IPv6 Win2000.ActiveCfg = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release IPv6 Win2000.Build.0 = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release IPv6 XP.ActiveCfg = Release|Win32
- {00B544C2-1004-44DF-8178-5729656719CF}.Release IPv6 XP.Build.0 = Release|Win32
+ {789C456B-855C-4A90-BFF7-83B73907BA89}.Release Static.ActiveCfg = Release|Win32
+ {789C456B-855C-4A90-BFF7-83B73907BA89}.Release Static.Build.0 = Release|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug.ActiveCfg = Debug|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug.Build.0 = Debug|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug IPv6.ActiveCfg = Debug IPv6 MSR|Win32
@@ -250,12 +246,60 @@
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug IPv6 Win2000.Build.0 = Debug IPv6 Win2000|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug IPv6 XP.ActiveCfg = Debug IPv6 XP|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug IPv6 XP.Build.0 = Debug IPv6 XP|Win32
+ {FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug Static.ActiveCfg = Debug IPv6 XP|Win32
+ {FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Debug Static.Build.0 = Debug IPv6 XP|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release.ActiveCfg = Release|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release.Build.0 = Release|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release IPv6 Win2000.ActiveCfg = Release IPv6 Win2000|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release IPv6 Win2000.Build.0 = Release IPv6 Win2000|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release IPv6 XP.ActiveCfg = Release IPv6 XP|Win32
{FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release IPv6 XP.Build.0 = Release IPv6 XP|Win32
+ {FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release Static.ActiveCfg = Release|Win32
+ {FFDD6E9D-C5CA-4E62-A518-4F6235024FD2}.Release Static.Build.0 = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 MSR.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 MSR.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 Musica.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 Musica.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 Win2000.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 Win2000.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 XP.ActiveCfg = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug Static.ActiveCfg = Debug Static|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Debug Static.Build.0 = Debug Static|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release.ActiveCfg = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release.Build.0 = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release IPv6 Win2000.ActiveCfg = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release IPv6 Win2000.Build.0 = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release IPv6 XP.ActiveCfg = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release IPv6 XP.Build.0 = Release|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release Static.ActiveCfg = Release Static|Win32
+ {48E7C350-9FF6-4391-B6D1-B270D1357173}.Release Static.Build.0 = Release Static|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 MSR.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 MSR.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 Musica.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 Musica.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 Win2000.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 Win2000.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 XP.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug IPv6 XP.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug Static.ActiveCfg = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Debug Static.Build.0 = Debug|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release.ActiveCfg = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release.Build.0 = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release IPv6 Win2000.ActiveCfg = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release IPv6 Win2000.Build.0 = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release IPv6 XP.ActiveCfg = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release IPv6 XP.Build.0 = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release Static.ActiveCfg = Release|Win32
+ {3C8BC72E-5CF6-40DD-849F-06DB17C970B6}.Release Static.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: vic/branches/mpeg4/vic.vcproj
==============================================================================
--- vic/branches/mpeg4/vic.vcproj (original)
+++ vic/branches/mpeg4/vic.vcproj Mon Dec 11 09:30:38 2006
@@ -481,9 +481,9 @@
Name="VCCLCompilerTool"
AdditionalOptions="/I ../common"
Optimization="0"
- AdditionalIncludeDirectories=".\,render,rtp,net,win32,video,codec,codec\tmndec,codec\tmn-x,codec\jpeg,codec\p64,codec\h263,codec\mpeg,..\common\src,..\tk-8.0\win,..\tcl-8.0\win,..\tk-8.0\generic,..\tk-8.0\xlib,..\tcl-8.0\generic,..\IPv6Kit\inc,mst_wm\incls"
- PreprocessorDefinitions="DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6"
- RuntimeLibrary="5"
+ AdditionalIncludeDirectories=".\;render;rtp;net;win32;video;codec;codec\tmndec;"codec\tmn-x";codec\jpeg;codec\p64;codec\h263;codec\mpeg;..\common\src;..\tk8.4.14\win;..\tcl8.4.14\win;..\tk8.4.14\generic;..\tk8.4.14\xlib;..\tcl8.4.14\generic;..\IPv6Kit\inc;mst_wm\incls"
+ PreprocessorDefinitions="DEBUG;_DEBUG;DEBUG_MEM;WIN32;SIGRET=void;SIGARGS=int;NLAYER=8;ED_YBITS=4;VIC;USE_TIME;WINDOWS;HAVE_IPV6;NEED_INET_NTOP;NEED_INET_PTON;WINXP_IPV6;STATIC_BUILD;TCL_THREADS"
+ RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Debug_IPv6_Win2000/vic.pch"
AssemblerListingLocation=".\Debug_IPv6_Win2000/"
@@ -498,11 +498,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="swscale-0.lib avutil-49.lib avcodec-51.lib libx264.lib tklib.lib tcllib.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib uclmm.lib strmiids.lib quartz.lib"
+ AdditionalDependencies="swscale-0.lib avutil-49.lib avcodec-51.lib libx264.lib tk84tsg.lib tcl84tsg.lib wsock32.lib Ws2_32.lib winmm.lib vfw32.lib uclmm.lib strmiids.lib quartz.lib Iphlpapi.lib Imm32.lib comctl32.lib"
OutputFile="$(ConfigurationName)/vic.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories=""..\tcl-8.0\win\Debug";"..\tk-8.0\win\Debug";..\common\src\Debug;codec\tmndec;"codec\tmn-x";win32\lib"
+ AdditionalLibraryDirectories="..\tcl8.4.14\win\Debug_VC7;..\tk8.4.14\win\Debug_VC7;..\common\src\debug_ipv6;codec\tmndec;"codec\tmn-x";win32\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug_IPv6_Win2000/vic.pdb"
SubSystem="2"
Modified: vic/branches/mpeg4/vic_tcl.h
==============================================================================
--- vic/branches/mpeg4/vic_tcl.h (original)
+++ vic/branches/mpeg4/vic_tcl.h Mon Dec 11 09:30:38 2006
@@ -124,7 +124,11 @@
virtual void reset();
void class_name(const char*);
/* make this public for Sun's compiler */
+#ifdef TCLTK80
+ static int callback(ClientData, Tcl_Interp*, int ac, char** av);
+#else
static int callback(ClientData, Tcl_Interp*, int ac, const char** av);
+#endif
static void reset_all();
protected:
TclObject(const char* name = 0);
Modified: vic/branches/mpeg4/win32/win32.c
==============================================================================
--- vic/branches/mpeg4/win32/win32.c (original)
+++ vic/branches/mpeg4/win32/win32.c Mon Dec 11 09:30:38 2006
@@ -188,9 +188,11 @@
perror("Windows Sockets init failed");
abort();
}
- TclHasSockets(NULL);
-
- TkWinXInit(hInstance);
+
+#ifdef TCLTK80
+ TclHasSockets(NULL);
+ TkWinXInit(hInstance);
+#endif
/*
* Increase the application queue size from default value of 8.
@@ -291,8 +293,13 @@
* if a file arg is supplied it [used to] does nothing - ie empty file!
* Now works with other files.
*/
+#ifdef TCLTK80
int
WinPutsCmd(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
+#else
+int
+WinPutsCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv)
+#endif
{
int i, newline, length;
char *fileId;
@@ -388,8 +395,14 @@
return TCL_OK;
}
+#ifdef TCLTK80
int
WinGetUserName(clientData, interp, argc, argv)
+#else
+int
+WinGetUserName(clientData, interp, argc, argv)
+#endif
+
ClientData clientData;
Tcl_Interp *interp; /* Current interpreter. */
int argc; /* Number of arguments. */
@@ -422,9 +435,12 @@
return NULL;
}
-
+#ifdef TCLTK80
int
WinReg(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv)
+#else
+WinReg(ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv)
+#endif
{
static char szBuf[255], szOutBuf[255];
char *szRegRoot = NULL, *szRegPath = NULL, *szValueName;
Modified: vic/branches/mpeg4/win32/win32X.c
==============================================================================
--- vic/branches/mpeg4/win32/win32X.c (original)
+++ vic/branches/mpeg4/win32/win32X.c Mon Dec 11 09:30:38 2006
@@ -188,7 +188,7 @@
*
*----------------------------------------------------------------------
*/
-
+/*
void
XDrawSegments(display, d, gc, segments, nsegments)
Display* display;
@@ -237,3 +237,4 @@
TkWinReleaseDrawableDC(d, dc, &state);
}
+*/
\ No newline at end of file
More information about the Sumover-dev
mailing list