|
From: <pst...@us...> - 2011-08-06 15:10:30
|
Revision: 895
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=895&view=rev
Author: pstieber
Date: 2011-08-06 15:10:24 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Updated 32-bit builds to wxWidgets 2.9.2 and Unicode.
Modified Paths:
--------------
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 15:07:29 UTC (rev 894)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2011-08-06 15:10:24 UTC (rev 895)
@@ -25,6 +25,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -50,7 +51,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\mswd";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswud";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -65,7 +66,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -81,11 +82,11 @@
/>
<Tool
Name="VCLinkerTool"
- 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="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"
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
@@ -221,6 +222,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -247,7 +249,7 @@
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib\msw";"$(EXT_PKGS)\wxMSW-2.8.11-VC9\include";..\src;..\src\mswin"
+ AdditionalIncludeDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib\mswu";"$(EXT_PKGS)\wxMSW-2.9.2-VC9\include";..\src;..\src\mswin"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX"
StringPooling="true"
RuntimeLibrary="2"
@@ -263,7 +265,7 @@
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings="4351"
+ DisableSpecificWarnings="4351;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -279,11 +281,11 @@
/>
<Tool
Name="VCLinkerTool"
- 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="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"
OutputFile=".\$(OutDir)\JazzPlusPlus.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.8.11-VC9\lib\vc_lib""
+ AdditionalLibraryDirectories=""$(EXT_PKGS)\wxMSW-2.9.2-VC9\lib\vc_lib""
IgnoreDefaultLibraryNames=""
ProgramDatabaseFile=".\$(OutDir)\JazzPlusPlus.pdb"
SubSystem="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|