mirror of https://github.com/bjornbytes/lovr.git
Apply suggestions from code review
This commit is contained in:
parent
85b6e36020
commit
49489dc0e8
|
@ -741,13 +741,13 @@ elseif(EMSCRIPTEN)
|
||||||
elseif(ANDROID)
|
elseif(ANDROID)
|
||||||
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/etc/AndroidManifest.xml" CACHE STRING "The AndroidManifest.xml file to use")
|
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/etc/AndroidManifest.xml" CACHE STRING "The AndroidManifest.xml file to use")
|
||||||
file(READ ${ANDROID_MANIFEST} ANDROID_MANIFEST_CONTENT)
|
file(READ ${ANDROID_MANIFEST} ANDROID_MANIFEST_CONTENT)
|
||||||
string(REGEX MATCH "package=\"([^\"]*)" ANDROID_PACKAGE ${ANDROID_MANIFEST_CONTENT})
|
string(REGEX MATCH "package=\"([^\"]*)" _ ${ANDROID_MANIFEST_CONTENT})
|
||||||
string(SUBSTRING ${ANDROID_PACKAGE} 9 -1 ANDROID_PACKAGE) #I dunno how to do a lookbehind
|
set(ANDROID_PACKAGE ${CMAKE_MATCH_1})
|
||||||
|
|
||||||
string(REPLACE "." "_" ANDROID_PACKAGE_C ${ANDROID_PACKAGE})
|
string(REPLACE "." "_" ANDROID_PACKAGE_C ${ANDROID_PACKAGE})
|
||||||
string(REPLACE "." "/" ANDROID_PACKAGE_JAVA ${ANDROID_PACKAGE})
|
string(REPLACE "." "/" ANDROID_PACKAGE_JAVA ${ANDROID_PACKAGE})
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/etc/Activity.java ${CMAKE_CURRENT_BINARY_DIR}/Activity.java)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/etc/Activity.java ${CMAKE_CURRENT_BINARY_DIR}/Activity.java)
|
||||||
target_compile_definitions(lovr PRIVATE "LOVR_PKG=${ANDROID_PACKAGE_C}")
|
target_compile_definitions(lovr PRIVATE "LOVR_JAVA_PACKAGE=${ANDROID_PACKAGE_C}")
|
||||||
|
|
||||||
target_sources(lovr PRIVATE src/core/os_android.c)
|
target_sources(lovr PRIVATE src/core/os_android.c)
|
||||||
target_link_libraries(lovr log android dl)
|
target_link_libraries(lovr log android dl)
|
||||||
|
|
|
@ -241,11 +241,10 @@ void os_sleep(double seconds) {
|
||||||
while (nanosleep(&t, &t));
|
while (nanosleep(&t, &t));
|
||||||
}
|
}
|
||||||
|
|
||||||
//This two-level macro do it's job
|
#define _JNI(PKG, X) Java_ ## PKG ## _ ## X
|
||||||
#define _JNI(PKG, X) Java_ ## PKG ##_##X
|
#define JNI(PKG, X) _JNI(PKG, X)
|
||||||
#define JNI(PKG, X) _JNI(PKG,X)
|
|
||||||
|
|
||||||
JNIEXPORT void JNICALL JNI(LOVR_PKG, Activity_lovrPermissionEvent)(JNIEnv* jni, jobject activity, jint permission, jboolean granted) {
|
JNIEXPORT void JNICALL JNI(LOVR_JAVA_PACKAGE, Activity_lovrPermissionEvent)(JNIEnv* jni, jobject activity, jint permission, jboolean granted) {
|
||||||
if (state.onPermissionEvent) {
|
if (state.onPermissionEvent) {
|
||||||
state.onPermissionEvent(permission, granted);
|
state.onPermissionEvent(permission, granted);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue