diff options
| author | Dan Gudmundsson <[email protected]> | 2017-05-17 15:04:41 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-05-17 15:04:41 +0200 |
| commit | 429c139eb828a7f69db407e924d4639ac86df880 (patch) | |
| tree | a6489de15676e9f3c7798c3db60275c2430234da | |
| parent | dfa81717e0e5b07eaecae536523c820368e900de (diff) | |
| parent | 327036428ff18a4268d4c10506945efe7ca1d66c (diff) | |
| download | otp-429c139eb828a7f69db407e924d4639ac86df880.tar.gz otp-429c139eb828a7f69db407e924d4639ac86df880.tar.bz2 otp-429c139eb828a7f69db407e924d4639ac86df880.zip | |
Merge branch 'dgud/wx/fix-msvc-2015'
* dgud/wx/fix-msvc-2015:
wx: Fix builds on VS-2017
| -rw-r--r-- | HOWTO/INSTALL-WIN32.md | 8 | ||||
| -rw-r--r-- | lib/wx/c_src/egl_impl.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/HOWTO/INSTALL-WIN32.md b/HOWTO/INSTALL-WIN32.md index c74107d749..4304fb3fb8 100644 --- a/HOWTO/INSTALL-WIN32.md +++ b/HOWTO/INSTALL-WIN32.md @@ -612,7 +612,7 @@ tools: We would recommend using 1.0.2d. -* Building with wxWidgets. Download wxWidgets-3.0.2 or higher. +* Building with wxWidgets. Download wxWidgets-3.0.3 or higher. Install or unpack it to the pgm folder: Cygwin: @@ -622,19 +622,19 @@ tools: MSYS2: `DRIVE:/PATH/msys<32/64>/opt/local/pgm` - If the `wxUSE_POSTSCRIPT` isn't enabled in `<path\to\pgm>\wxMSW-3.0.2\include\wx\msw\setup.h`, + If the `wxUSE_POSTSCRIPT` isn't enabled in `<path\to\pgm>\wxMSW-3.0.3\include\wx\msw\setup.h`, enable it. build: From a command prompt with the VC tools available (See the instructions for OpenSSL build above for help on starting the proper command prompt in RELEASE mode): - C:\...\> cd <path\to\pgm>\wxMSW-3.0.2\build\msw + C:\...\> cd <path\to\pgm>\wxMSW-3.0.3\build\msw C:\...\> nmake BUILD=release SHARED=0 DIR_SUFFIX_CPU= -f makefile.vc Or - if building a 64bit version: - C:\...\> cd <path\to\pgm>\wxMSW-3.0.2\build\msw + C:\...\> cd <path\to\pgm>\wxMSW-3.0.3\build\msw C:\...\> nmake TARGET_CPU=amd64 BUILD=release SHARED=0 DIR_SUFFIX_CPU= -f makefile.vc * Get the Erlang source distribution (from <http://www.erlang.org/download.html>). diff --git a/lib/wx/c_src/egl_impl.h b/lib/wx/c_src/egl_impl.h index 719b4926db..7ecd484de5 100644 --- a/lib/wx/c_src/egl_impl.h +++ b/lib/wx/c_src/egl_impl.h @@ -112,7 +112,7 @@ typedef long int int32_t; typedef long long int int64_t; typedef unsigned long long int uint64_t; #elif defined(WIN32) && defined(_MSC_VER) -typedef long int int32_t; +typedef __int32 int32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; #elif defined(WIN32) && defined(__GNUC__) |