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

Use CMake build-system #1611

Merged
merged 9 commits into from May 15, 2019

Conversation

Projects
None yet
5 participants
@RadWolfie
Copy link
Member

commented May 13, 2019

With this pull request, MSVC generated project files no longer necessary and can be manually update within CMakeLists.txt file.

Plus I include Visual Studio's cmake generator helper script to run once than execute individual commands. Which is 3 commands altogether.

resolve #1566

@RadWolfie RadWolfie changed the title Cmake Use CMake instead of MSVC May 13, 2019

RadWolfie added some commits May 13, 2019

disable supress regeneration
Best to keep top-level inspect if there is new changes to CMakeLists file and its children.

@LukeUsher LukeUsher changed the title Use CMake instead of MSVC Use CMake build-systeminstead of MSVC May 13, 2019

@LukeUsher LukeUsher changed the title Use CMake build-systeminstead of MSVC Use CMake build-system May 13, 2019

@LukeUsher

This comment has been minimized.

Copy link
Member

commented May 13, 2019

@RadWolfie can you please update the readme with new build instructions? Currently it states you must open Cxbx.sln, which is no longer true.

@LukeUsher

This comment has been minimized.

Copy link
Member

commented May 13, 2019

How about defaulting gen-wins-project to x86? There's no point in the other compile targets right now, since without fully emulating the X86 CPU, it won't work on any other architecture, that way, it could work just by double clicking the script, no need to open up a CLI?

Other than that it seems great, works fine here.

@RadWolfie

This comment has been minimized.

Copy link
Member Author

commented May 13, 2019

Build instruction is complete in README.md file. Plus updated the helper script to use default x86 and Visual Studio 2017.

Show resolved Hide resolved README.md Outdated
Show resolved Hide resolved README.md
Show resolved Hide resolved README.md
Show resolved Hide resolved README.md
Show resolved Hide resolved README.md
@PatrickvL

This comment has been minimized.

Copy link
Member

commented May 15, 2019

LGTM, I'll let Luke have the honours of merging this

@LukeUsher LukeUsher merged commit 6a29876 into develop May 15, 2019

2 checks passed

continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@LukeUsher

This comment has been minimized.

Copy link
Member

commented May 15, 2019

Now begins the fun of porting my other branches (+ the massive Chihiro branch) to cmake :P

@RadWolfie RadWolfie deleted the cmake branch May 15, 2019

RadWolfie added a commit that referenced this pull request May 15, 2019

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