diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_bsddb.vcproj | 43 | ||||
| -rw-r--r-- | PCbuild/_sqlite3.vcproj | 26 | ||||
| -rw-r--r-- | PCbuild/_tkinter.vcproj | 12 | ||||
| -rw-r--r-- | PCbuild/pcbuild.sln | 38 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 38 |
5 files changed, 96 insertions, 61 deletions
diff --git a/PCbuild/_bsddb.vcproj b/PCbuild/_bsddb.vcproj index 3efdcce..f9d77e8 100644 --- a/PCbuild/_bsddb.vcproj +++ b/PCbuild/_bsddb.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="_bsddb" ProjectGUID="{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" RootNamespace="_bsddb" @@ -42,7 +42,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -52,11 +52,9 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib" BaseAddress="0x1e180000" /> <Tool @@ -105,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -115,11 +113,11 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist "x64\Debug AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Debug AMD64|x64"
" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalDependencies=""$(bsddbDir)x64\Debug AMD64\db_static.lib"" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -168,7 +166,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -178,11 +176,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -232,7 +229,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -242,11 +239,11 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" + CommandLine="" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -295,7 +292,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -305,11 +302,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -359,7 +355,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -369,11 +365,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist "x64\Release AMD64\db_static.lib" exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" TargetMachine="17" /> @@ -423,7 +418,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -433,11 +428,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" /> <Tool @@ -487,7 +481,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(bsddbDir)" + AdditionalIncludeDirectories="$(bsddbDir),$(bsddbDir)\.." /> <Tool Name="VCManagedResourceCompilerTool" @@ -497,11 +491,10 @@ /> <Tool Name="VCPreLinkEventTool" - CommandLine="cd $(bsddbDir)
if exist x64\Release AMD64\db_static.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(bsddbDir)x64\Release AMD64\db_static.lib" + AdditionalDependencies="$(bsddbDepLibs)" BaseAddress="0x1e180000" TargetMachine="17" /> diff --git a/PCbuild/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj index 646c545..19d5497 100644 --- a/PCbuild/_sqlite3.vcproj +++ b/PCbuild/_sqlite3.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="9.00" Name="_sqlite3" ProjectGUID="{13CECB97-4119-4316-9D42-8534019A5A44}" RootNamespace="_sqlite3" @@ -53,12 +53,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -118,12 +115,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -183,12 +177,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -249,12 +240,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -314,12 +302,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -380,12 +365,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" TargetMachine="17" /> @@ -446,12 +428,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" /> <Tool @@ -512,12 +491,9 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Build sqlite3 libs and dll" - CommandLine="cd "$(sqlite3Dir)"
if not exist "$(OutDir)\sqlite3.dll" if exist $(PlatformName)\sqlite3.dll copy $(PlatformName)\sqlite3.dll "$(OutDir)"
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /DNO_TCL /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist "$(OutDir)\sqlite3.dll" copy sqlite3.dll "$(OutDir)"
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib" BaseAddress="0x1e180000" TargetMachine="17" /> diff --git a/PCbuild/_tkinter.vcproj b/PCbuild/_tkinter.vcproj index e3baa5c..e8f8aa5 100644 --- a/PCbuild/_tkinter.vcproj +++ b/PCbuild/_tkinter.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(tcltkLib)" + AdditionalDependencies="$(tcltkLibDebug)" /> <Tool Name="VCALinkTool" @@ -104,7 +104,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -118,7 +118,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(tcltk64Lib)" + AdditionalDependencies="$(tcltk64LibDebug)" /> <Tool Name="VCALinkTool" @@ -229,7 +229,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -354,7 +354,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool @@ -480,7 +480,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(tcltk64Dir)\include"" + AdditionalIncludeDirectories="$(tcltk64Dir)\include" PreprocessorDefinitions="WITH_APPINIT" /> <Tool diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 69c4a83..6838d62 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -36,6 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ProjectSection(ProjectDependencies) = postProject + {62172C7D-B39E-409A-B352-370FF5098C19} = {62172C7D-B39E-409A-B352-370FF5098C19} {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject @@ -67,6 +68,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" @@ -114,6 +116,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb44", "_bsddb44.vcproj", "{62172C7D-B39E-409A-B352-370FF5098C19}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -486,6 +492,38 @@ Global {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64 {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.ActiveCfg = Debug|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|Win32.Build.0 = Debug|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.ActiveCfg = Debug|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Debug|x64.Build.0 = Debug|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.ActiveCfg = Release|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|Win32.Build.0 = Release|Win32 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.ActiveCfg = Release|x64 + {62172C7D-B39E-409A-B352-370FF5098C19}.Release|x64.Build.0 = Release|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|Win32.Build.0 = Debug|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.ActiveCfg = Debug|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Debug|x64.Build.0 = Debug|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.ActiveCfg = Release|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|Win32.Build.0 = Release|Win32 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.ActiveCfg = Release|x64 + {A1A295E5-463C-437F-81CA-1F32367685DA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 54819e88..ccf579d 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -46,23 +46,43 @@ /> <UserMacro Name="bsddbDir" - Value="..\..\db-4.4.20\build_win32\" + Value="$(bsddb44Dir)" + /> + <UserMacro + Name="bsddbDepLibs" + Value="$(bsddb44DepLibs)" + /> + <UserMacro + Name="bsddb44Dir" + Value="..\..\db-4.4.20\build_win32" + /> + <UserMacro + Name="bsddb44DepLibs" + Value="" + /> + <UserMacro + Name="bsddb45Dir" + Value="..\..\db-4.5.20.x\build_windows" + /> + <UserMacro + Name="bsddb45DepLibs" + Value="ws2_32.lib" /> <UserMacro Name="sqlite3Dir" - Value="..\..\sqlite-source-3.3.4\" + Value="..\..\sqlite-source-3.3.4" /> <UserMacro Name="bz2Dir" - Value="..\..\bzip2-1.0.3\" + Value="..\..\bzip2-1.0.3" /> <UserMacro Name="opensslDir" - Value="..\..\openssl-0.9.8g\" + Value="..\..\openssl-0.9.8g" /> <UserMacro Name="tcltkDir" - Value="..\..\tcltk\" + Value="..\..\tcltk" /> <UserMacro Name="tcltk64Dir" @@ -73,7 +93,15 @@ Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib" /> <UserMacro + Name="tcltkLibDebug" + Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib" + /> + <UserMacro Name="tcltk64Lib" Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib" /> + <UserMacro + Name="tcltk64LibDebug" + Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib" + /> </VisualStudioPropertySheet> |