Page MenuHomeWildfire Games
Differential D2076

Make wxWidgets 3.0 build requirement more explicit
ClosedPublic
Actions

Authored by historic_bruno on Jul 14 2019, 4:07 PM.

Details

Reviewers
asterix
Commits
rP22508: Makes wxWidgets 3.0 dependency explicit in the game build.
Trac Tickets
#5502
#2891
Summary

From @elexis comment on #5502, I learned that we implicitly dropped support for wxWidgets 2.8. This patch will make that more explicit by failing the build with a clear error message (see: what we do for SDL2).

Also updates README.txt for building wxWidgets on win32. Trac BuildInstructions have mostly been updated.

Test Plan
  1. Apply this diff.
  2. Build/install wxWidgets 3.0+ for your platform.
  3. Try to build AtlasUI against it.
  4. Build succeeds.
  1. Build/install wxWidgets 2.8 for your platform.
  2. Try to build AtlasUI against it.
  3. Build fails with informative message:
Error	88	error C1189: #error :  You are using an old wxWidgets release. At least wxWidgets >= 3.0.0 is required.	e:\devel\ps\trunk\source\tools\atlas\atlasui\misc\precompiled.h	121

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

historic_bruno created this revision.Jul 14 2019, 4:07 PM
historic_bruno edited the test plan for this revision. (Show Details)
historic_bruno updated this revision to Diff 8898.Jul 14 2019, 4:30 PM

Reverts accidental comment from testing

asterix accepted this revision.Jul 15 2019, 9:43 PM
asterix added a subscriber: asterix.

It shows, what it should show while looking at the code I see no problems. Tested on Windows 10 64 bit.

This revision is now accepted and ready to land.Jul 15 2019, 9:43 PM
vladislavbelov added subscribers: Itms, vladislavbelov.Jul 16 2019, 2:00 AM

What's about Ubuntu 14.04? We still have such audience (judging by feedback statistics).

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp has some code related to 2.8, I think it should be removed too.

source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp has some notes about 2.9, should be fixed or removed.

libraries/win32/wxwidgets/README.txt
0–1

I suppose we need to update that too @Itms.

1

Since the message will be for a while I prefer NOTE: wxWidgets 3.x or higher is required.

historic_bruno updated this revision to Diff 8922.Jul 16 2019, 2:03 AM

Remove some wxWidgets 2.x checks.

historic_bruno added a comment.Jul 16 2019, 2:49 AM
In D2076#86770, @vladislavbelov wrote:

What's about Ubuntu 14.04? We still have such audience (judging by feedback statistics).

Trusty (14.04 LTS) reached EOL this tear (#5290), but note that libboost (1.54), libgloox (1.0.9), libsodium (1.0.8) packages provided for Trusty are already too old (noted on BuildInstructions). Users can install https://launchpad.net/~wfg/+archive/ubuntu/0ad and if necessary, a newer libwxgtk-3.0 package could be built, although I see Trusty has 3.0.0-2 which might work. The other deps would need to be updated for a successful build.

historic_bruno added a comment.Jul 16 2019, 3:49 AM
In D2076#86770, @vladislavbelov wrote:

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp has some code related to 2.8, I think it should be removed too.
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp has some notes about 2.9, should be fixed or removed.

I agree, but I didn't want to introduce any behavior changes into this diff. We have to carefully test such changes, but this diff only affects the build and is comparatively straightforward.

historic_bruno requested review of this revision.Jul 16 2019, 3:53 AM
historic_bruno updated this revision to Diff 8923.
historic_bruno marked 2 inline comments as done.
asterix requested changes to this revision.Jul 16 2019, 8:08 AM

@historic_bruno you should look at https://code.wildfiregames.com/D2030 as well.

libraries/win32/wxwidgets/README.txt
6

It should be wx_vc14 . sln in Visual Studio 2015 , since 2013 should no longer be used.

This revision now requires changes to proceed.Jul 16 2019, 8:08 AM
historic_bruno added inline comments.Jul 16 2019, 7:23 PM
libraries/win32/wxwidgets/README.txt
6

Ok, I wasn't sure what the status of that is. I found this ticket: #5379, so the VS2015 migration is at least in-progress although the ticket is unresolved. I'm happy to make the change if we're committed to that migration before the next release (@Itms).

historic_bruno updated the Trac tickets for this revision.Jul 16 2019, 8:07 PM
historic_bruno updated this revision to Diff 8974.Jul 18 2019, 7:22 AM

Rebased to latest SVN

asterix accepted this revision.Jul 18 2019, 9:48 AM

After the rebase now It can be committed.

This revision is now accepted and ready to land.Jul 18 2019, 9:48 AM
Closed by commit rP22508: Makes wxWidgets 3.0 dependency explicit in the game build. (authored by historic_bruno). · Explain WhyJul 19 2019, 6:52 AM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Jul 19 2019, 6:52 AM

Revision Contents
Changeset List

PathSize
libraries/
win32/
wxwidgets/
README.txt
README.txt (revision 22484)
20 lines
source/
tools/
atlas/
AtlasUI/
CustomControls/
FileHistory/
FileHistory.h
FileHistory.h (revision 22484)
6 lines
MapDialog/
MapDialog.h
MapDialog.h (revision 22484)
6 lines
Misc/
precompiled.h
precompiled.h (revision 22484)
7 lines
ScenarioEditor/
Tools/
TransformObject.cpp
TransformObject.cpp (revision 22484)
12 lines

Diff 8922

View Options

libraries/win32/wxwidgets/README.txt

Loading...
View Options

source/tools/atlas/AtlasUI/CustomControls/FileHistory/FileHistory.h

Loading...
View Options

source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.h

Loading...
View Options

source/tools/atlas/AtlasUI/Misc/precompiled.h

Loading...
View Options

source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp

Loading...
Wildfire Games · Phabricator