From 8e024344b55ce2c9c6315cb7dcf9a20d3f7151a7 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Fri, 15 Jan 2021 11:16:27 +0700 Subject: [PATCH] Try to fix weirdly "duplicate symbol" --- .../src/main/jni/input_bridge_v3.c | 2 +- app_pojavlauncher/src/main/jni/utils.h | 23 ++++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_pojavlauncher/src/main/jni/input_bridge_v3.c index 646d004aa..aa6b4f8bb 100644 --- a/app_pojavlauncher/src/main/jni/input_bridge_v3.c +++ b/app_pojavlauncher/src/main/jni/input_bridge_v3.c @@ -36,7 +36,7 @@ typedef void GLFW_invoke_MouseButton_func(void* window, int button, int action, typedef void GLFW_invoke_Scroll_func(void* window, double xoffset, double yoffset); typedef void GLFW_invoke_WindowSize_func(void* window, int width, int height); -int grabCursorX, grabCursorY, lastCursorX, lastCursorY; +static int grabCursorX, grabCursorY, lastCursorX, lastCursorY; jclass inputBridgeClass_ANDROID, inputBridgeClass_JRE; jmethodID inputBridgeMethod_ANDROID, inputBridgeMethod_JRE; diff --git a/app_pojavlauncher/src/main/jni/utils.h b/app_pojavlauncher/src/main/jni/utils.h index d93933a2d..c562f7986 100644 --- a/app_pojavlauncher/src/main/jni/utils.h +++ b/app_pojavlauncher/src/main/jni/utils.h @@ -1,21 +1,20 @@ -#ifndef _BINARY_UTILS_H_ -#define _BINARY_UTILS_H_ +#pragma once #include -JavaVM* runtimeJavaVMPtr; -JNIEnv* runtimeJNIEnvPtr_ANDROID; -JNIEnv* runtimeJNIEnvPtr_JRE; +static JavaVM* runtimeJavaVMPtr; +static JNIEnv* runtimeJNIEnvPtr_ANDROID; +static JNIEnv* runtimeJNIEnvPtr_JRE; -JavaVM* dalvikJavaVMPtr; -JNIEnv* dalvikJNIEnvPtr_ANDROID; -JNIEnv* dalvikJNIEnvPtr_JRE; +static JavaVM* dalvikJavaVMPtr; +static JNIEnv* dalvikJNIEnvPtr_ANDROID; +static JNIEnv* dalvikJNIEnvPtr_JRE; -long showingWindow; +static long showingWindow; -bool isInputReady, isCursorEntered, isPrepareGrabPos, isUseStackQueueCall; +static bool isInputReady, isCursorEntered, isPrepareGrabPos, isUseStackQueueCall; -int savedWidth, savedHeight; +staric int savedWidth, savedHeight; jboolean attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr); char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray); @@ -24,5 +23,3 @@ void free_char_array(JNIEnv *env, jobjectArray jstringArray, const char **charAr void closeGLFWWindow(); -#endif // _BINARY_UTILS_H_ -