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

CMake: Add libsamplerate + maintanance #1746

Merged
merged 5 commits into from Apr 17, 2019

Conversation

@Ghabry
Copy link
Member

commented Apr 14, 2019

cherry-picking stuff out of the libretro branch

@Ghabry Ghabry force-pushed the Ghabry:samplerate-cmake branch from 2949343 to 7e8d750 Apr 14, 2019

@carstene1ns carstene1ns added this to the 0.6.1 milestone Apr 14, 2019

CMakeLists.txt Outdated Show resolved Hide resolved
@Ghabry

This comment has been minimized.

Copy link
Member Author

commented Apr 15, 2019

Short story about the

if(${PLAYER_AUDIO_BACKEND} STREQUAL "Auto")
	set(PLAYER_AUDIO_BACKEND_IS_AUTO ON)
endif()

In theory "${PLAYER_AUDIO_BACKEND} STREQUAL \"Auto\"" could be passed to CMAKE_DEPENDENT_OPTION because argument 4 is simply inserted into a if-block but due to strange if-variable expansion in CMake this doesn't work. (also would result in more code duplication because of the if-check below)

Also no idea how to use these dependencies when they are strings/properties and not bools, at least the macro doesn't support this :/.

You can play around in ccmake or cmake-gui to test the dependencies (e.g. set the audio backend to OFF and see all variables magically disseapearing)

@Ghabry

This comment has been minimized.

Copy link
Member Author

commented Apr 16, 2019

7e8d750 is also bogus, another failed rebase conflict resolution, waiting for there slow buildbots...

Ghabry added some commits Apr 14, 2019

@Ghabry Ghabry force-pushed the Ghabry:samplerate-cmake branch from baf10c4 to 4cb5979 Apr 16, 2019

@Ghabry

This comment has been minimized.

Copy link
Member Author

commented Apr 16, 2019

this is correct now

@carstene1ns
Copy link
Member

left a comment

LGTM

@carstene1ns carstene1ns merged commit 9560374 into EasyRPG:master Apr 17, 2019

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.