Merge branch 'remove-setup0.h'
Drop wx/setup0.h files hack and just use wx/setup.h. See https://github.com/wxWidgets/wxWidgets/pull/2205
This commit is contained in:
@@ -18,11 +18,8 @@
|
||||
**************************************************
|
||||
|
||||
If you get an error saying "wxUSE_FOO must be defined", it means that you
|
||||
are not using the correct up-to-date version of setup.h. This happens most
|
||||
often when using git or snapshots and a new symbol was added to setup0.h
|
||||
and you haven't updated your local setup.h to reflect it. If this is the
|
||||
case, you need to propagate the changes from setup0.h to your setup.h and,
|
||||
if using makefiles under MSW, also remove setup.h under the build directory
|
||||
are not using the correct up-to-date version of setup.h. If you're building
|
||||
using makefiles under MSW, also remove setup.h under the build directory
|
||||
(lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is
|
||||
copied there.
|
||||
|
||||
|
@@ -1613,4 +1613,3 @@
|
||||
/* --- end common options --- */
|
||||
|
||||
#endif // _WX_SETUP_H_
|
||||
|
@@ -1829,4 +1829,3 @@
|
||||
/* --- end MSW options --- */
|
||||
|
||||
#endif // _WX_SETUP_H_
|
||||
|
@@ -2,7 +2,7 @@
|
||||
// Name: wx/msw/setup_inc.h
|
||||
// Purpose: MSW-specific setup.h options
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2007-07-21 (extracted from wx/msw/setup0.h)
|
||||
// Created: 2007-07-21 (extracted from wx/msw/setup.h)
|
||||
// Copyright: (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@@ -1760,4 +1760,3 @@
|
||||
/* --- end wxUniv options --- */
|
||||
|
||||
#endif // _WX_SETUP_H_
|
||||
|
@@ -2,7 +2,7 @@
|
||||
// Name: wx/univ/setup_inc.h
|
||||
// Purpose: wxUniversal-specific setup.h options (this file is not used
|
||||
// directly, it is injected by build/update-setup-h in the
|
||||
// generated include/wx/univ/setup0.h)
|
||||
// generated include/wx/univ/setup.h)
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2008-02-03
|
||||
// Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
|
Reference in New Issue
Block a user