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

Cross Platform Support #58

Merged
merged 9 commits into from
Oct 26, 2017
Merged

Cross Platform Support #58

merged 9 commits into from
Oct 26, 2017

Conversation

joealam
Copy link
Contributor

@joealam joealam commented Oct 22, 2017

Cross platform support (see issue #52)

Key changes:

  • Changed #includes to use forward-slashes which work cross-platform
  • Moved platform dependant console code into its own file, with different implementations per-platform

Depends on CMake, which is also included as a separate pull request (#57) for easier reviewing/merging.

@tagniam
Copy link
Owner

tagniam commented Oct 24, 2017

Hey @joealam this is really great stuff. I've been wanting to do this for quite some time now.

It'll take me a bit of time to go over everything as I'm currently writing midterms. In the meantime take a look at the sound effects implementation in #48 and how that would tie in to cross-platform support.

@joealam
Copy link
Contributor Author

joealam commented Oct 24, 2017

I'll take a look and add cross platform sound support.

Conflicts:
	Turn/Turn.vcxproj
	Turn/Turn.vcxproj.filters
Fixed several include paths to use forward slashes instead of
backslashes.
Wrapped Windows-specific PlaySound code (cross platform implementation
still todo)

Conflicts:
	Turn/src/Player.cpp
	Turn/src/Store.cpp
Added dependency on WinMM for PlaySound

Conflicts:
	Turn/Turn.vcxproj
	Turn/Turn.vcxproj.filters
@joealam
Copy link
Contributor Author

joealam commented Oct 24, 2017

Updated to latest and fixed up so it's ready to merge with no conflicts.

@joealam
Copy link
Contributor Author

joealam commented Oct 24, 2017

Also, added compile fixes for Sound so it compiles and runs on both platforms, but currently doesn't actually do anything on Linux (I'll be starting that shortly)

@joealam joealam mentioned this pull request Oct 24, 2017
@joealam
Copy link
Contributor Author

joealam commented Oct 24, 2017

Implemented the sound support in #60.

@tagniam tagniam merged commit 2243863 into tagniam:master Oct 26, 2017
@tagniam
Copy link
Owner

tagniam commented Oct 26, 2017

Thanks for making a such a substantial contribution @joealam. It'll take me a bit longer to review #60 since my school's linux lab computers don't have SDL installed.

@tagniam tagniam mentioned this pull request Oct 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants