Menu
▾
▴
SF.net SVN: jazzplusplus:[1040] trunk/jazz/vc12
|
From: <pst...@us...> - 2013-11-17 16:21:31
|
Revision: 1040
http://sourceforge.net/p/jazzplusplus/code/1040
Author: pstieber
Date: 2013-11-17 16:21:29 +0000 (Sun, 17 Nov 2013)
Log Message:
-----------
1. Updated to used wxWidgets 3.0.0.
2. Added a custom build step to generate help. The VS 2013 version of tex2rtf is
crashing.
Modified Paths:
--------------
trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj
trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj.filters
Modified: trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj
===================================================================
--- trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj 2013-10-25 23:46:45 UTC (rev 1039)
+++ trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj 2013-11-17 16:21:29 UTC (rev 1040)
@@ -94,7 +94,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\lib\vc_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_lib\mswud;$(EXT_PKGS)\wxWidgets-3.0.0-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,10 +118,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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>
+ <AdditionalDependencies>wxmsw30ud_xrc.lib;wxbase30ud_xml.lib;wxexpatd.lib;wxmsw30ud_core.lib;wxmsw30ud_adv.lib;wxmsw30ud_html.lib;wxbase30ud.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.5-VC12\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -144,7 +144,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\lib\vc_x64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_x64_lib\mswud;$(EXT_PKGS)\wxWidgets-3.0.0-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -168,10 +168,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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>
+ <AdditionalDependencies>wxmsw30ud_xrc.lib;wxbase30ud_xml.lib;wxexpatd.lib;wxmsw30ud_core.lib;wxmsw30ud_adv.lib;wxmsw30ud_html.lib;wxbase30ud.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.5-VC12\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
@@ -195,7 +195,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\lib\vc_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_lib\mswu;$(EXT_PKGS)\wxWidgets-3.0.0-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -220,10 +220,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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>
+ <AdditionalDependencies>wxmsw30u_xrc.lib;wxbase30u_xml.lib;wxexpat.lib;wxmsw30u_core.lib;wxmsw30u_adv.lib;wxmsw30u_html.lib;wxbase30u.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.5-VC12\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -246,7 +246,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\lib\vc_x64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_x64_lib\mswu;$(EXT_PKGS)\wxWidgets-3.0.0-VC12\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -272,10 +272,10 @@
<AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.5-VC12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <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>
+ <AdditionalDependencies>wxmsw30u_xrc.lib;wxbase30u_xml.lib;wxexpat.lib;wxmsw30u_core.lib;wxmsw30u_adv.lib;wxmsw30u_html.lib;wxbase30u.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.5-VC12\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(EXT_PKGS)\wxWidgets-3.0.0-VC12\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -509,6 +509,45 @@
<ClInclude Include="..\src\Dialogs\VelocityDialog.h" />
</ItemGroup>
<ItemGroup>
+ <CustomBuild Include="..\src\HelpFiles\jazz.tex">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC12|Win32'">false</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug VC12|Win32'">echo cd "$(ProjectDir)..\src\HelpFiles"
+cd "$(ProjectDir)..\src\HelpFiles"
+echo $(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+$(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release VC12|Win32'">echo cd "$(ProjectDir)..\src\HelpFiles"
+cd "$(ProjectDir)..\src\HelpFiles"
+echo $(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+$(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug VC12|x64'">echo cd "$(ProjectDir)..\src\HelpFiles"
+cd "$(ProjectDir)..\src\HelpFiles"
+echo $(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+$(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release VC12|x64'">echo cd "$(ProjectDir)..\src\HelpFiles"
+cd "$(ProjectDir)..\src\HelpFiles"
+echo $(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+$(EXT_PKGS)\wxWidgets-3.0.0-VC12\bin\tex2rtf jazz.tex jazz.html -html -twice
+</Command>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug VC12|Win32'">Building Jazz++ help</Message>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug VC12|Win32'">$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release VC12|Win32'">Building Jazz++ help</Message>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release VC12|Win32'">$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug VC12|x64'">Building Jazz++ help</Message>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug VC12|x64'">$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release VC12|x64'">Building Jazz++ help</Message>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release VC12|x64'">$(InputDir)$(InputName).hhc;$(InputDir)$(InputName).hhp;$(InputDir)$(InputName).hhk;$(InputDir)$(InputName).ref;$(InputDir)$(InputName).con;$(InputDir)$(InputName).htx;%(Outputs)</Outputs>
+ <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug VC12|Win32'">false</LinkObjects>
+ <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release VC12|Win32'">false</LinkObjects>
+ <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug VC12|x64'">false</LinkObjects>
+ <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release VC12|x64'">false</LinkObjects>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC12|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC12|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC12|x64'">false</ExcludedFromBuild>
+ </CustomBuild>
<None Include="..\src\HelpFiles\tex2rtf.ini" />
<None Include="..\src\Makefile.am" />
</ItemGroup>
Modified: trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj.filters
===================================================================
--- trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj.filters 2013-10-25 23:46:45 UTC (rev 1039)
+++ trunk/jazz/vc12/JazzPlusPlus-VC12.vcxproj.filters 2013-11-17 16:21:29 UTC (rev 1040)
@@ -334,4 +334,9 @@
<UniqueIdentifier>{7e14185d-521d-47ac-b425-dda76e9a5000}</UniqueIdentifier>
</Filter>
</ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\src\HelpFiles\jazz.tex">
+ <Filter>Help Files</Filter>
+ </CustomBuild>
+ </ItemGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
