|
From: <pst...@us...> - 2011-08-06 16:23:46
|
Revision: 896
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=896&view=rev
Author: pstieber
Date: 2011-08-06 16:23:40 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated the 64-bit build configurations.
Modified Paths:
--------------
trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2011-08-06 15:10:24 UTC (rev 895)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2011-08-06 16:23:40 UTC (rev 896)
@@ -37,10 +37,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -74,6 +76,8 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">JazzPlusPlus</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">JazzPlusPlus</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">JazzPlusPlus</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">
<Midl>
@@ -137,7 +141,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +157,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,10 +165,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wxmsw28d_xrc.lib;wxbase28d_xml.lib;wxexpatd.lib;wxmsw28d_core.lib;wxmsw28d_adv.lib;wxmsw28d_html.lib;wxbase28d.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wxmsw29ud_xrc.lib;wxbase29ud_xml.lib;wxexpatd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;wxmsw29ud_html.lib;wxbase29ud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -239,7 +243,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -257,7 +261,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>StdCall</CallingConvention>
<CompileAs>Default</CompileAs>
- <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -265,10 +269,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wxmsw28_xrc.lib;wxbase28_xml.lib;wxexpat.lib;wxmsw28_core.lib;wxmsw28_adv.lib;wxmsw28_html.lib;wxbase28.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wxmsw29u_xrc.lib;wxbase29u_xml.lib;wxexpat.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxmsw29u_html.lib;wxbase29u.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|