TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-19 01:27:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix weirdly "duplicate symbol"

Browse Source
This commit is contained in:
Duy Tran Khanh 2021-01-15 11:16:27 +07:00
parent 1fd46a3e94
commit 8e024344b5
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/jni/input_bridge_v3.c
View File

@ -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;

23
app_pojavlauncher/src/main/jni/utils.h
View File

@ -1,21 +1,20 @@
#ifndef _BINARY_UTILS_H_
#define _BINARY_UTILS_H_
#pragma once
#include <stdbool.h>
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_