From d996e889a996375ad34c4821860cd007687daf71 Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Wed, 16 Aug 2017 09:42:06 +0100 Subject: [PATCH] Using audacity-fixes WxWidgets Current recommendation is to use the pre-patched audacity-fixes repository. Step 2 description updated as it concerns downloading only. --- win/compile.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/win/compile.txt b/win/compile.txt index b4cac5c2f..a079d0cf8 100644 --- a/win/compile.txt +++ b/win/compile.txt @@ -35,18 +35,19 @@ Cygwin" section below. This is not maintained (for a very long time!). ------------------------------------------------------------------------ -MSVC++ STEP 1: Download and Install wxWidgets +MSVC++ STEP 1: Download wxWidgets ------------------------------------------------------------------------ To simplify the implementation of a near-identical user interface across platforms, Audacity uses wxWidgets, a GUI framework. -Audacity 2.1.3 requires wxWidgets 3.0.2. - -To be able to build Audacity for Windows, download and install -wxWidgets from http://www.wxwidgets.org/. +Audacity 2.1.3 requires a patched version of wxWidgets 3.0.2. +Download the patched wxWidgets from the 'audacity-fixes' +branch of https://github.com/audacity/wxWidgets +Alternatively the unpatched sourcecode may be downloaded from +http://www.wxwidgets.org/ and patched as described below. ------------------------------------------------------------------------ MSVC++ STEP 2: Download source code for Audacity @@ -59,18 +60,19 @@ at https://github.com/audacity/audacity/ (see GitHub for help). ------------------------------------------------------------------------ MSVC++ STEP 3: Build wxWidgets ------------------------------------------------------------------------ +These steps assume the wxWidgets source code was extracted to +the root of C:\ and renamed "C:\wxWidgets-3.0.2\". 3.1. Open "C:\wxWidgets-3.0.2\build\msw\wx_dll.dsw" with Microsoft Visual Studio. - Make sure to use wx_dll.dsw, not wx.dsw, because wx.dsw - does not have the correct dependencies for the DLL builds. When you open wx_dll.dsw, Visual Studio will prompt whether to convert. Click "Yes To All". Next time you open a Visual Studio session, you can avoid this prompt by opening "C\wxWidgets-3.0.2\build\msw\wx_dll.sln" instead of wx_dll.dsw. -3.2. We have patched wxWidgets with four patches. You should apply all +3.2. If using the unpatched wcWidgets: + We have patched wxWidgets with four patches. You should apply all four. You can do this in one step by copying the folder "audacity\win\wxWidgets_additions\wxWidgets-3.0.2\" over your: