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

Partial compilation fixes for osx #4329

Merged
merged 2 commits into from Mar 24, 2018

Conversation

Projects
None yet
3 participants
@scribam
Copy link
Contributor

scribam commented Mar 24, 2018

  • LOG_UNIMPLEMENTED does not exist, replaced by LOG_ERROR
  • Add X11 as a required package for UNIX system in cmake and include necessary files for compilation

With these changes, it is possible to build RPCS3 without LLVM support on OSX.

@@ -57,6 +57,6 @@ void gl::set_swapinterval(int interval)
//No existing drawable or missing swap extension, EGL?
LOG_ERROR(RSX, "Failed to set swap interval");
#else
LOG_UNIMPLEMENTED(RSX, "Swap control not implemented for this platform. Vsync options not available.");
LOG_ERROR(RSX, "Swap control not implemented for this platform. Vsync options not available.");

This comment has been minimized.

Copy link
@kd-11

kd-11 Mar 24, 2018

Contributor

Thanks, I was just prototyping and the code got left in there since neither windows nor linux hit this assert.

@AniLeo AniLeo merged commit 50446f7 into RPCS3:master Mar 24, 2018

2 checks passed

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

@scribam scribam deleted the scribam:osx-compilation branch Mar 24, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 1, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 2, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 2, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 3, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 10, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 13, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 13, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 13, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 13, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 13, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 14, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 14, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 14, 2018

scribam added a commit to scribam/rpcs3 that referenced this pull request May 17, 2018

Nekotekina added a commit that referenced this pull request May 17, 2018

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.