Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linking console applications with MinGW in monolithic build

Browse Source 
Do compile wxEntry(void) overload used in wxIMPLEMENT_WXWIN_MAIN_CONSOLE
expansion by non-MSVC compilers under MSW inside the monolithic library
too by replacing the "#if !wxUSE_GUI" check guarding it with "#if
wxUSE_BASE" one.

It's not really clear how could this have ever worked without this fix
before, although it apparently did, but stopped with gcc 7.
This commit is contained in:
Vadim Zeitlin
2017-09-25 19:01:12 +02:00
parent 3063ea6ca9
commit 81304fcafd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/main.cpp
View File

@@ -305,7 +305,13 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
return wxEntry(wxArgs.argc, wxArgs.argv); return wxEntry(wxArgs.argc, wxArgs.argv);
} }
#else // !wxUSE_GUI #endif // wxUSE_GUI
// ----------------------------------------------------------------------------
// global HINSTANCE
// ----------------------------------------------------------------------------
#if wxUSE_BASE
int wxEntry() int wxEntry()
{ {
@@ -314,14 +320,6 @@ int wxEntry()
return wxEntry(wxArgs.argc, wxArgs.argv); return wxEntry(wxArgs.argc, wxArgs.argv);
} }
#endif // wxUSE_GUI/!wxUSE_GUI
// ----------------------------------------------------------------------------
// global HINSTANCE
// ----------------------------------------------------------------------------
#if wxUSE_BASE
HINSTANCE wxhInstance = 0; HINSTANCE wxhInstance = 0;
extern "C" HINSTANCE wxGetInstance() extern "C" HINSTANCE wxGetInstance()