[Mobies-commit] [commit] r3992 - in UDM/trunk/Projects/Win32/VC10/src: . UdmPython
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Tue Jan 24 11:39:19 CST 2012
Author: ksmyth
Date: Tue Jan 24 11:39:19 2012
New Revision: 3992
Log:
x64 support
Modified:
UDM/trunk/Projects/Win32/VC10/src/Python27.props
UDM/trunk/Projects/Win32/VC10/src/Udm.sln
UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
UDM/trunk/Projects/Win32/VC10/src/boost.props
Modified: UDM/trunk/Projects/Win32/VC10/src/Python27.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Python27.props Thu Jan 19 11:44:09 2012 (r3991)
+++ UDM/trunk/Projects/Win32/VC10/src/Python27.props Tue Jan 24 11:39:19 2012 (r3992)
@@ -10,7 +10,7 @@
<AdditionalIncludeDirectories>$(UDM_3RDPARTY_PATH)\Python-2.7.2\PC;$(UDM_3RDPARTY_PATH)\Python-2.7.2\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\Python-2.7.2\PCbuild;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\Python-2.7.2\PCbuild\$(PlatformShortName);$(UDM_3RDPARTY_PATH)\Python-2.7.2\PCbuild;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln Thu Jan 19 11:44:09 2012 (r3991)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln Tue Jan 24 11:39:19 2012 (r3992)
@@ -383,7 +383,7 @@
{55409968-F077-4A87-87D5-F28DB28181C2}.Debug|x64.ActiveCfg = Debug|x64
{55409968-F077-4A87-87D5-F28DB28181C2}.Release|Win32.ActiveCfg = Release|Win32
{55409968-F077-4A87-87D5-F28DB28181C2}.Release|Win32.Build.0 = Release|Win32
- {55409968-F077-4A87-87D5-F28DB28181C2}.Release|x64.ActiveCfg = Release|x64
+ {55409968-F077-4A87-87D5-F28DB28181C2}.Release|x64.ActiveCfg = Release27|x64
{D63CBBDB-4F2C-4840-A915-291DD4C2A0F4}.BootUdmCompile Debug|Win32.ActiveCfg = Debug|Win32
{D63CBBDB-4F2C-4840-A915-291DD4C2A0F4}.BootUdmCompile Debug|Win32.Build.0 = Debug|Win32
{D63CBBDB-4F2C-4840-A915-291DD4C2A0F4}.BootUdmCompile Debug|x64.ActiveCfg = Debug|Win32
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj Thu Jan 19 11:44:09 2012 (r3991)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj Tue Jan 24 11:39:19 2012 (r3992)
@@ -106,9 +106,9 @@
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.pyd</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.pyd</TargetExt>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm_x64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release27|Win32'">udm</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release27|x64'">udm</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release27|x64'">udm_x64</TargetName>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.pyd</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.pyd</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release27|Win32'">.pyd</TargetExt>
@@ -136,7 +136,7 @@
<TargetMachine>MachineX86</TargetMachine>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
<ImportLibrary>$(IntDir)$(TargetName)python.lib</ImportLibrary>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -154,7 +154,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
<ImportLibrary>$(TargetName)python.lib</ImportLibrary>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -178,7 +178,7 @@
<TargetMachine>MachineX86</TargetMachine>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
<ImportLibrary>$(IntDir)$(TargetName)python.lib</ImportLibrary>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -201,7 +201,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
<ImportLibrary>$(TargetName)python.lib</ImportLibrary>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\$(Configuration)\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>
@@ -224,7 +224,7 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<TargetMachine>MachineX86</TargetMachine>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\Release\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\Release\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName)python.lib</ImportLibrary>
</Link>
<PostBuildEvent />
@@ -247,8 +247,9 @@
<BaseAddress>0x13000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_pyd$(PYTHON_VERSION).pdb</ProgramDatabaseFile>
- <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\Release\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\$(Platform)\VC10\Release\));%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImportLibrary>$(TargetName)python.lib</ImportLibrary>
+ <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>
Modified: UDM/trunk/Projects/Win32/VC10/src/boost.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/boost.props Thu Jan 19 11:44:09 2012 (r3991)
+++ UDM/trunk/Projects/Win32/VC10/src/boost.props Tue Jan 24 11:39:19 2012 (r3992)
@@ -8,7 +8,7 @@
<AdditionalIncludeDirectories>$(UDM_3RDPARTY_PATH)\boost_1_44_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\boost_1_44_0\$(Platform)\lib;$(UDM_3RDPARTY_PATH)\boost_1_44_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
More information about the Mobies-commit
mailing list