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

Move include directory #337

Merged
merged 10 commits into from
Dec 2, 2022
Merged

Conversation

emma-miler
Copy link
Member

@emma-miler emma-miler commented Nov 18, 2022

As requested on discord, this these commits were taken from the Splash PR and moved into a new one.

The main reason for the move is so that NorthstarLauncher also has access to rapidjson as it's needed for parsing JSON defining custom splash screen.

This commit moves the `include` directory from the NorthstarDLL project folder to the solution folder. This allows both the DLL and Launcher project to target it properly.
@emma-miler emma-miler mentioned this pull request Nov 18, 2022
@emma-miler
Copy link
Member Author

How to test: try to compile the solution with this PR. If it succeeds, it means its working

NorthstarLauncher/NorthstarLauncher.vcxproj.filters Outdated Show resolved Hide resolved
NorthstarDLL/NorthstarDLL.vcxproj Outdated Show resolved Hide resolved
@emma-miler emma-miler requested a review from pg9182 November 20, 2022 20:45
Copy link
Member

@pg9182 pg9182 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untested, but changes look good now. I'm approving this, however, I'd like someone else on Windows to test and review this before it's merged.

@GeckoEidechse GeckoEidechse added the needs testing Changes from the PR still need to be tested label Nov 27, 2022
Copy link
Member

@GeckoEidechse GeckoEidechse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worked fine in testing.

Tested:

  • Booting up dedi
  • Launching client
  • Joining own dedi
  • Joining other random servers

@GeckoEidechse
Copy link
Member

I assume I can merge this now, @pg9182?

@GeckoEidechse GeckoEidechse removed the needs testing Changes from the PR still need to be tested label Nov 27, 2022
@pg9182
Copy link
Member

pg9182 commented Nov 29, 2022

Looks okay to me, but I haven't run it.

@BobTheBob9
Copy link
Member

looks fine to me, will build and run in a bit to make sure

@GeckoEidechse
Copy link
Member

(2 people reviewed code but never put it down as review so I didn't notice :c)

@GeckoEidechse GeckoEidechse merged commit 2d59006 into R2Northstar:main Dec 2, 2022
@emma-miler emma-miler deleted the move-include branch December 11, 2022 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants