diff options
| author | Ian MacArthur <imacarthur@gmail.com> | 2018-06-18 22:49:04 +0000 |
|---|---|---|
| committer | Ian MacArthur <imacarthur@gmail.com> | 2018-06-18 22:49:04 +0000 |
| commit | 9e212ec6f9e30c85d0d59d8265d83e55a23346f8 (patch) | |
| tree | bbacc4a6583d8643dd47b4442c702baad78b562c | |
| parent | 5e45b7d4fe3b56916f0fc5aceddefa572e988588 (diff) | |
Recent (circa early 2018) versions of the Mingw32 headers have changed the file header layout, breaking the build of fltk-1.4 for some users.
These changes should give a working build once more - more complete rework is still needed to fully address the issues raised.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12946 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e5124c086..dd1a1ef36 100644 --- a/configure.ac +++ b/configure.ac @@ -868,7 +868,7 @@ case $host_os_gui in CXXFLAGS="-mwindows $CXXFLAGS" LDFLAGS="-mwindows $LDFLAGS" DSOFLAGS="-mwindows $DSOFLAGS" - LIBS="$LIBS -lole32 -luuid -lcomctl32" + LIBS="$LIBS -lole32 -luuid -lcomctl32 -lws2_32" BUILD="WIN" if test "x$with_optim" = x; then dnl Avoid -Os optimization on Cygwin/MinGW diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 74028e61f..4e489c7ab 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -43,6 +43,8 @@ #include <windows.h> #include <ole2.h> #include <shellapi.h> +// Some versions of MinGW now require us to explicitly include winerror to get S_OK defined +#include <winerror.h> #include <math.h> // for ceil() void fl_free_fonts(void); |