]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7b030e)
I finally figured out why _tkinter and _bsddb didn't compile with PCbuild8.
authorChristian Heimes <christian@cheimes.de>
Fri, 16 Nov 2007 02:14:19 +0000 (02:14 +0000)
committerChristian Heimes <christian@cheimes.de>
Fri, 16 Nov 2007 02:14:19 +0000 (02:14 +0000)
PCbuild8/_tkinter/_tkinter.vcproj patch | blob | blame | history
PCbuild8/pcbuild.sln patch | blob | blame | history
PCbuild8/pyproject.vsprops patch | blob | blame | history

diff --git a/PCbuild8/_tkinter/_tkinter.vcproj b/PCbuild8/_tkinter/_tkinter.vcproj
index ba0887b51cc44e40166e576ba7f05708114b5191..a627b14aebaefbf56a63a66226bf34877b2a9165 100644 (file)
--- a/PCbuild8/_tkinter/_tkinter.vcproj
+++ b/PCbuild8/_tkinter/_tkinter.vcproj
@@ -42,7 +42,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -61,6 +62,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r
@@ -88,6 +90,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -115,7 +118,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -134,6 +138,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="17"\r
@@ -161,6 +166,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -187,7 +193,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -204,6 +211,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -234,6 +242,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -261,7 +270,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -278,6 +288,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -308,6 +319,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -334,7 +346,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -351,6 +364,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -381,6 +395,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -408,7 +423,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -425,6 +441,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -455,6 +472,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -481,7 +499,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -498,6 +517,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -528,6 +548,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -555,7 +576,8 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"\r
+                               AdditionalIncludeDirectories="$(tcltkDir)\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -572,6 +594,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -602,6 +625,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine="copy $(tcltkDir)\lib\*.dll $(OutDir)"\r
                        />\r
                </Configuration>\r
        </Configurations>\r
diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
index 48836287a67869cdd84754e4d28e90b6cbfcf9a4..a734e1a2c4d91b4e930bec8ea4de3b7576cca876 100644 (file)
--- 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 752e1746e21e7fc22867dc22f46f51851ede28a1..a509677d48739ad289cf319ad04f44d1eb4a6b67 100644 (file)
--- a/PCbuild8/pyproject.vsprops
+++ b/PCbuild8/pyproject.vsprops
@@ -39,4 +39,8 @@
                Name="opensslDir"\r
                Value="..\..\..\openssl-0.9.8a"\r
        />\r
+       <UserMacro\r
+               Name="tcltkDir"\r
+               Value="..\..\..\tcltk"\r
+       />\r
 </VisualStudioPropertySheet>\r
Mirror of https://github.com/python/cpython.git