--- canvas/source/tools/page.cxx.bak 2010-09-20 17:52:27.484375000 +0200 +++ canvas/source/tools/page.cxx 2010-09-21 22:58:02.500000000 +0200 @@ -88,7 +88,7 @@ // currently be deleted. in either case, simply // remove the reference from our internal storage. FragmentContainer_t::iterator it( -#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) +#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1700) remove( #else std::remove( --- canvas/source/tools/pagemanager.cxx.bak 2010-09-21 22:57:04.609375000 +0200 +++ canvas/source/tools/pagemanager.cxx 2010-09-21 22:57:24.921875000 +0200 @@ -93,7 +93,7 @@ // erase the reference to the given fragment from our // internal container. FragmentContainer_t::iterator it( -#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1600) +#if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1700) remove( #else std::remove( --- chart2/source/model/template/DataInterpreter.cxx.old 2010-09-23 22:49:09.578125000 +0200 +++ chart2/source/model/template/DataInterpreter.cxx 2010-09-23 22:49:42.046875000 +0200 @@ -235,7 +235,7 @@ namespace { -struct lcl_LabeledSequenceEquals : public unary_function< Reference< data::XLabeledDataSequence >, bool > +struct lcl_LabeledSequenceEquals : public std::unary_function< Reference< data::XLabeledDataSequence >, bool > { lcl_LabeledSequenceEquals( const Reference< data::XLabeledDataSequence > & xLSeqToCmp ) : m_bHasLabels ( false ), --- configure.in.old 2010-09-20 18:14:32.437500000 +0200 +++ configure.in 2010-09-20 18:27:37.343750000 +0200 @@ -1848,13 +1848,13 @@ AC_MSG_RESULT([done]) dnl =========================================================== - dnl Check for mspdb71.dll/mspdb80.dll + dnl Check for mspdb71.dll/mspdb80.dll/mspdb100.dll dnl =========================================================== - dnl .NET 2003/5/8 Compiler + dnl .NET 2003/5/8/10 Compiler if test -n "$with_mspdb_path";then with_mspdb_path=`cygpath -u "$with_mspdb_path"` fi - if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll"; then + if test -e "$with_mspdb_path/mspdb71.dll" -o -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll"; then MSPDB_PATH="$with_mspdb_path" fi dnl .NET 2003 case @@ -1869,16 +1869,21 @@ if test -z "$MSPDB_PATH" -a -e "$with_cl_home/bin/mspdb80.dll"; then MSPDB_PATH="$with_cl_home/bin" fi + dnl .NET 2010 case + if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb100.dll"; then + MSPDB_PATH="$with_cl_home/../Common7/IDE" + fi if test -z "$MSPDB_PATH";then dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty AC_PATH_PROG(MSPDB_PATH, mspdb80.dll) AC_PATH_PROG(MSPDB_PATH, mspdb71.dll) + AC_PATH_PROG(MSPDB_PATH, mspdb100.dll) MSPDB_PATH=`dirname "$MSPDB_PATH"` fi if test -z "$MSPDB_PATH"; then - AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path]) + AC_MSG_ERROR([You need a mspdb71.dll/mspdb80.dll/mspdb100.dll, make sure it's in the path or use --with-mspdb-path]) fi MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` @@ -1911,7 +1916,11 @@ } }"` AC_MSG_RESULT([found Compiler version $CCNUMVER.]) - if test "$CCNUMVER" -ge "001500000000"; then + if test "$CCNUMVER" -ge "001600000000"; then + COMEX=13 + MSVSVER=2010 + AC_MSG_RESULT([found .NET 2010 / VS 10.0.]) + elif test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 AC_MSG_RESULT([found .NET 2008 / VS 9.0.]) @@ -1924,7 +1933,7 @@ MSVSVER=2003 AC_MSG_RESULT([found .NET 2003.]) else - AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.]) + AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005/2008/2010 compiler.]) fi else AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.]) --- dbaccess/source/ui/querydesign/JoinController.cxx.old 2010-09-23 19:54:57.406250000 +0200 +++ dbaccess/source/ui/querydesign/JoinController.cxx 2010-09-23 19:55:43.937500000 +0200 @@ -422,6 +422,8 @@ { #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) m_vTableConnectionData.erase( remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + m_vTableConnectionData.erase( _STL::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); #else m_vTableConnectionData.erase( ::std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); #endif --- dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx.old 2010-09-23 19:58:11.859375000 +0200 +++ dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx 2010-09-23 19:59:13.578125000 +0200 @@ -77,6 +77,8 @@ { #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) m_vTableConnection.erase(remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + m_vTableConnection.erase(_STL::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); #else m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end()); #endif --- dbaccess/source/ui/querydesign/QueryTableView.cxx.old 2010-09-23 20:00:44.671875000 +0200 +++ dbaccess/source/ui/querydesign/QueryTableView.cxx 2010-09-23 20:03:26.625000000 +0200 @@ -372,6 +372,8 @@ arrInvalidTables.push_back(pData->GetAliasName()); #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pTabWinDataList->erase( _STL::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); #else pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); #endif @@ -404,6 +406,8 @@ { // nein -> Pech gehabt, die Connection faellt weg #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pTabConnDataList->erase( remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pTabConnDataList->erase( _STL::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end()); #else pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter) ,pTabConnDataList->end()); #endif @@ -942,6 +946,8 @@ TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData(); #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),pTabWin->GetData()),pTabWinDataList->end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pTabWinDataList->erase( _STL::remove(pTabWinDataList->begin(),pTabWinDataList->end(),pTabWin->GetData()),pTabWinDataList->end()); #else pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),pTabWin->GetData()),pTabWinDataList->end()); #endif --- dbaccess/source/ui/relationdesign/RelationTableView.cxx.old 2010-09-23 19:35:36.609375000 +0200 +++ dbaccess/source/ui/relationdesign/RelationTableView.cxx 2010-09-23 19:42:37.953125000 +0200 @@ -148,6 +148,8 @@ arrInvalidTables.push_back(pData->GetTableName()); #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pTabWinDataList->erase( remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pTabWinDataList->erase( _STL::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); #else pTabWinDataList->erase( ::std::remove(pTabWinDataList->begin(),pTabWinDataList->end(),*aIter) ,pTabWinDataList->end()); #endif @@ -181,6 +183,8 @@ { // nein -> Pech gehabt, die Connection faellt weg #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pTabConnDataList->erase( remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pTabConnDataList->erase( _STL::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); #else pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); #endif --- desktop/util/makefile.mk.bak 2010-09-24 00:02:58.609375000 +0200 +++ desktop/util/makefile.mk 2010-09-24 00:03:37.515625000 +0200 @@ -236,6 +236,9 @@ .IF "$(CCNUMVER)" <= "001399999999" $(MISC)$/$(TARGET).exe.manifest: template.manifest $(COPY) $< $@ +.ELIF "$(CCNUMVER)" <= "001699999999" +$(MISC)$/$(TARGET).exe.manifest: template.manifest + $(COPY) $< $@ .ELSE $(MISC)$/$(TARGET).exe.template.manifest: template.manifest $(COPY) $< $@ --- embedserv/source/inc/stdafx.h.old 2010-09-21 01:55:43.000000000 +0200 +++ embedserv/source/inc/stdafx.h 2010-09-21 01:57:38.078125000 +0200 @@ -9,6 +9,11 @@ #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0400 #endif + +#if defined (_MSC_VER) && (_MSC_VER == 1600) +#define _WIN32_WINNT 0x0403 +#endif + #define _ATL_APARTMENT_THREADED // #define _ATL_STATIC_REGISTRY --- extensions/source/ole/jscriptclasses.hxx.bak 2010-09-20 17:24:18.359375000 +0200 +++ extensions/source/ole/jscriptclasses.hxx 2010-09-23 21:25:39.406250000 +0200 @@ -34,7 +34,7 @@ #include //#include "stdafx.h" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #if OSL_DEBUG_LEVEL > 0 //#define _ATL_DEBUG_INTERFACES --- extensions/source/ole/oledll.cxx.bak 2010-09-20 17:24:18.421875000 +0200 +++ extensions/source/ole/oledll.cxx 2010-09-23 21:25:34.578125000 +0200 @@ -29,7 +29,7 @@ #include "precompiled_extensions.hxx" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #pragma warning (push,1) --- extensions/source/ole/oleobjw.hxx.bak 2010-09-20 17:52:42.781250000 +0200 +++ extensions/source/ole/oleobjw.hxx 2010-09-23 21:25:29.156250000 +0200 @@ -35,7 +35,7 @@ #endif #include -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG --- extensions/source/ole/servprov.cxx.bak 2010-09-20 17:24:18.625000000 +0200 +++ extensions/source/ole/servprov.cxx 2010-09-23 21:25:24.890625000 +0200 @@ -41,7 +41,7 @@ #include #include -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #if defined(_MSC_VER) && (_MSC_VER >= 1300) #undef _DEBUG --- extensions/source/ole/unotypewrapper.hxx.bak 2010-09-20 17:24:18.765625000 +0200 +++ extensions/source/ole/unotypewrapper.hxx 2010-09-23 21:25:20.234375000 +0200 @@ -33,7 +33,7 @@ #include //#include "stdafx.h" #define STRICT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #if OSL_DEBUG_LEVEL > 0 //#define _ATL_DEBUG_INTERFACES --- /dev/null 2010-09-20 18:23:47.000000000 +0200 +++ external/msvcp100/README_msvcX100.dll 2010-09-19 23:02:41.390625000 +0200 @@ -0,0 +1 @@ +Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a VS 2010 / VC 10.0 compiler. --- forms/source/component/GroupManager.hxx.old 2010-09-23 00:44:19.640625000 +0200 +++ forms/source/component/GroupManager.hxx 2010-09-23 00:47:21.078125000 +0200 @@ -71,7 +71,11 @@ template sal_Int32 insert_sorted(::std::vector& _rArray, const ELEMENT& _rNewElement, const LESS_COMPARE& _rCompareOp) { +#if defined (_MSC_VER) && (_MSC_VER == 1600) + typename ::std::vector::iterator aInsertPos = ::std::lower_bound( +#else typename ::std::vector::iterator aInsertPos = lower_bound( +#endif _rArray.begin(), _rArray.end(), _rNewElement, @@ -84,7 +88,11 @@ template sal_Bool seek_entry(const ::std::vector& _rArray, const ELEMENT& _rNewElement, sal_Int32& nPos, const LESS_COMPARE& _rCompareOp) { +#if defined (_MSC_VER) && (_MSC_VER == 1600) + typename ::std::vector::const_iterator aExistentPos = ::std::lower_bound( +#else typename ::std::vector::const_iterator aExistentPos = lower_bound( +#endif _rArray.begin(), _rArray.end(), _rNewElement, --- forms/source/misc/property.cxx.old 2010-09-23 00:37:28.281250000 +0200 +++ forms/source/misc/property.cxx 2010-09-23 00:39:12.062500000 +0200 @@ -55,7 +55,11 @@ PropertyAssignment aCompareName(_rName, -1); +#if defined (_MSC_VER) && (_MSC_VER == 1600) + ::std::pair aPair = std::equal_range( +#else ::std::pair aPair = equal_range( +#endif s_AllKnownProperties.begin(), s_AllKnownProperties.end(), aCompareName, --- icu/icu4c-4_0_1-src.patch.old 2010-09-20 20:53:56.359375000 +0200 +++ icu/icu4c-4_0_1-src.patch 2010-09-20 20:54:01.531250000 +0200 @@ -245,3 +245,15 @@ T_FileStream_writeLine(makefile, tmp); if(o->hadStdin == FALSE) { /* shortcut */ +--- misc/build/icu/source/test/intltest/dtifmtts.cpp.old 2010-09-20 20:49:33.953125000 +0200 ++++ misc/build/icu/source/test/intltest/dtifmtts.cpp 2010-09-20 20:51:37.875000000 +0200 +@@ -13,8 +13,9 @@ + //FIXME: define it in compiler flag + //#define DTIFMTTS_DEBUG 1 + +- ++#if defined (_MSC_VER) && (_MSC_VER < 1600) + #include ++#endif + #ifdef DTIFMTTS_DEBUG + #endif \ No newline at end of file --- cppu/source/uno/lbmap.cxx.old 2010-09-20 19:55:33.062500000 +0200 +++ cppu/source/uno/lbmap.cxx 2010-09-20 20:02:47.578125000 +0200 @@ -129,13 +129,21 @@ {} }; //-------------------------------------------------------------------------------------------------- -struct FctOUStringHash : public unary_function< const OUString &, size_t > +#if defined (_MSC_VER) && (_MSC_VER == 1600) +struct FctOUStringHash : public std::unary_function< const OUString &, size_t > +#else +struct FctOUStringHash : public unary_function::unary_function< const OUString &, size_t > +#endif { size_t operator()( const OUString & rKey ) const SAL_THROW( () ) { return (size_t)rKey.hashCode(); } }; //-------------------------------------------------------------------------------------------------- +#if defined (_MSC_VER) && (_MSC_VER == 1600) +struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > +#else struct FctPtrHash : public unary_function< uno_Mapping *, size_t > +#endif { size_t operator()( uno_Mapping * pKey ) const SAL_THROW( () ) { return (size_t)pKey; } --- cppu/inc/uno/lbnames.h.old 2010-09-20 19:30:22.437500000 +0200 +++ cppu/inc/uno/lbnames.h 2010-09-20 19:50:48.765625000 +0200 @@ -36,10 +36,10 @@ #elif (_MSC_VER < 1100) // MSVC 4.x #pragma warning( disable: 4290 ) #define TMP_CPPU_ENV msci -#elif (_MSC_VER < 1600) // MSVC 5-9 +#elif (_MSC_VER < 1700) // MSVC 5-10 #define TMP_CPPU_ENV msci #else -#error "ms visual c++ version must be between 4.2 and 9.x" +#error "ms visual c++ version must be between 4.2 and 10.x" #endif /* (_MSC_VER < 1000) */ /* sunpro cc */ #elif defined (__SUNPRO_CC) --- libxml2/makefile.mk.old 2010-09-20 20:26:03.625000000 +0200 +++ libxml2/makefile.mk 2010-09-20 20:28:11.953125000 +0200 @@ -52,7 +52,7 @@ libxml2-mingw.patch \ libxml2-gnome599717.patch \ libxml2-global-symbols.patch \ - + libxml2-vs2010.patch \ # This is only for UNX environment now --- /dev/null 2010-09-20 20:32:17.000000000 +0200 +++ libxml2/libxml2-vs2010.patch 2010-09-20 20:24:56.656250000 +0200 @@ -0,0 +1,11 @@ +--- misc/build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 ++++ misc/build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 +@@ -91,7 +91,7 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 +-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++LDFLAGS = $(LDFLAGS) + !endif + + # Libxml object files. --- libxmlsec/makefile.mk.old 2010-09-21 01:27:30.984375000 +0200 +++ libxmlsec/makefile.mk 2010-09-21 01:27:57.359375000 +0200 @@ -65,7 +65,8 @@ xmlsec1-nssmangleciphers.patch \ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ - xmlsec1-mingw-keymgr-mscrypto.patch + xmlsec1-mingw-keymgr-mscrypto.patch \ + xmlsec1-vs2010.patch \ ADDITIONAL_FILES= \ --- libxslt/makefile.mk.old 2010-09-20 21:25:55.625000000 +0200 +++ libxslt/makefile.mk 2010-09-20 21:26:36.375000000 +0200 @@ -55,7 +55,8 @@ PATCH_FILES=libxslt-configure.patch \ libxslt-win_manifest.patch \ libxslt-mingw.patch \ - libxslt-internal-symbols.patch + libxslt-internal-symbols.patch \ + libxslt-vs2010.patch \ # This is only for UNX environment now --- /dev/null 2010-09-20 21:28:14.000000000 +0200 +++ libxslt/libxslt-vs2010.patch 2010-09-20 21:25:41.078125000 +0200 @@ -0,0 +1,11 @@ +--- misc/build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-09-20 21:24:09.531250000 +0200 ++++ misc/build/libxslt-1.1.26/win32/Makefile.msvc 2010-09-20 21:24:24.281250000 +0200 +@@ -71,7 +71,7 @@ + LDFLAGS = $(LDFLAGS) /DEBUG + !else + CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 +-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++LDFLAGS = $(LDFLAGS) + !endif + + # Libxslt object files. --- oowintool.old 2010-09-20 18:05:16.312500000 +0200 +++ oowintool 2010-09-20 18:09:13.968750000 +0200 @@ -198,9 +198,25 @@ 'dll_suffix' => '90' ); +my %msvs_2010 = ( + 'ver' => '10.0', + 'key' => 'Microsoft/VisualStudio/10.0/Setup/VS/ProductDir', + 'instmsi_path' => '?', + 'dll_path' => 'VC/redist/x86/Microsoft.VC100.CRT', + 'dll_suffix' => '100' +); + +my %msvc_2010 = ( + 'ver' => '10.0', + 'key' => 'Microsoft/VisualStudio/10.0/Setup/VC/ProductDir', + 'instmsi_path' => '?', + 'dll_path' => 'redist/x86/Microsoft.VC100.CRT', + 'dll_suffix' => '100' +); + sub find_msvs() { - my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 ); + my @ms_versions = ( \%msvs_2010, \%msvs_2008, \%msvs_express_2008, \%msvs_2005, \%msvs_express_2005, \%msvs_net_2003_ea, \%msvs_net_2003 ); for $ver (@ms_versions) { @@ -215,7 +231,7 @@ sub find_msvc() { - my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 ); + my @ms_versions = ( \%msvc_2010, \%msvc_2008, \%msvc_express_2008, \%msvc_2005, \%msvc_express_2005, \%msvc_net_2003 ); for $ver (@ms_versions) { @@ -315,7 +331,7 @@ $dest . $ver->{'dll_suffix'}); copy_dll ($srcdir, "msvcr" . $ver->{'dll_suffix'} . ".dll", $dest . $ver->{'dll_suffix'}); - if ($ver->{'dll_suffix'} >= 90) { + if ($ver->{'dll_suffix'} == 90) { copy_dll ($srcdir, "msvcm" . $ver->{'dll_suffix'} . ".dll", $dest . $ver->{'dll_suffix'}); copy_dll ($srcdir, "Microsoft.VC90.CRT.manifest", $dest . $ver->{'dll_suffix'}); --- /dev/null 2010-10-04 13:45:59.000000000 +0200 +++ python/Python-2.6.1-vs2010.patch 2010-10-04 13:35:44.890625000 +0200 @@ -0,0 +1,6093 @@ +--- misc/build/Python-2.6.1/PC/msvcrtmodule.c.old 2010-09-24 22:03:40.593750000 +0200 ++++ misc/build/Python-2.6.1/PC/msvcrtmodule.c 2010-09-24 22:04:39.625000000 +0200 +@@ -23,7 +23,7 @@ + #include + + #ifdef _MSC_VER +-#if _MSC_VER >= 1500 ++#if _MSC_VER == 1500 + #include + #endif + #endif +diff -uN misc/build/Python-2.6.1/PCbuild.old//_ctypes.vcxproj misc/build/Python-2.6.1/PCbuild/_ctypes.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_ctypes.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_ctypes.vcxproj 2010-10-04 12:52:04.859375000 +0200 +@@ -0,0 +1,289 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {0E9791DB-593A-465F-98BC-681011311618} ++ _ctypes ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ 0x1D1A0000 ++ ++ ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ MachineX64 ++ ++ ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories) ++ ++ ++ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) ++ NotSet ++ 0x1D1A0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ true ++ true ++ true ++ true ++ ++ ++ ++ ++ true ++ ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ true ++ ml64 /nologo /c /Fo "$(IntDir)win64.obj" "%(FullPath)" ++ ++ $(IntDir)win64.obj;%(Outputs) ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_ctypes_test.vcxproj misc/build/Python-2.6.1/PCbuild/_ctypes_test.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_ctypes_test.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_ctypes_test.vcxproj 2010-10-04 12:52:04.875000000 +0200 +@@ -0,0 +1,187 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {9EC7190A-249F-4180-A900-548FDCF3055F} ++ _ctypes_test ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ ++ ++ X64 ++ ++ ++ ++ ++ X64 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_elementtree.vcxproj misc/build/Python-2.6.1/PCbuild/_elementtree.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_elementtree.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_elementtree.vcxproj 2010-10-04 12:52:04.875000000 +0200 +@@ -0,0 +1,264 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {17E1E049-C309-4D79-843F-AE483C264AEA} ++ _elementtree ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ MachineX64 ++ ++ ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\Modules\expat;%(AdditionalIncludeDirectories) ++ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ 0x1D100000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_msi.vcxproj misc/build/Python-2.6.1/PCbuild/_msi.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_msi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_msi.vcxproj 2010-10-04 12:52:04.890625000 +0200 +@@ -0,0 +1,220 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C} ++ _msi ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ MachineX64 ++ ++ ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ ++ ++ ++ ++ X64 ++ ++ ++ fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) ++ 0x1D160000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_multiprocessing.vcxproj misc/build/Python-2.6.1/PCbuild/_multiprocessing.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_multiprocessing.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_multiprocessing.vcxproj 2010-10-04 12:52:04.906250000 +0200 +@@ -0,0 +1,228 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {9e48b300-37d1-11dd-8c41-005056c00008} ++ _multiprocessing ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_socket.vcxproj misc/build/Python-2.6.1/PCbuild/_socket.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_socket.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_socket.vcxproj 2010-10-04 12:52:04.906250000 +0200 +@@ -0,0 +1,223 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {86937F53-C189-40EF-8CE8-8759D8E7D480} ++ _socket ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ ws2_32.lib;%(AdditionalDependencies) ++ 0x1e1D0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_ssl.vcxproj misc/build/Python-2.6.1/PCbuild/_ssl.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_ssl.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_ssl.vcxproj 2010-10-04 12:52:04.968750000 +0200 +@@ -0,0 +1,308 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C6E20F84-3247-4AD6-B051-B073268F73BA} ++ _ssl ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ cd "$(SolutionDir)" ++"$(PythonExe)" build_ssl.py Release $(Platform) -a ++ ++ ++ ++ X64 ++ ++ ++ $(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ ++ ++ ws2_32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib;$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//_testcapi.vcxproj misc/build/Python-2.6.1/PCbuild/_testcapi.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//_testcapi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/_testcapi.vcxproj 2010-10-04 12:52:04.968750000 +0200 +@@ -0,0 +1,212 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D} ++ _testcapi ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ MachineX64 ++ ++ ++ ++ ++ 0x1e1F0000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1e1F0000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//bdist_wininst.vcxproj misc/build/Python-2.6.1/PCbuild/bdist_wininst.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//bdist_wininst.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/bdist_wininst.vcxproj 2010-10-04 12:52:04.984375000 +0200 +@@ -0,0 +1,156 @@ ++ ++ ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C} ++ wininst ++ ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ..\lib\distutils\command\ ++ false ++ $(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ false ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ true ++ Win32 ++ .\..\lib\distutils\command\wininst.tlb ++ ++ ++ ++ ++ MinSpace ++ OnlyExplicitInline ++ ..\PC\bdist_wininst;..\Include;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Level3 ++ true ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0000 ++ ..\PC;..\PC\bdist_wininst;..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ comctl32.lib;imagehlp.lib;%(AdditionalDependencies) ++ ..\lib\distutils\command\wininst-9.0.exe ++ true ++ LIBC;%(IgnoreSpecificDefaultLibraries) ++ ..\lib\distutils\command\wininst-9.0.pdb ++ Windows ++ false ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ true ++ true ++ X64 ++ .\..\lib\distutils\command\wininst.tlb ++ ++ ++ ++ ++ MinSpace ++ OnlyExplicitInline ++ ..\PC\bdist_wininst;..\Include;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Level3 ++ true ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0000 ++ ..\PC;..\PC\bdist_wininst;..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ comctl32.lib;imagehlp.lib;%(AdditionalDependencies) ++ ..\lib\distutils\command\wininst-9.0-amd64.exe ++ true ++ LIBC;%(IgnoreSpecificDefaultLibraries) ++ ..\lib\distutils\command\wininst-9.0-amd64.pdb ++ Windows ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//debug.props misc/build/Python-2.6.1/PCbuild/debug.props +--- misc/build/Python-2.6.1/PCbuild.old//debug.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/debug.props 2010-10-04 12:52:05.187500000 +0200 +@@ -0,0 +1,19 @@ ++ ++ ++ ++ $(OutDir)kill_python_d.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ $(KillPythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//kill_python.vcxproj misc/build/Python-2.6.1/PCbuild/kill_python.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//kill_python.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/kill_python.vcxproj 2010-10-04 12:52:05.031250000 +0200 +@@ -0,0 +1,120 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++ kill_python ++ Win32Proj ++ ++ ++ ++ Application ++ NotSet ++ true ++ ++ ++ Application ++ NotSet ++ ++ ++ Application ++ NotSet ++ true ++ ++ ++ Application ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ $(OutDir)$(ProjectName)_d.exe ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ $(OutDir)$(ProjectName)_d.exe ++ Console ++ ++ ++ ++ ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ Console ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//make_buildinfo.vcxproj misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//make_buildinfo.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcxproj 2010-10-04 12:52:05.031250000 +0200 +@@ -0,0 +1,74 @@ ++ ++ ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD} ++ make_buildinfo ++ Win32Proj ++ ++ ++ ++ Application ++ NotSet ++ ++ ++ Application ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ OnlyExplicitInline ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreaded ++ ++ ++ $(OutDir)make_buildinfo.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ ++ ++ ++ ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//make_versioninfo.vcxproj misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//make_versioninfo.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcxproj 2010-10-04 12:52:05.046875000 +0200 +@@ -0,0 +1,201 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E} ++ make_versioninfo ++ ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ ++ ++ Application ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\PC\pythonnt_rc.h ++ ++ $(SolutionDir)..\PC\pythonnt_rc.h;%(Outputs) ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ $(SolutionDir)make_versioninfo.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ 0x1d000000 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\PC\python_nt.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\PC\pythonnt_rc.h ++ ++ $(SolutionDir)..\PC\pythonnt_rc.h;%(Outputs) ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ $(SolutionDir)make_versioninfo.exe ++ ++ ++ cd $(SolutionDir) ++make_versioninfo.exe > ..\PC\python_nt.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h ++ ++ $(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs) ++ ++ ++ Disabled ++ OnlyExplicitInline ++ false ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ $(SolutionDir)make_versioninfo_d.exe ++ $(TargetDir)$(TargetName).pdb ++ Console ++ 0x1d000000 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\PC\python_nt_d.h ++ ++ ++ ++ ++ ++ Build PC/pythonnt_rc(_d).h ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h ++ ++ $(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs) ++ ++ ++ X64 ++ ++ ++ Disabled ++ OnlyExplicitInline ++ false ++ _CONSOLE;%(PreprocessorDefinitions) ++ ++ ++ $(SolutionDir)make_versioninfo_d.exe ++ MachineX64 ++ ++ ++ cd $(SolutionDir) ++make_versioninfo_d.exe > ..\PC\python_nt_d.h ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pcbuild2010.sln misc/build/Python-2.6.1/PCbuild/pcbuild2010.sln +--- misc/build/Python-2.6.1/PCbuild.old//pcbuild2010.sln 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pcbuild2010.sln 2010-10-04 13:04:31.593750000 +0200 +@@ -0,0 +1,370 @@ ++? ++Microsoft Visual Studio Solution File, Format Version 11.00 ++# Visual Studio 2010 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcxproj", "{0E9791DB-593A-465F-98BC-681011311618}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcxproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcxproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcxproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcxproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcxproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcxproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcxproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 ++ PGInstrument|Win32 = PGInstrument|Win32 ++ PGInstrument|x64 = PGInstrument|x64 ++ PGUpdate|Win32 = PGUpdate|Win32 ++ PGUpdate|x64 = PGUpdate|x64 ++ Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|Win32.Build.0 = Debug|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.ActiveCfg = Debug|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Debug|x64.Build.0 = Debug|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.ActiveCfg = Release|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|Win32.Build.0 = Release|Win32 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.ActiveCfg = Release|x64 ++ {0E9791DB-593A-465F-98BC-681011311618}.Release|x64.Build.0 = Release|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64 ++ {9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.Build.0 = Release|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|Win32.Build.0 = Debug|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.ActiveCfg = Debug|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Debug|x64.Build.0 = Debug|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.ActiveCfg = Release|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|Win32.Build.0 = Release|Win32 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.ActiveCfg = Release|x64 ++ {17E1E049-C309-4D79-843F-AE483C264AEA}.Release|x64.Build.0 = Release|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|Win32.Build.0 = Debug|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.ActiveCfg = Debug|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Debug|x64.Build.0 = Debug|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.ActiveCfg = Release|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|Win32.Build.0 = Release|Win32 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.ActiveCfg = Release|x64 ++ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}.Release|x64.Build.0 = Release|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|Win32.Build.0 = Debug|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.ActiveCfg = Debug|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Debug|x64.Build.0 = Debug|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.ActiveCfg = Release|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64 ++ {9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|Win32.Build.0 = Debug|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.ActiveCfg = Debug|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Debug|x64.Build.0 = Debug|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.ActiveCfg = Release|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|Win32.Build.0 = Release|Win32 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.ActiveCfg = Release|x64 ++ {86937F53-C189-40EF-8CE8-8759D8E7D480}.Release|x64.Build.0 = Release|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|Win32.Build.0 = Debug|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.ActiveCfg = Debug|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Debug|x64.Build.0 = Debug|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.ActiveCfg = Release|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|Win32.Build.0 = Release|Win32 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.ActiveCfg = Release|x64 ++ {C6E20F84-3247-4AD6-B051-B073268F73BA}.Release|x64.Build.0 = Release|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|Win32.Build.0 = Debug|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.ActiveCfg = Debug|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Debug|x64.Build.0 = Debug|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.ActiveCfg = Release|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|Win32.Build.0 = Release|Win32 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.ActiveCfg = Release|x64 ++ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}.Release|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.Build.0 = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.Build.0 = Release|Win32 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|x64 ++ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.Build.0 = Debug|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.Build.0 = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.ActiveCfg = Release|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.Build.0 = Release|Win32 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64 ++ {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|Win32.Build.0 = Debug|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.ActiveCfg = Debug|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Debug|x64.Build.0 = Debug|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.ActiveCfg = Release|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|Win32.Build.0 = Release|Win32 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64 ++ {D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|Win32.Build.0 = Debug|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.ActiveCfg = Debug|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Debug|x64.Build.0 = Debug|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.ActiveCfg = Release|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64 ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.Build.0 = Debug|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.ActiveCfg = Release|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|Win32.Build.0 = Release|Win32 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.ActiveCfg = Release|x64 ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Release|x64.Build.0 = Release|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64 ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.Build.0 = Release|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|Win32.Build.0 = Debug|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.ActiveCfg = Debug|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Debug|x64.Build.0 = Debug|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.ActiveCfg = Release|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|Win32.Build.0 = Release|Win32 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.ActiveCfg = Release|x64 ++ {18CAE28C-B454-46C1-87A0-493D91D97F03}.Release|x64.Build.0 = Release|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|Win32.Build.0 = Debug|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.ActiveCfg = Debug|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Debug|x64.Build.0 = Debug|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.ActiveCfg = Release|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|Win32.Build.0 = Release|Win32 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.ActiveCfg = Release|x64 ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}.Release|x64.Build.0 = Release|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|Win32.Build.0 = Debug|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.ActiveCfg = Debug|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Debug|x64.Build.0 = Debug|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.ActiveCfg = Release|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64 ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.Build.0 = Debug|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGInstrument|x64.Build.0 = PGInstrument|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.PGUpdate|x64.Build.0 = PGUpdate|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.ActiveCfg = Release|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|Win32.Build.0 = Release|Win32 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.ActiveCfg = Release|x64 ++ {28B5D777-DDF2-4B6B-B34F-31D938813856}.Release|x64.Build.0 = Release|x64 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++EndGlobal +diff -uN misc/build/Python-2.6.1/PCbuild.old//pginstrument.props misc/build/Python-2.6.1/PCbuild/pginstrument.props +--- misc/build/Python-2.6.1/PCbuild.old//pginstrument.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pginstrument.props 2010-10-04 12:52:05.203125000 +0200 +@@ -0,0 +1,38 @@ ++ ++ ++ ++ $(SolutionDir)$(Platform)-pgi\ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(OutDirPGI)\ ++ $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ false ++ Size ++ true ++ false ++ true ++ true ++ ++ ++ false ++ ++ ++ true ++ true ++ PGInstrument ++ $(SolutionDir)$(Platform)-pgi\$(TargetName).pgd ++ $(OutDirPGI)\$(TargetName).lib ++ ++ ++ ++ ++ $(OutDirPGI) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pgupdate.props misc/build/Python-2.6.1/PCbuild/pgupdate.props +--- misc/build/Python-2.6.1/PCbuild.old//pgupdate.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pgupdate.props 2010-10-04 12:52:05.250000000 +0200 +@@ -0,0 +1,16 @@ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(SolutionDir)$(PlatformName)-pgo\ ++ ++ ++ ++ %(AdditionalManifestDependencies) ++ PGUpdate ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pyd.props misc/build/Python-2.6.1/PCbuild/pyd.props +--- misc/build/Python-2.6.1/PCbuild.old//pyd.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pyd.props 2010-10-04 12:52:05.250000000 +0200 +@@ -0,0 +1,27 @@ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ false ++ false ++ ++ ++ ++ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ $(OutDir)$(ProjectName).pyd ++ $(OutDir)$(ProjectName).pdb ++ $(OutDir)$(TargetName).lib ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pyd_d.props misc/build/Python-2.6.1/PCbuild/pyd_d.props +--- misc/build/Python-2.6.1/PCbuild.old//pyd_d.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pyd_d.props 2010-10-04 12:52:05.265625000 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ ++ ++ ++ $(SolutionDir)python_d.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ false ++ false ++ false ++ ++ ++ ++ Disabled ++ Default ++ false ++ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ $(OutDir)$(ProjectName)_d.pyd ++ $(OutDir)$(ProjectName)_d.pdb ++ $(OutDir)$(TargetName).lib ++ ++ ++ ++ ++ ++ ++ ++ ++ $(PythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pyexpat.vcxproj misc/build/Python-2.6.1/PCbuild/pyexpat.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//pyexpat.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pyexpat.vcxproj 2010-10-04 12:52:05.046875000 +0200 +@@ -0,0 +1,231 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {D06B6426-4762-44CC-8BAD-D79052507F2F} ++ pyexpat ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ X64 ++ ++ ++ .\..\Modules\expat;%(AdditionalIncludeDirectories) ++ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pyproject.props misc/build/Python-2.6.1/PCbuild/pyproject.props +--- misc/build/Python-2.6.1/PCbuild.old//pyproject.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pyproject.props 2010-10-04 12:52:05.281250000 +0200 +@@ -0,0 +1,115 @@ ++ ++ ++ ++ python26 ++ $(SolutionDir)\python.exe ++ ..\.. ++ $(bsddb47Dir) ++ $(bsddb47DepLibs) ++ $(externalsDir)\db-4.4.20\build_win32 ++ ++ $(externalsDir)\db-4.7.25.0\build_windows ++ ws2_32.lib ++ $(externalsDir)\sqlite-3.5.9 ++ $(externalsDir)\bzip2-1.0.5 ++ $(externalsDir)\openssl-0.9.8g ++ $(externalsDir)\tcltk ++ $(externalsDir)\tcltk64 ++ $(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib ++ $(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib ++ $(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib ++ $(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ $(SolutionDir)\ ++ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ ++ false ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ ..\Include; ..\PC;%(AdditionalIncludeDirectories) ++ _WIN32;%(PreprocessorDefinitions) ++ true ++ ++ ++ MultiThreaded ++ true ++ Level3 ++ ProgramDatabase ++ Default ++ ++ ++ $(OutDir);%(AdditionalLibraryDirectories) ++ true ++ $(OutDir)$(TargetName).pdb ++ Windows ++ false ++ ++ ++ MachineX86 ++ ++ ++ ..\PC;..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ ++ ++ $(PyDllName) ++ ++ ++ $(PythonExe) ++ ++ ++ $(externalsDir) ++ ++ ++ $(bsddbDir) ++ ++ ++ $(bsddbDepLibs) ++ ++ ++ $(bsddb44Dir) ++ ++ ++ $(bsddb44DepLibs) ++ ++ ++ $(bsddb47Dir) ++ ++ ++ $(bsddb47DepLibs) ++ ++ ++ $(sqlite3Dir) ++ ++ ++ $(bz2Dir) ++ ++ ++ $(opensslDir) ++ ++ ++ $(tcltkDir) ++ ++ ++ $(tcltk64Dir) ++ ++ ++ $(tcltkLib) ++ ++ ++ $(tcltkLibDebug) ++ ++ ++ $(tcltk64Lib) ++ ++ ++ $(tcltk64LibDebug) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//python.vcxproj misc/build/Python-2.6.1/PCbuild/python.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//python.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/python.vcxproj 2010-10-04 12:52:05.062500000 +0200 +@@ -0,0 +1,358 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++ ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ Disabled ++ false ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ true ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ $(OutDir)python_d.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ false ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ true ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ $(OutDir)python_d.exe ++ Console ++ 2100000 ++ 0x1d000000 ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _CONSOLE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)python.exe ++ Console ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pythoncore.vcxproj misc/build/Python-2.6.1/PCbuild/pythoncore.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//pythoncore.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pythoncore.vcxproj 2010-10-04 12:52:05.078125000 +0200 +@@ -0,0 +1,670 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++ pythoncore ++ ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ NotSet ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ DynamicLibrary ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName).lib ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ Disabled ++ Default ++ false ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Debug ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName)_d.dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName)_d.pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName)_d.lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ Disabled ++ Default ++ false ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Debug ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName)_d.dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName)_d.pdb ++ 0x1e000000 ++ $(OutDir)$(PyDllName)_d.lib ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ MachineX64 ++ ++ ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ ++ ++ ++ ++ X64 ++ ++ ++ /Zm200 %(AdditionalOptions) ++ ..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories) ++ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ..\Include;%(AdditionalIncludeDirectories) ++ ++ ++ Generate build information... ++ "$(SolutionDir)make_buildinfo.exe" Release ++ ++ ++ getbuildinfo.o;%(AdditionalDependencies) ++ $(OutDir)$(PyDllName).dll ++ libc;%(IgnoreSpecificDefaultLibraries) ++ $(OutDir)$(PyDllName).pdb ++ 0x1e000000 ++ $(OutDirPGI)$(PyDllName).lib ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//pythonw.vcxproj misc/build/Python-2.6.1/PCbuild/pythonw.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//pythonw.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/pythonw.vcxproj 2010-10-04 12:52:05.078125000 +0200 +@@ -0,0 +1,340 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F4229CC3-873C-49AE-9729-DD308ED4CD4A} ++ ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ Application ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ false ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw_d.exe ++ 2000000 ++ 0x1d000000 ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ false ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw_d.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ %(AdditionalIncludeDirectories) ++ _WINDOWS;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ $(OutDir)pythonw.exe ++ 2000000 ++ 0x1d000000 ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//release.props misc/build/Python-2.6.1/PCbuild/release.props +--- misc/build/Python-2.6.1/PCbuild.old//release.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/release.props 2010-10-04 12:52:05.281250000 +0200 +@@ -0,0 +1,19 @@ ++ ++ ++ ++ $(OutDir)kill_python.exe ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ ++ ++ ++ ++ $(KillPythonExe) ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//select.vcxproj misc/build/Python-2.6.1/PCbuild/select.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//select.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/select.vcxproj 2010-10-04 12:52:05.093750000 +0200 +@@ -0,0 +1,228 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {18CAE28C-B454-46C1-87A0-493D91D97F03} ++ select ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ MachineX64 ++ ++ ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ ++ ++ ++ ++ X64 ++ ++ ++ wsock32.lib;%(AdditionalDependencies) ++ libc;%(IgnoreSpecificDefaultLibraries) ++ 0x1D110000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//sqlite3.vcxproj misc/build/Python-2.6.1/PCbuild/sqlite3.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//sqlite3.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/sqlite3.vcxproj 2010-10-04 12:52:05.093750000 +0200 +@@ -0,0 +1,240 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {A1A295E5-463C-437F-81CA-1F32367685DA} ++ sqlite3 ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName)_d.dll ++ ++ ++ ++ ++ X64 ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName)_d.dll ++ ++ ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ $(OutDir)$(ProjectName).dll ++ ++ ++ ++ ++ X64 ++ ++ ++ $(sqlite3Dir);%(AdditionalIncludeDirectories) ++ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//unicodedata.vcxproj misc/build/Python-2.6.1/PCbuild/unicodedata.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//unicodedata.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/unicodedata.vcxproj 2010-10-04 12:52:05.109375000 +0200 +@@ -0,0 +1,216 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881} ++ unicodedata ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ MachineX64 ++ ++ ++ ++ ++ 0x1D120000 ++ ++ ++ ++ ++ X64 ++ ++ ++ 0x1D120000 ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//w9xpopen.vcxproj misc/build/Python-2.6.1/PCbuild/w9xpopen.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//w9xpopen.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/w9xpopen.vcxproj 2010-10-04 12:52:05.109375000 +0200 +@@ -0,0 +1,287 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} ++ w9xpopen ++ ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ NotSet ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ Application ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ EnableFastChecks ++ MultiThreadedDebug ++ ++ ++ Console ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ true ++ MultiThreaded ++ true ++ ++ ++ false ++ Console ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//winsound.vcxproj misc/build/Python-2.6.1/PCbuild/winsound.vcxproj +--- misc/build/Python-2.6.1/PCbuild.old//winsound.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/winsound.vcxproj 2010-10-04 12:52:05.140625000 +0200 +@@ -0,0 +1,212 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ PGInstrument ++ Win32 ++ ++ ++ PGInstrument ++ x64 ++ ++ ++ PGUpdate ++ Win32 ++ ++ ++ PGUpdate ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {28B5D777-DDF2-4B6B-B34F-31D938813856} ++ winsound ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ true ++ ++ ++ DynamicLibrary ++ NotSet ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ AllRules.ruleset ++ ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ X64 ++ ++ ++ winmm.lib;%(AdditionalDependencies) ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -uN misc/build/Python-2.6.1/PCbuild.old//x64.props misc/build/Python-2.6.1/PCbuild/x64.props +--- misc/build/Python-2.6.1/PCbuild.old//x64.props 1970-01-01 01:00:00.000000000 +0100 ++++ misc/build/Python-2.6.1/PCbuild/x64.props 2010-10-04 12:52:05.296875000 +0200 +@@ -0,0 +1,26 @@ ++ ++ ++ ++ $(HOST_PYTHON) ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ <_PropertySheetDisplayName>amd64 ++ $(SolutionDir)\amd64\ ++ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ ++ ++ ++ ++ /USECL:MS_OPTERON /GS- %(AdditionalOptions) ++ _WIN64;_M_X64;%(PreprocessorDefinitions) ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ $(PythonExe) ++ ++ ++ +\ No newline at end of file \ No newline at end of file --- python/makefile.mk.old 2010-09-24 22:17:16.046875000 +0200 +++ python/makefile.mk 2010-09-24 22:43:53.453125000 +0200 @@ -49,7 +49,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ - Python-ssl.patch + Python-$(PYVERSION)-vs2010.patch \ + Python-ssl.patch \ CONFIGURE_DIR= @@ -124,9 +125,13 @@ # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native +.IF "$(CCNUMVER)" >= "001600000000" +BUILD_ACTION=MSBuild.exe pcbuild2010.sln /t:Build /p:Configuration=Release /ToolsVersion:4.0 +.ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" .ENDIF .ENDIF +.ENDIF PYVERSIONFILE=$(MISC)$/pyversion.mk --- reportdesign/source/ui/report/ReportControllerObserver.cxx.old 2010-09-23 22:59:47.500000000 +0200 +++ reportdesign/source/ui/report/ReportControllerObserver.cxx 2010-09-23 23:01:24.515625000 +0200 @@ -254,7 +254,11 @@ try { uno::Reference xChild(_xSection.get()); +#if defined(_MSC_VER) && (_MSC_VER == 1600) + m_pImpl->m_aSections.erase(::_STL::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(), +#else m_pImpl->m_aSections.erase(::std::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(), +#endif xChild), m_pImpl->m_aSections.end()); uno::Reference< uno::XInterface > xInt(_xSection); RemoveElement(xInt); --- reportdesign/source/core/sdr/UndoEnv.cxx.old 2010-09-23 22:45:22.296875000 +0200 +++ reportdesign/source/core/sdr/UndoEnv.cxx 2010-09-23 22:46:31.578125000 +0200 @@ -481,7 +481,11 @@ try { uno::Reference xChild(_xSection.get()); +#if defined(_MSC_VER) && (_MSC_VER == 1600) + m_pImpl->m_aSections.erase(::_STL::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(), +#else m_pImpl->m_aSections.erase(::std::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(), +#endif xChild), m_pImpl->m_aSections.end()); Reference< XInterface > xInt(_xSection); RemoveElement(xInt); --- sc/source/ui/unoobj/chart2uno.cxx.old 2010-09-23 00:52:28.531250000 +0200 +++ sc/source/ui/unoobj/chart2uno.cxx 2010-09-23 01:04:49.000000000 +0200 @@ -185,7 +185,11 @@ } void clear() { +#if defined (_MSC_VER) && (_MSC_VER == 1600) + ::std::for_each(maTokens.begin(), maTokens.end(), DeleteInstance()); +#else for_each(maTokens.begin(), maTokens.end(), DeleteInstance()); +#endif } void push_back( FormulaToken* pToken ) @@ -993,7 +997,11 @@ const sal_Unicode cRangeSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); FormulaGrammar::Grammar eGrammar = pDoc->GetGrammar(); Tokens2RangeString func(pDoc, eGrammar, cRangeSep); +#if defined (_MSC_VER) && (_MSC_VER == 1600) + func = ::std::for_each(rTokens.begin(), rTokens.end(), func); +#else func = for_each(rTokens.begin(), rTokens.end(), func); +#endif func.getString(rStr); } @@ -1853,7 +1861,11 @@ { list aTableNumList; InsertTabNumber func; +#if defined (_MSC_VER) && (_MSC_VER == 1600) + func = ::std::for_each(aAllTokens.begin(), aAllTokens.end(), func); +#else func = for_each(aAllTokens.begin(), aAllTokens.end(), func); +#endif func.getList(aTableNumList); aResult.push_back( beans::PropertyValue( ::rtl::OUString::createFromAscii("TableNumberList"), -1, @@ -2067,7 +2079,12 @@ throw lang::IllegalArgumentException(); Tokens2RangeStringXML converter(m_pDocument); +#if defined (_MSC_VER) && (_MSC_VER == 1600) + converter = ::std::for_each(aRefTokens.begin(), aRefTokens.end(), converter); +#else converter = for_each(aRefTokens.begin(), aRefTokens.end(), converter); +#endif + converter.getString(aRet); return aRet; @@ -3215,7 +3232,11 @@ // Determine the total size of all ranges. AccumulateRangeSize func; +#if defined (_MSC_VER) && (_MSC_VER == 1600) + func = ::std::for_each(m_pTokens->begin(), m_pTokens->end(), func); +#else func = for_each(m_pTokens->begin(), m_pTokens->end(), func); +#endif SCCOL nCols = func.getCols(); SCROW nRows = func.getRows(); @@ -3245,7 +3266,11 @@ // Generate label strings based on the info so far. sal_Int32 nCount = bColumn ? nCols : nRows; GenerateLabelStrings genLabels(nCount, eOrigin, bColumn); - genLabels = for_each(m_pTokens->begin(), m_pTokens->end(), genLabels); +#if defined (_MSC_VER) && (_MSC_VER == 1600) + genLabels = ::std::for_each(m_pTokens->begin(), m_pTokens->end(), genLabels); +#else + genLabels = for_each(m_pTokens->begin(), m_pTokens->end(), genLabels); +#endif Sequence aSeq = genLabels.getLabels(); return aSeq; --- scp2/source/ooo/ure.scp 2010-10-06 13:00:05.890625000 +0200 +++ ../../../old/ooo-build/build/ooo-build-3.2.98.1/scp2/source/ooo/ure.scp 2010-09-01 18:26:08.000000000 +0200 @@ -877,7 +877,7 @@ Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) ) +#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) ) #if defined _STLP_DEBUG Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else--- set_soenv.in.old 2010-09-20 18:11:22.687500000 +0200 +++ set_soenv.in 2010-09-21 01:48:38.875000000 +0200 @@ -685,6 +685,10 @@ $CVER = "M1400"; } elsif ( "@COMEX@" eq "12" ) { $CVER = "M1500"; + } elsif ( "@COMEX@" eq "13" ) { + $CVER = "M1600"; + $ATL_LIB = $COMPATH.$ds."atlmfc".$ds."lib"; + $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include"; } else { # Unsupported die "Unsupported value for COMEX variable.\n"; } --- slideshow/source/inc/listenercontainer.hxx.old 2010-09-21 23:56:27.937500000 +0200 +++ slideshow/source/inc/listenercontainer.hxx 2010-09-21 23:52:11.171875000 +0200 @@ -180,7 +180,11 @@ const typename container_type::iterator aEnd( maListeners.end() ); typename container_type::iterator aIter; +#if defined(_MSC_VER) && (_MSC_VER == 1600) + if( (aIter=_STL::remove(maListeners.begin(), +#else if( (aIter=std::remove(maListeners.begin(), +#endif aEnd, rListener)) == aEnd ) { --- slideshow/source/engine/slide/userpaintoverlay.cxx.old 2010-09-21 23:58:24.765625000 +0200 +++ slideshow/source/engine/slide/userpaintoverlay.cxx 2010-09-21 23:59:47.375000000 +0200 @@ -110,7 +110,11 @@ virtual void viewRemoved( const UnoViewSharedPtr& rView ) { - maViews.erase( ::std::remove( maViews.begin(), +#if defined(_MSC_VER) && (_MSC_VER == 1600) + maViews.erase( ::_STL::remove( maViews.begin(), +#else + maViews.erase( ::std::remove( maViews.begin(), +#endif maViews.end(), rView ) ); } --- svx/source/accessibility/AccessibleControlShape.cxx.old 2010-09-22 00:21:35.750000000 +0200 +++ svx/source/accessibility/AccessibleControlShape.cxx 2010-09-22 00:04:28.046875000 +0200 @@ -472,6 +472,8 @@ { #if defined(_MSC_VER) && (_MSC_VER > 1310) && (_MSC_VER < 1500) pEnd = remove( pBegin, pEnd, aThisRoundType ); +#elif defined(_MSC_VER) && (_MSC_VER == 1600) + pEnd = _STL::remove( pBegin, pEnd, aThisRoundType ); #else pEnd = ::std::remove( pBegin, pEnd, aThisRoundType ); #endif --- sw/source/filter/ww8/ww8par3.cxx.old 2010-09-23 01:08:45.046875000 +0200 +++ sw/source/filter/ww8/ww8par3.cxx 2010-09-23 01:10:22.250000000 +0200 @@ -791,7 +791,11 @@ aOfsNumsXCH[nLevelB] = 0; } } +#if defined (_MSC_VER) && (_MSC_VER == 1600) + myIter aIter = _STL::remove(aOfsNumsXCH.begin(), aOfsNumsXCH.end(), 0); +#else myIter aIter = std::remove(aOfsNumsXCH.begin(), aOfsNumsXCH.end(), 0); +#endif myIter aEnd = aOfsNumsXCH.end(); // --> OD 2006-01-16 #i60633# - suppress access on if ( aIter != aEnd ) --- unotools/source/config/configvaluecontainer.cxx.old 2010-09-21 00:38:34.593750000 +0200 +++ unotools/source/config/configvaluecontainer.cxx 2010-09-21 00:38:44.750000000 +0200 @@ -387,7 +387,7 @@ void OConfigurationValueContainer::read( ) { - for_each( + std::for_each( m_pImpl->aAccessors.begin(), m_pImpl->aAccessors.end(), UpdateFromConfig( m_pImpl->aConfigRoot, m_pImpl->rMutex ) @@ -400,7 +400,7 @@ void OConfigurationValueContainer::write( sal_Bool _bCommit ) { // collect the current values in the exchange locations - for_each( + std::for_each( m_pImpl->aAccessors.begin(), m_pImpl->aAccessors.end(), UpdateToConfig( m_pImpl->aConfigRoot, m_pImpl->rMutex ) --- xmloff/source/text/txtparae.cxx.old 2010-09-21 01:03:14.171875000 +0200 +++ xmloff/source/text/txtparae.cxx 2010-09-21 01:04:17.796875000 +0200 @@ -162,7 +162,11 @@ }; struct FrameRefHash +#if defined (_MSC_VER) && (_MSC_VER == 1600) + : public std::unary_function, size_t> +#else : public unary_function, size_t> +#endif { size_t operator()(const Reference xFrame) const { return sal::static_int_cast(reinterpret_cast(xFrame.get())); } --- xmloff/source/style/xmlimppr.cxx.old 2010-09-21 00:58:39.343750000 +0200 +++ xmloff/source/style/xmlimppr.cxx 2010-09-21 01:00:59.296875000 +0200 @@ -592,7 +592,11 @@ typedef vector PropertyPairs; struct PropertyPairLessFunctor : - public binary_function +#if defined (_MSC_VER) && (_MSC_VER == 1600) + public std::binary_function +#else + public binary_function +#endif { bool operator()( const PropertyPair& a, const PropertyPair& b ) const { --- /dev/null 2010-09-21 01:29:40.000000000 +0200 +++ libxmlsec/xmlsec1-vs2010.patch 2010-09-21 01:26:56.937500000 +0200 @@ -0,0 +1,11 @@ +--- misc/build/xmlsec1-1.2.14/win32/Makefile.msvc.old 2010-09-21 01:24:54.515625000 +0200 ++++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2010-09-21 01:25:47.312500000 +0200 +@@ -351,7 +351,7 @@ + !if "$(DEBUG)" == "1" + LDFLAGS = $(LDFLAGS) /DEBUG + !else +-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++LDFLAGS = $(LDFLAGS) + !endif + + SOLIBS = $(LIBS) libxml2.lib