140 lines
4.8 KiB
Diff
140 lines
4.8 KiB
Diff
diff --git a/jni/desmume/src/android/7z/7z.mk b/jni/desmume/src/android/7z/7z.mk
|
|
index e851a9f..dd29f8a 100755
|
|
--- a/jni/desmume/src/android/7z/7z.mk
|
|
+++ b/jni/desmume/src/android/7z/7z.mk
|
|
@@ -46,12 +46,6 @@ LOCAL_SRC_FILES := C/Threads.c \
|
|
CPP/7zip/Archive/7z/7zRegister.cpp \
|
|
CPP/7zip/Archive/7z/7zSpecStream.cpp \
|
|
CPP/7zip/Archive/7z/7zUpdate.cpp \
|
|
- CPP/7zip/Archive/Rar/RarHandler.cpp \
|
|
- CPP/7zip/Archive/Rar/RarHeader.cpp \
|
|
- CPP/7zip/Archive/Rar/RarIn.cpp \
|
|
- CPP/7zip/Archive/Rar/RarItem.cpp \
|
|
- CPP/7zip/Archive/Rar/RarRegister.cpp \
|
|
- CPP/7zip/Archive/Rar/RarVolumeInStream.cpp \
|
|
CPP/7zip/Archive/Zip/ZipAddCommon.cpp \
|
|
CPP/7zip/Archive/Zip/ZipHandler.cpp \
|
|
CPP/7zip/Archive/Zip/ZipHandlerOut.cpp \
|
|
@@ -113,11 +107,6 @@ LOCAL_SRC_FILES := C/Threads.c \
|
|
CPP/7zip/Compress/DeflateEncoder.cpp \
|
|
CPP/7zip/Compress/DeflateRegister.cpp \
|
|
CPP/7zip/Compress/LzmaRegister.cpp \
|
|
- CPP/7zip/Compress/RarCodecsRegister.cpp \
|
|
- CPP/7zip/Compress/Rar1Decoder.cpp \
|
|
- CPP/7zip/Compress/Rar2Decoder.cpp \
|
|
- CPP/7zip/Compress/Rar3Decoder.cpp \
|
|
- CPP/7zip/Compress/Rar3Vm.cpp \
|
|
CPP/7zip/Compress/BZip2Crc.cpp \
|
|
CPP/7zip/Compress/BZip2Decoder.cpp \
|
|
CPP/7zip/Compress/BZip2Encoder.cpp \
|
|
@@ -129,12 +118,10 @@ LOCAL_SRC_FILES := C/Threads.c \
|
|
CPP/7zip/Crypto/MyAes.cpp \
|
|
CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
|
|
CPP/7zip/Crypto/HmacSha1.cpp \
|
|
- CPP/7zip/Crypto/RarAes.cpp \
|
|
- CPP/7zip/Crypto/Rar20Crypto.cpp \
|
|
CPP/7zip/Crypto/WzAes.cpp
|
|
|
|
LOCAL_ARM_MODE := thumb
|
|
LOCAL_ARM_NEON := false
|
|
LOCAL_CFLAGS := -DCOMPRESS_MT
|
|
|
|
-include $(BUILD_STATIC_LIBRARY)
|
|
\ No newline at end of file
|
|
+include $(BUILD_STATIC_LIBRARY)
|
|
diff --git a/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp b/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
|
|
index ee3516b..db51480 100755
|
|
--- a/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
|
|
+++ b/jni/desmume/src/android/7z/CPP/7zip/Archive/ArchiveExports.cpp
|
|
@@ -139,8 +139,6 @@ void RegisterZip();
|
|
void RegisterDeflate();
|
|
void Register7z();
|
|
void RegisterLzma();
|
|
-void RegisterRarCodecs();
|
|
-void RegisterRar();
|
|
void RegisterBZip2();
|
|
void RegisterBZip2Codec();
|
|
|
|
@@ -151,8 +149,6 @@ void Do7ZipRegistration()
|
|
RegisterDeflate();
|
|
Register7z();
|
|
RegisterLzma();
|
|
- RegisterRar();
|
|
- RegisterRarCodecs();
|
|
RegisterBZip2();
|
|
RegisterBZip2Codec();
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
diff --git a/jni/desmume/src/android/main.cpp b/jni/desmume/src/android/main.cpp
|
|
index 603af9f..cb0a66a 100755
|
|
--- a/jni/desmume/src/android/main.cpp
|
|
+++ b/jni/desmume/src/android/main.cpp
|
|
@@ -33,7 +33,7 @@
|
|
#include "../debug.h"
|
|
#include "../NDSSystem.h"
|
|
#include "../path.h"
|
|
-#include "../GPU_OSD.h"
|
|
+#include "../GPU_osd.h"
|
|
#include "../addons.h"
|
|
#include "../slot1.h"
|
|
#include "../saves.h"
|
|
@@ -867,4 +867,4 @@ unsigned int GetPrivateProfileInt(JNIEnv* env, const char* lpAppName, const char
|
|
bool GetPrivateProfileBool(JNIEnv* env, const char* lpAppName, const char* lpKeyName, bool bDefault, const char* lpFileName)
|
|
{
|
|
return GetPrivateProfileInt(env, lpAppName, lpKeyName, bDefault ? 1 : 0, lpFileName);
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
diff --git a/jni/desmume/src/android/math-neon/math_acosf.c b/jni/desmume/src/android/math-neon/math_acosf.c
|
|
index 024074f..3c048cd 100755
|
|
--- a/jni/desmume/src/android/math-neon/math_acosf.c
|
|
+++ b/jni/desmume/src/android/math-neon/math_acosf.c
|
|
@@ -43,7 +43,10 @@ float acosf_neon_hfp(float x)
|
|
asm volatile (
|
|
"vdup.f32 d1, %0 \n\t" //d1 = {pi/2, pi/2};
|
|
"vsub.f32 d0, d1, d0 \n\t" //d0 = d1 - d0;
|
|
- ::"r"(__acosf_pi_2):
|
|
+ :
|
|
+ :
|
|
+ "r"(__acosf_pi_2)
|
|
+ :
|
|
);
|
|
#endif
|
|
}
|
|
diff --git a/jni/desmume/src/android/math-neon/math_vec2.c b/jni/desmume/src/android/math-neon/math_vec2.c
|
|
index 810d562..b648538 100755
|
|
--- a/jni/desmume/src/android/math-neon/math_vec2.c
|
|
+++ b/jni/desmume/src/android/math-neon/math_vec2.c
|
|
@@ -66,9 +66,11 @@ dot2_neon_hfp(float v0[2], float v1[2])
|
|
"vld1.32 {d4}, [%1] \n\t" //d4={x1,y1}
|
|
"vmul.f32 d0, d2, d4 \n\t" //d0 = d2*d4
|
|
"vpadd.f32 d0, d0, d0 \n\t" //d0 = d[0] + d[1]
|
|
- :: "r"(v0), "r"(v1)
|
|
- :
|
|
- );
|
|
+ :
|
|
+ :
|
|
+ "r"(v0), "r"(v1)
|
|
+ :
|
|
+ );
|
|
#endif
|
|
}
|
|
|
|
diff --git a/jni/desmume/src/android/math-neon/math_vec4.c b/jni/desmume/src/android/math-neon/math_vec4.c
|
|
index 1fc0b86..7a5c6dd 100755
|
|
--- a/jni/desmume/src/android/math-neon/math_vec4.c
|
|
+++ b/jni/desmume/src/android/math-neon/math_vec4.c
|
|
@@ -107,7 +107,10 @@ dot4_neon_hfp(float v0[4], float v1[4])
|
|
"vmul.f32 d0, d2, d4 \n\t" //d0= d2*d4
|
|
"vmla.f32 d0, d3, d5 \n\t" //d0 = d0 + d3*d5
|
|
"vpadd.f32 d0, d0 \n\t" //d0 = d[0] + d[1]
|
|
- :: "r"(v0), "r"(v1) :
|
|
+ :
|
|
+ :
|
|
+ "r"(v0), "r"(v1)
|
|
+ :
|
|
);
|
|
#endif
|
|
}
|