wxWidgets 3.1.0 update

Charles J. Cliffe 2016-03-29 19:15:55 -04:00
parent 526186512a
commit 421e9cf2a3

@ -8,16 +8,11 @@ During installation make sure you select the 'C++' compiler under 'Programming L
# Build wxWidgets # Build wxWidgets
Download wxWidgets 3.0.2 from https://www.wxwidgets.org/downloads/ and unzip it to somewhere such as C:\MSVCDev\wxWidgets-3.0.2\ Download https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.zip and unzip it to somewhere such as C:\MSVCDev\wxWidgets-3.1.0\
Edit C:\MSVCDev\wxWidgets-3.0.2\src\tiff\libtiff\tif_config.h and comment out line 367: Navigate to C:\MSVCDev\wxWidgets-3.1.0\build\msw\ (or wherever you extracted) and open wx_vc14.sln.
```
367: // #define snprintf _snprintf
```
Navigate to C:\MSVCDev\wxWidgets-3.0.2\build\msw\ (or wherever you extracted) and open wx_vc12.sln, Click "OK" to update the project on load. Choose "Release" and "x64" for the build configuration and "Build Solution". All *should* compile successfully and you can close the project.
Choose "Release" and "x64" for the build configuration and "Build Solution". All should compile successfully and you can close the project.
# Install CMake: # Install CMake:
@ -67,7 +62,7 @@ Update your system environment variables (Search "enviornment variables" in wind
* Choose C:\MSVCDev\CubicSDR_win64 for build folder. * Choose C:\MSVCDev\CubicSDR_win64 for build folder.
* Click Configure. * Click Configure.
* Choose "Visual Studio 14 2015 Win64" and Finish. * Choose "Visual Studio 14 2015 Win64" and Finish.
* Set wxWidgets_ROOT_DIR to "C:\MSVCDev\wxWidgets-3.0.2". * Set wxWidgets_ROOT_DIR to "C:\MSVCDev\wxWidgets-3.1.0".
* Configure again, all should be good, then Generate. * Configure again, all should be good, then Generate.
* Navigate to C:\MSVCDev\CubicSDR_win64\ in explorer and open CubicSDR.sln. * Navigate to C:\MSVCDev\CubicSDR_win64\ in explorer and open CubicSDR.sln.
- Once open select "Release" and "x64" build configuration and then "Build Solution" (F6) - Once open select "Release" and "x64" build configuration and then "Build Solution" (F6)