Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate both x86 and x64 Windows installers. #16580

Merged
merged 6 commits into from May 26, 2019

Conversation

@pchote
Copy link
Member

commented May 22, 2019

Investigating #16534 in more detail made me realize that our legacy workaround of building in x86 for Windows and then running the same binary as 64 bit with Mono is no longer viable.

This PR takes our toolchain another step closer to normality by changing our default platform to Any CPU (which defaults to 64 bit), with a custom configuration that produces a 32bit-preferred assembly for Windows. It then takes the next logical step of producing both 32 and 64 bit Windows installers, which avoids the hassle of trying to dynamically resolve/install our native deps.

Fixes #16534.
Fixes debugging not working in vs:mac.
Fixes #12587.
Supersedes #14675.

Test installers available at https://github.com/pchote/OpenRA/releases/tag/pkgtest-20190522

@teinarss
Copy link
Contributor

left a comment

Tested both windows installers and the solution in VS19.

@MustaphaTR
Copy link
Member

left a comment

Both test installers and manual building both with VS and make.cmd works fine.

@pchote pchote dismissed stale reviews from MustaphaTR and teinarss via 99d63be May 26, 2019

@pchote pchote force-pushed the pchote:csproj-anycpu branch from 99d63be to ae2dd66 May 26, 2019

@matjaeck
Copy link
Contributor

left a comment

I was able to build and run the game via MD, and the example RA AppImage works. Building and running from the command line works, too.

@abcdefg30 abcdefg30 merged commit 1c6c550 into OpenRA:bleed May 26, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Copy link
Member

commented May 26, 2019

@pchote pchote deleted the pchote:csproj-anycpu branch Aug 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.