AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 03:25:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unused CC_ALIGN_HINT from Core.h

Browse Source
This commit is contained in:
UnknownShadow200 2019-07-25 19:32:40 +10:00
parent 4b192c351a
commit df83310b59
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core.h
View File

@ -21,7 +21,6 @@ typedef signed __int64 int64_t;
#define CC_INLINE inline #define CC_INLINE inline
#define CC_NOINLINE __declspec(noinline) #define CC_NOINLINE __declspec(noinline)
#define CC_ALIGN_HINT(x) __declspec(align(x))
#ifndef CC_API #ifndef CC_API
#define CC_API __declspec(dllexport, noinline) #define CC_API __declspec(dllexport, noinline)
#define CC_VAR __declspec(dllexport) #define CC_VAR __declspec(dllexport)
@ -30,7 +29,6 @@ typedef signed __int64 int64_t;
#include <stdint.h> #include <stdint.h>
#define CC_INLINE inline #define CC_INLINE inline
#define CC_NOINLINE __attribute__((noinline)) #define CC_NOINLINE __attribute__((noinline))
#define CC_ALIGN_HINT(x) __attribute__((aligned(x)))
#ifndef CC_API #ifndef CC_API
#ifdef _WIN32 #ifdef _WIN32
#define CC_API __attribute__((dllexport, noinline)) #define CC_API __attribute__((dllexport, noinline))
@ -45,7 +43,6 @@ typedef signed __int64 int64_t;
#include <stdint.h> #include <stdint.h>
#define CC_INLINE inline #define CC_INLINE inline
#define CC_NOINLINE #define CC_NOINLINE
#define CC_ALIGN_HINT(x)
#define CC_API #define CC_API
#define CC_VAR #define CC_VAR
#else #else

11
src/Program.c
View File

@ -186,9 +186,8 @@ static void android_main(void) {
} }
static void JNICALL java_runGameAsync(JNIEnv* env, jobject instance) { static void JNICALL java_runGameAsync(JNIEnv* env, jobject instance) {
App_Instance = instance; App_Instance = (*env)->NewGlobalRef(env, instance);
(*env)->NewGlobalRef(env, instance); /* TODO: Do we actually need to remove that global ref later? */
/* TODO: Do we actually need to remove that global ref? */
Platform_LogConst("Running game async!"); Platform_LogConst("Running game async!");
Thread_Start(android_main, true); Thread_Start(android_main, true);
} }
@ -198,11 +197,13 @@ static const JNINativeMethod methods[1] = {
}; };
CC_API jint JNI_OnLoad(JavaVM* vm, void* reserved) { CC_API jint JNI_OnLoad(JavaVM* vm, void* reserved) {
jclass klass;
JNIEnv* env; JNIEnv* env;
VM_Ptr = vm; VM_Ptr = vm;
JavaGetCurrentEnv(env); JavaGetCurrentEnv(env);
App_Class = (*env)->FindClass(env, "com/classicube/MainActivity");
klass = (*env)->FindClass(env, "com/classicube/MainActivity");
App_Class = (*env)->NewGlobalRef(env, klass);
JavaRegisterNatives(env, methods); JavaRegisterNatives(env, methods);
return JNI_VERSION_1_4; return JNI_VERSION_1_4;
} }

10
src/Window.c
View File

@ -2964,13 +2964,13 @@ static const JNINativeMethod methods[19] = {
{ "processKeyUp", "(I)V", java_processKeyUp }, { "processKeyUp", "(I)V", java_processKeyUp },
{ "processKeyChar", "(I)V", java_processKeyChar }, { "processKeyChar", "(I)V", java_processKeyChar },
{ "processMouseDown", "(I)V", java_processMouseDown }, { "processMouseDown", "(II)V", java_processMouseDown },
{ "processMouseUp", "(I)V", java_processMouseUp }, { "processMouseUp", "(II)V", java_processMouseUp },
{ "processMouseMove", "(I)V", java_processMouseMove }, { "processMouseMove", "(II)V", java_processMouseMove },
{ "processSurfaceCreated", "(JLandroid/view/Surface;)V", java_processSurfaceCreated }, { "processSurfaceCreated", "(Landroid/view/Surface;)V", java_processSurfaceCreated },
{ "processSurfaceDestroyed", "()V", java_processSurfaceDestroyed }, { "processSurfaceDestroyed", "()V", java_processSurfaceDestroyed },
{ "processSurfaceResized", "(JLandroid/view/Surface;)V", java_processSurfaceResized }, { "processSurfaceResized", "(Landroid/view/Surface;)V", java_processSurfaceResized },
{ "processSurfaceRedrawNeeded", "()V", java_processSurfaceRedrawNeeded }, { "processSurfaceRedrawNeeded", "()V", java_processSurfaceRedrawNeeded },
{ "processOnStart", "()V", java_onStart }, { "processOnStart", "()V", java_onStart },