Author: christian.heimes
Date: Fri Nov 16 03:14:19 2007
New Revision: 59011

Modified:
   python/branches/py3k/PCbuild8/_tkinter/_tkinter.vcproj
   python/branches/py3k/PCbuild8/pcbuild.sln
   python/branches/py3k/PCbuild8/pyproject.vsprops
Log:
I finally figured out why _tkinter and _bsddb didn't compile with PCbuild8.

Modified: python/branches/py3k/PCbuild8/_tkinter/_tkinter.vcproj
==============================================================================
--- python/branches/py3k/PCbuild8/_tkinter/_tkinter.vcproj      (original)
+++ python/branches/py3k/PCbuild8/_tkinter/_tkinter.vcproj      Fri Nov 16 
03:14:19 2007
@@ -42,7 +42,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -61,6 +62,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"
@@ -88,6 +90,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -115,7 +118,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -134,6 +138,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="17"
@@ -161,6 +166,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -187,7 +193,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -204,6 +211,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -234,6 +242,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -261,7 +270,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -278,6 +288,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -308,6 +319,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -334,7 +346,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -351,6 +364,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -381,6 +395,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -408,7 +423,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -425,6 +441,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -455,6 +472,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -481,7 +499,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -498,6 +517,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -528,6 +548,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
                <Configuration
@@ -555,7 +576,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+                               
AdditionalIncludeDirectories="$(tcltkDir)\include"
+                               
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -572,6 +594,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               
AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib 
$(tcltkDir)\lib\tix8.4\tix84.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
@@ -602,6 +625,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="copy $(tcltkDir)\lib\*.dll 
$(OutDir)"
                        />
                </Configuration>
        </Configurations>

Modified: python/branches/py3k/PCbuild8/pcbuild.sln
==============================================================================
--- python/branches/py3k/PCbuild8/pcbuild.sln   (original)
+++ python/branches/py3k/PCbuild8/pcbuild.sln   Fri Nov 16 03:14:19 2007
@@ -358,8 +358,8 @@
                {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|Win32.Build.0 = 
PGUpdate|Win32
                {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.ActiveCfg = 
PGUpdate|x64
                {E644B843-F7CA-4888-AA6D-653C77592856}.PGUpdate|x64.Build.0 = 
PGUpdate|x64
-               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.ActiveCfg 
= PGInstrument|Win32
-               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = 
PGInstrument|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.ActiveCfg 
= Release|Win32
+               {E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = 
Release|Win32
                {E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.ActiveCfg = 
Release|x64
                {E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.Build.0 = 
Release|x64
                {1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.ActiveCfg = 
Debug|Win32

Modified: python/branches/py3k/PCbuild8/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild8/pyproject.vsprops     (original)
+++ python/branches/py3k/PCbuild8/pyproject.vsprops     Fri Nov 16 03:14:19 2007
@@ -39,4 +39,8 @@
                Name="opensslDir"
                Value="..\..\..\openssl-0.9.8a"
        />
+       <UserMacro
+               Name="tcltkDir"
+               Value="..\..\..\tcltk"
+       />
 </VisualStudioPropertySheet>
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins

Reply via email to