|
From: <pst...@us...> - 2011-08-05 23:15:19
|
Revision: 892
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=892&view=rev
Author: pstieber
Date: 2011-08-05 23:15:13 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Updated to wxWidgets 2.9.2.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
web/htdocs/download/index.php
web/htdocs/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/buildingwx/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -21,51 +21,39 @@
wxWidgets lets developers create applications for Win32, Mac OS X, GTK+, X11,
Motif, WinCE, and more using one codebase. This page describes how the Jazz++
version of wxWidgets was compiled for Windows, Linux, and the Mac. The Windows
-build was generated using Visual Studio. Either Visual Studio .NET 2005 or
-Visual Studio .NET 2008 can be used on Windows. The Linux install was tested
-using Fedora 9 using GCC 4.3.0, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
+build was generated using Visual Studio. Either Visual Studio .NET 2008 or
+Visual Studio .NET 2010 can be used on Windows. The Linux install was tested
+using Fedora 14 using GCC 4.5.1, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
(i386 & amd64) using gcc-4.1.2. The Mac build was tested using Mac OS X 10.5.2
and GCC 4.0.1.
</P>
<H3>Building wxWidgets for Windows</H3>
<P>
-I have used these instructions with Visual Studio .NET 2005 (VC8) and Visual
-Studio .NET 2008 (VC9). I used VC9 in the following text, but simply
-substitute the appropriate VC8 veriage to create a Visual Studio .NET 2005
+I have used these instructions with Visual Studio .NET 2008 (VC9) and Visual
+Studio .NET 2010 (VC10). I used VC10 in the following text, but simply
+substitute the appropriate VC9 verbiage to create a Visual Studio .NET 2008
build. I have both builds living side-by-side on my hard drive.
</P>
<OL>
<LI>
Download
-<A NAME="wxMSW-2.8.11.zip-Download"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.11.zip">
-<TT>wxMSW-2.8.11.zip</TT></A> from the wxWidgets web site.
+<A NAME="wxWidgets-2.9.2.zip-Download"
+HREF="http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.9.2.zip">
+<TT>wxWidgets-2.9.2.zip</TT></A> from the wxWidgets web site.
</LI>
<LI>
Extract the zip file to <TT>C:\ExternalPackages</TT>. Extracting creates a
-<TT>wxMSW-2.8.11</TT> directory directly under <TT>C:\ExternalPackages</TT>.
+<TT>wxWidgets-2.9.2</TT> directory directly under <TT>C:\ExternalPackages</TT>.
</LI>
<LI>
Change the name of the top-level wxWidgets directory to
-<TT>wxMSW-2.8.11-VC9</TT> so other versions of wxWidgets can be built with
+<TT>wxMSW-2.9.2-VC10</TT> so other versions of wxWidgets can be built with
other compilers in parallel with this directory.
</LI>
<LI>
-If you would like wxWidgets help files in compiled HTML format (*.chm),
-download <TT>wxWidgets-2.8.11-CHM.zip</TT> from the wxWidgets web site, and
-extract the zip file to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9</TT>. This
-installs the compiled HTML help files for wxWidgets and tex2rtf.
-</LI>
-<LI>
-If you would like wxWidgets help files in HTML format, download
-<TT>wxWidgets-2.8.11-HTML.zip</TT> from the wxWidgets web site, and extract the
-zip file to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9</TT>. This installs the
-HTML help files for wxWidgets and tex2rtf.
-</LI>
-<LI>
Make the following changes to
-<TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\include\wx\msw\setup.h</TT>:
+<TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\include\wx\msw\setup.h</TT>:
<P>
@@ -80,66 +68,31 @@
</TR>
<TR>
-<TD ALIGN="LEFT"><TT>WXWIN_COMPATIBILITY_2_6</TT></TD>
-<TD ALIGN="CENTER">1</TD>
-<TD ALIGN="CENTER">0</TD>
-</TR>
-
-<TR>
<TD ALIGN="LEFT"><TT>wxUSE_STL</TT></TD>
<TD ALIGN="CENTER">0</TD>
<TD ALIGN="CENTER">1</TD>
</TR>
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_STD_IOSTREAM</TT></TD>
-<TD ALIGN="CENTER">0</TD>
-<TD ALIGN="CENTER">1</TD>
-</TR>
-
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_GLCANVAS</TT></TD>
-<TD ALIGN="CENTER">0</TD>
-<TD ALIGN="CENTER">1</TD>
-</TR>
-
-<TR>
-<TD ALIGN="LEFT"><TT>wxUSE_IOSTREAMH</TT></TD>
-<TD ALIGN="CENTER">1</TD>
-<TD ALIGN="CENTER">0</TD>
-</TR>
-
</TABLE>
</DIV>
</P>
-<BR>
-Jazz++ doesn't use OpenGL code at this point, but I use this wxWidgets build
-for other projects.
</LI>
<LI>
-Edit <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\include\wx\msw\wx.rc</TT> and
-comment out the following line.
-
-<PRE>
-#include "wx/msw/wince/wince.rc"
-</PRE>
+Use <TT>Start | All Programs | Microsoft Visual Studio 2010 |
+Visual Studio Tools | Visual Studio Command Prompt (2010)</TT> to
+start a console session to compile a 32-bit version of the library.
</LI>
<LI>
-Use <TT>Start | All Programs | Microsoft Visual Studio .NET 2008 |
-Visual Studio .NET Tools | Visual Studio .NET 2008 Command Prompt</TT> to
-start a console session.
-</LI>
-<LI>
Ensure that the command-line compiler and tools (including nmake)
are installed and ready to run.
</LI>
<LI>
-Change directory to <TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\build\msw</TT>.
+Change directory to <TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
</LI>
<LI>
-Build the debug static version of the wxWidgets libraries by typing:
+Build the 32-bit, debug, static version of the wxWidgets libraries by typing:
<PRE>
nmake BUILD=debug SHARED=0 USE_OPENGL=1 -f makefile.vc
@@ -147,40 +100,17 @@
</LI>
<LI>
-Build the release static version of the wxWidgets libraries by typing:
+Build the 32-bit, release static version of the wxWidgets libraries by typing:
<PRE>
nmake BUILD=release SHARED=0 USE_OPENGL=1 -f makefile.vc
</PRE>
</LI>
-<LI>To conserve disk space, remove the build directories (<TT>vc_msw</TT> and
-<TT>vc_mswd</TT>) under <TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\build\msw</TT>.
+<LI>To conserve disk space, remove the build directories (<TT>vc_mswu</TT> and
+<TT>vc_mswud</TT>) under
+<TT>c:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
</LI>
-<LI>
-Change directory to
-<TT>C:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src</TT>.
-</LI>
-<LI>
-Build the release static version of tex2rtf by typing:
-
-<PRE>
-nmake BUILD=release SHARED=0 -f makefile.vc
-</PRE>
-</LI>
-<LI>
-Create a directory for the tex2rtf binaries under the wxWidgets
-distribution (<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\bin</TT>).
-</LI>
-<LI>
-Move the tex2rtf binaries from
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src\vc_msw</TT> to
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\bin</TT>.
-</LI>
-<LI>
-To conserve disk space, remove the build directory (vc_msw) under
-<TT>c:\ExternalPackages\wxMSW-2.8.11-VC9\utils\tex2rtf\src</TT>.
-</LI>
</OL>
<h3>Building wxWidgets for Linux</h3>
@@ -194,8 +124,8 @@
trick.
<PRE>
-export PATH=/usr/local/wx-2.8.11/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.8.11/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.9.2/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
@@ -217,16 +147,16 @@
</PRE>
</LI>
-<LI> Checkout the 2.8 branch of wxWidgets using the following command.
+<LI> Checkout the trunk of wxWidgets using the following command.
You must have a Subversion client loaded on your machine.
<PRE>
-svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH wxWidgets-2.8
+svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets
</PRE>
</LI>
<LI> Create two directories called <TT>WxBuildRelease</TT> and
-<TT>WxBuildDebug</TT> in parallel with the <TT>wxWidgets-2.8</TT> directory
+<TT>WxBuildDebug</TT> in parallel with the <TT>wxWidgets</TT> directory
and change directory to the <TT>WxBuildDebug</TT> directory.
<PRE>
@@ -239,17 +169,16 @@
configure options.
<PRE>
-../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets/configure \
+ --prefix=/usr/local/wx-2.9.2d \
+ --with-gtk \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --disable-visibility \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
--enable-stl \
- --with-gtk \
--enable-debug \
--enable-debug_gdb
</PRE>
@@ -281,17 +210,16 @@
<PRE>
cd ../WxBuildRelease
-../wxWidgets-2.8/configure \
- --prefix=/usr/local/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets/configure \
+ --prefix=/usr/local/wx-2.9.2 \
+ --with-gtk \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --disable-visibility \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
- --enable-stl \
- --with-gtk
+ --enable-stl
make 2>&1 | tee BuildLog
su
make install
@@ -300,10 +228,7 @@
</LI>
<LI>
-Install the release version of the wxWidgets build last to ensure this version
-is the default configuration. If you installed the debug version last, simply
-re-install the release version. You can run the following command to
-determine the default configuration.
+You can run the following command to determine the default configuration.
<PRE>
wx-config --list
@@ -326,18 +251,18 @@
<LI>
Download
-<A NAME="wxMac-2.8.11.tar.gz"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxMac-2.8.11.tar.gz">
-<TT>wxMac-2.8.11.tar.gz</TT></A> from the wxWidgets web site and extract this
+<A NAME="wxWidgets-2.9.2.tar.bz2"
+HREF="http://sourceforge.net/projects/wxwindows/files/wxWidgets-2.9.2.tar.bz2">
+<TT>wxWidgets-2.9.2.tar.bz2</TT></A> from the wxWidgets web site and extract this
file under your <TT>OutsideSource</TT> directory.
</LI>
-<LI> Create a directory called <TT>WxBuild-2.8.11</TT> in parallel with the
-<TT>wxMac-2.8.11</TT> directory and change directory to that location.
+<LI> Create a directory called <TT>WxBuild-2.9.2</TT> in parallel with the
+<TT>wxWidgets-2.9.2</TT> directory and change directory to that location.
<PRE>
-mkdir WxBuild-2.8.11
-cd WxBuild-2.8.11
+mkdir WxBuild-2.9.2
+cd WxBuild-2.9.2
</PRE>
</LI>
@@ -345,13 +270,11 @@
configure options.
<PRE>
-../wxMac-2.8.11/configure \
- --prefix=$HOME/wx-2.8.11 \
- --disable-no_exceptions \
- --disable-no_rtti \
+../wxWidgets-2.9.2/configure \
+ --prefix=$HOME/wx-2.9.2 \
+ --enable-exceptions \
--disable-compat26 \
- --disable-unicode \
- --with-regex=builtin \
+ --with-regex \
--enable-std_iostreams \
--enable-std_string \
--enable-stl \
@@ -387,8 +310,8 @@
<TT>.bash_profile</TT> will do the trick.
<PRE>
-export PATH=/usr/local/wx-2.8.11/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.8.11/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.9.2/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
Modified: web/htdocs/download/index.php
===================================================================
--- web/htdocs/download/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/download/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -38,7 +38,7 @@
<P>
If you still want to just give the currently available 'minimal functionality'
source tarball a try, you will first need to compile and install a non-stock
-build of wxWidgets 2.8.10 to build Jazz++ itself, and the tex2rtf utility which
+build of wxWidgets 2.9.2 to build Jazz++ itself, and the tex2rtf utility which
Jazz++ depends on. View the <a href="/buildingwx/">Building wxWidgets</a> page
and <a href="/buildingtex2rtf/">Building Tex2rtf</a> for details.
</P>
Modified: web/htdocs/index.php
===================================================================
--- web/htdocs/index.php 2011-08-05 20:49:14 UTC (rev 891)
+++ web/htdocs/index.php 2011-08-05 23:15:13 UTC (rev 892)
@@ -35,7 +35,7 @@
only stable MIDI sequencer that runs under both Windows and Linux, we have gone
ahead and forked the source code that was available at http://www.jazzware.com/
(the old Jazzware site) and are in the process of porting it to wxWidgets
-2.8.10. In the process, we'll also be fixing numerous other problems that exist
+2.9.2. In the process, we'll also be fixing numerous other problems that exist
in the code and hopefully find a way to get it to run for Mac OS X as well.
</p>
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|