From ae7ffe539606b1d535711ea39a9557dd6c7439cd Mon Sep 17 00:00:00 2001 From: bofeng-song Date: Thu, 23 Jun 2022 14:54:48 +0800 Subject: [PATCH] Google-Game-SDK: export api that called from java (#264) --- .../include/game-activity/GameActivity.cpp | 2 +- .../GameController/GameControllerManager.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp index 4e6d63ee..3b53efe4 100644 --- a/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp +++ b/sources/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp @@ -1299,7 +1299,7 @@ extern "C" int GameActivity_register(JNIEnv *env) { // Register this method so that GameActiviy_register does not need to be called // manually. -extern "C" jlong Java_com_google_androidgamesdk_GameActivity_loadNativeCode( +extern "C" JNIEXPORT jlong JNICALL Java_com_google_androidgamesdk_GameActivity_loadNativeCode( JNIEnv *env, jobject javaGameActivity, jstring path, jstring funcName, jstring internalDataDir, jstring obbDir, jstring externalDataDir, jobject jAssetMgr, jbyteArray savedState) { diff --git a/sources/android-gamesdk/GameController/GameControllerManager.cpp b/sources/android-gamesdk/GameController/GameControllerManager.cpp index 6666a29d..ff6b4c6c 100644 --- a/sources/android-gamesdk/GameController/GameControllerManager.cpp +++ b/sources/android-gamesdk/GameController/GameControllerManager.cpp @@ -36,7 +36,7 @@ extern "C" { -void Java_com_google_android_games_paddleboat_GameControllerManager_onControllerConnected( +JNIEXPORT void JNICALL Java_com_google_android_games_paddleboat_GameControllerManager_onControllerConnected( JNIEnv *env, jobject gcmObject, jintArray deviceInfoArray, jfloatArray axisMinArray, jfloatArray axisMaxArray, jfloatArray axisFlatArray, jfloatArray axisFuzzArray) { @@ -97,24 +97,24 @@ void Java_com_google_android_games_paddleboat_GameControllerManager_onController } } -void Java_com_google_android_games_paddleboat_GameControllerManager_onControllerDisconnected( +JNIEXPORT void JNICALL Java_com_google_android_games_paddleboat_GameControllerManager_onControllerDisconnected( JNIEnv *env, jobject gcmObject, jint deviceId) { paddleboat::GameControllerManager::onDisconnection(deviceId); } -void Java_com_google_android_games_paddleboat_GameControllerManager_onMotionData( +JNIEXPORT void JNICALL Java_com_google_android_games_paddleboat_GameControllerManager_onMotionData( JNIEnv *env, jobject gcmObject, jint deviceId, jint motionType, jlong timestamp, jfloat dataX, jfloat dataY, jfloat dataZ) { paddleboat::GameControllerManager::onMotionData( deviceId, motionType, timestamp, dataX, dataY, dataZ); } -void Java_com_google_android_games_paddleboat_GameControllerManager_onMouseConnected( +JNIEXPORT void JNICALL Java_com_google_android_games_paddleboat_GameControllerManager_onMouseConnected( JNIEnv *env, jobject gcmObject, jint deviceId) { paddleboat::GameControllerManager::onMouseConnection(deviceId); } -void Java_com_google_android_games_paddleboat_GameControllerManager_onMouseDisconnected( +JNIEXPORT void JNICALL Java_com_google_android_games_paddleboat_GameControllerManager_onMouseDisconnected( JNIEnv *env, jobject gcmObject, jint deviceId) { paddleboat::GameControllerManager::onMouseDisconnection(deviceId); }