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:
@@ -34,26 +34,6 @@ variable containing the full path to this directory. While this is not
|
||||
actually required, this makes using the library more convenient and
|
||||
this environment variable is used in the examples below.
|
||||
|
||||
Upgrading Existing Git Checkout {#msw_update_setup_h}
|
||||
-------------------------------
|
||||
|
||||
If you checked your sources from version control repository and didn't
|
||||
obtain them from a release file, you may need to update your
|
||||
`include/wx/msw/setup.h` file to add any new options from
|
||||
`include/wx/msw/setup0.h` to it. If you hadn't edited `setup.h` file
|
||||
manually, you can just delete it to force recreating it by copying
|
||||
`setup0.h` to `setup.h` during the next build. If you forget to do it,
|
||||
you may get errors during the build due to new options being
|
||||
undefined.
|
||||
|
||||
If you have no intention of ever modifying `setup.h`, you may avoid this
|
||||
problem entirely by creating a symbolic link to `setup0.h` before
|
||||
building, e.g. using mklink, from an admin command prompt:
|
||||
|
||||
cd %WXWIN%\include\wx\msw\
|
||||
mklink setup.h setup0.h
|
||||
|
||||
|
||||
|
||||
Building wxWidgets {#msw_build}
|
||||
==================
|
||||
|
@@ -41,9 +41,6 @@ toolkit.
|
||||
2. Installing under Win32
|
||||
-------------------------
|
||||
|
||||
If compiling from CVS, please copy include/wx/univ/setup0.h
|
||||
to include/wx/univ/setup.h before following these steps.
|
||||
|
||||
a) Using Visual C++ 6.0/7.x
|
||||
|
||||
Follow wxMSW instructions but make sure to choose one of the "Universal"
|
||||
@@ -76,9 +73,6 @@ change for wxUniversal is that you must add "--enable-universal" switch to
|
||||
the configure command line and for wxX11 even this is unnecessary, i.e. it
|
||||
is enabled by default.
|
||||
|
||||
If compiling from CVS, please copy include/wx/univ/setup0.h
|
||||
to include/wx/univ/setup.h before configuring.
|
||||
|
||||
4. Running wxUniv programs
|
||||
--------------------------
|
||||
|
||||
|
Reference in New Issue
Block a user