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

BUILD: CMake fixes #10236

Merged
merged 5 commits into from
May 3, 2021
Merged

BUILD: CMake fixes #10236

merged 5 commits into from
May 3, 2021

Conversation

p01arst0rm
Copy link
Contributor

Collection of CMake fixes that can be bundled together.
Unifying code style, moved openal into its own
directory structure. Added missing license file for
stblib headers.

@p01arst0rm
Copy link
Contributor Author

cc @hcorion

3rdparty/discord-rpc/CMakeLists.txt Outdated Show resolved Hide resolved
3rdparty/stblib/LICENSE Outdated Show resolved Hide resolved
@hcorion
Copy link
Member

hcorion commented May 3, 2021

Sorry, looks like I didn't explain as well as I should have 😅
The folder should still be called discord-rpc, just in the CMakeLists.txt is should be add_library(DiscordRPC INTERFACE).
Which is similar to how upstream discord-rpc is setup.

@p01arst0rm
Copy link
Contributor Author

fixed now :)

@Megamouse Megamouse added the Build and CI Anything related to the build process and continuous integration label May 3, 2021
@Megamouse Megamouse merged commit 35ee550 into RPCS3:master May 3, 2021
@p01arst0rm p01arst0rm deleted the cmake-fixes branch May 4, 2021 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build and CI Anything related to the build process and continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants