[Sumover-dev] [svn commit] r3951 - in vic/branches/mpeg4: cpu win32

sumover-dev at cs.ucl.ac.uk sumover-dev at cs.ucl.ac.uk
Tue Dec 12 07:42:56 GMT 2006 

Author: barz
Date: Tue Dec 12 07:43:06 2006
New Revision: 3951

Added:
   vic/branches/mpeg4/cpu/cpuid_win.asm
      - copied unchanged from r3949, /vic/branches/mpeg4/cpu/cpuid.asm
Removed:
   vic/branches/mpeg4/cpu/cpuid.asm
Modified:
   vic/branches/mpeg4/config.h
   vic/branches/mpeg4/main.cpp
   vic/branches/mpeg4/vic.sln
   vic/branches/mpeg4/vic.vcproj
   vic/branches/mpeg4/win32/win32.c

Log:
tcl/tk 8.4.14 requires fully initialization under win32 
Using Tk_FindExcuteable() to find the relative path containing init.tcl

Modified: vic/branches/mpeg4/config.h
==============================================================================
--- vic/branches/mpeg4/config.h	(original)
+++ vic/branches/mpeg4/config.h	Tue Dec 12 07:43:06 2006
@@ -283,10 +283,12 @@
 	int	    iov_len;
 };
 
+
 struct timezone {
 	int tz_minuteswest;
 	int tz_dsttime;
 };
+
     
 #if defined(__cplusplus)
 extern "C" {

Modified: vic/branches/mpeg4/main.cpp
==============================================================================
--- vic/branches/mpeg4/main.cpp	(original)
+++ vic/branches/mpeg4/main.cpp	Tue Dec 12 07:43:06 2006
@@ -509,8 +509,8 @@
 	Tcl& tcl = Tcl::instance();
 
 #ifdef WIN32
-	if (display == NULL)
-		display = "localhost:0";
+	//if (display == NULL)
+	//	display = "localhost:0";
 #endif
 #ifdef sgi
 	if (display == NULL) {
@@ -539,13 +539,21 @@
 
 	/* initialise tcl/tk but ignore errors under windows. */
 	Tk_Window tk = 0;
-	Tcl_Init(tcl.interp());
-	Tk_Init(tcl.interp());
+
+	if(Tcl_Init(tcl.interp()) != TCL_OK){
+		fprintf(stderr, "vic: %s\n", tcl.result());
+	}
+
+	if(Tk_Init(tcl.interp()) != TCL_OK){
+		fprintf(stderr, "vic: %s\n", tcl.result());
+	}
+
 	tk = Tk_MainWindow(tcl.interp());
 	if (tk == 0) {
 		fprintf(stderr, "vic: %s\n", tcl.result());
 		exit(1);
 	}
+
 	tcl.tkmain(tk);
 
 	loadbitmaps(tcl.interp());

Modified: vic/branches/mpeg4/vic.sln
==============================================================================
--- vic/branches/mpeg4/vic.sln	(original)
+++ vic/branches/mpeg4/vic.sln	Tue Dec 12 07:43:06 2006
@@ -59,11 +59,9 @@
 		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
@@ -77,16 +75,12 @@
 		{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
@@ -98,16 +92,12 @@
 		{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
@@ -119,16 +109,12 @@
 		{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
@@ -140,16 +126,12 @@
 		{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
@@ -161,16 +143,12 @@
 		{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
@@ -182,16 +160,12 @@
 		{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
@@ -203,16 +177,12 @@
 		{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
@@ -224,16 +194,12 @@
 		{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
-		{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
@@ -246,16 +212,12 @@
 		{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
@@ -268,16 +230,12 @@
 		{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
@@ -290,16 +248,12 @@
 		{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	Tue Dec 12 07:43:06 2006
@@ -472,8 +472,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug IPv6 XP|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory=".\Debug_IPv6_XP"
+			IntermediateDirectory=".\Debug_IPv6_XP"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -483,12 +483,13 @@
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;render;rtp;net;win32;video;codec;codec\tmndec;&quot;codec\tmn-x&quot;;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"
+				BasicRuntimeChecks="1"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_IPv6_Win2000/vic.pch"
-				AssemblerListingLocation=".\Debug_IPv6_Win2000/"
-				ObjectFile=".\Debug_IPv6_Win2000/"
-				ProgramDataBaseFileName=".\Debug_IPv6_Win2000/"
+				PrecompiledHeaderFile=".\Debug_IPv6_XP/vic.pch"
+				AssemblerListingLocation=".\Debug_IPv6_XP/"
+				ObjectFile=".\Debug_IPv6_XP/"
+				ProgramDataBaseFileName=".\Debug_IPv6_XP/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@@ -499,7 +500,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				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"
+				OutputFile=".\Debug_IPv6_XP/vic.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\tcl8.4.14\win\Debug_VC7;..\tk8.4.14\win\Debug_VC7;..\common\src\debug_ipv6;codec\tmndec;&quot;codec\tmn-x&quot;;win32\lib"
@@ -516,7 +517,9 @@
 				TypeLibraryName=".\Debug_IPv6_Win2000/vic.tlb"
 				HeaderFileName=""/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				Description="copying DLL.."
+				CommandLine="copy .\win32\lib\*.dll $(IntDir)"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -14603,21 +14606,20 @@
 				RelativePath=".\cpu\cpudetect.h">
 			</File>
 			<File
-				RelativePath=".\cpu\cpuid.asm">
+				RelativePath=".\cpu\cpuid.cpp">
+			</File>
+			<File
+				RelativePath=".\cpu\cpuid_win.asm">
 				<FileConfiguration
 					Name="Debug IPv6 XP|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Assembling $(InputPath)"
-						CommandLine="&quot;C:\Program Files\NASM\nasmw.exe&quot; -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;
-"
+						CommandLine="nasmw.exe -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;"
 						Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\cpu\cpuid.cpp">
-			</File>
-			<File
 				RelativePath=".\cpu\cputable.h">
 			</File>
 		</Filter>

Modified: vic/branches/mpeg4/win32/win32.c
==============================================================================
--- vic/branches/mpeg4/win32/win32.c	(original)
+++ vic/branches/mpeg4/win32/win32.c	Tue Dec 12 07:43:06 2006
@@ -218,6 +218,7 @@
 		}
     }
 
+	Tcl_FindExecutable(__argv[0]);
     return main(__argc, (const char**)__argv);
 }

More information about the Sumover-dev mailing list