summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-16 02:14:19 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-16 02:14:19 (GMT)
commit3bff4373e6981d2a281bfa6c6a2006b83b99532d (patch)
treed0d6f4cc09546a3bd4a13ee5c7da461d157b6c72
parentb7b030ec37bd688d5c3ab2c4a4f28d0544656f99 (diff)
downloadcpython-3bff4373e6981d2a281bfa6c6a2006b83b99532d.zip
cpython-3bff4373e6981d2a281bfa6c6a2006b83b99532d.tar.gz
cpython-3bff4373e6981d2a281bfa6c6a2006b83b99532d.tar.bz2
I finally figured out why _tkinter and _bsddb didn't compile with PCbuild8.
-rw-r--r--PCbuild8/_tkinter/_tkinter.vcproj40
-rw-r--r--PCbuild8/pcbuild.sln4
-rw-r--r--PCbuild8/pyproject.vsprops4
3 files changed, 38 insertions, 10 deletions
diff --git a/PCbuild8/_tkinter/_tkinter.vcproj b/PCbuild8/_tkinter/_tkinter.vcproj
index ba0887b..a627b14 100644
--- a/PCbuild8/_tkinter/_tkinter.vcproj
+++ b/PCbuild8/_tkinter/_tkinter.vcproj
@@ -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>
diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
index 4883628..a734e1a 100644
--- a/PCbuild8/pcbuild.sln
+++ b/PCbuild8/pcbuild.sln
@@ -358,8 +358,8 @@ Global
{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
diff --git a/PCbuild8/pyproject.vsprops b/PCbuild8/pyproject.vsprops
index 752e174..a509677 100644
--- a/PCbuild8/pyproject.vsprops
+++ b/PCbuild8/pyproject.vsprops
@@ -39,4 +39,8 @@
Name="opensslDir"
Value="..\..\..\openssl-0.9.8a"
/>
+ <UserMacro
+ Name="tcltkDir"
+ Value="..\..\..\tcltk"
+ />
</VisualStudioPropertySheet>