fix compile error

dailxx · Aug 28, 2019 · 3ed5251 · 3ed5251
1 parent 0a65602
commit 3ed5251
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 34 deletions.
diff --git a/mars/baseevent/jni/com_tencent_mars_BaseEvent.cc b/mars/baseevent/jni/com_tencent_mars_BaseEvent.cc
@@ -90,36 +90,6 @@ JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onExceptionCrash)(JNIEnv*, jcl
 
 #else
 
-// #define __RENAME_FUNCTION2__(name) 
-#define __RENAME_FUNCTION1__(module, name) Java_com_tencent_mars_##module##_BaseEvent_##name
-#define RENAME_FUNCTION(module, name) __RENAME_FUNCTION1__(module, name)
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onCreate)(JNIEnv* env, jclass) {
-    mars::baseevent::OnCreate();
-}
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onDestroy)(JNIEnv* env, jclass) {
-    mars::baseevent::OnDestroy();
-}
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onForeground)(JNIEnv *, jclass, jboolean _isforeground) {
-    mars::baseevent::OnForeground(_isforeground);
-}
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onNetworkChange)(JNIEnv *, jclass) {
-	mars::baseevent::OnNetworkChange();
-}
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onSingalCrash)(JNIEnv *, jclass, jint _sig) {
-    mars::baseevent::OnSingalCrash((int)_sig);
-}
-
-JNIEXPORT void JNICALL RENAME_FUNCTION(APPMODULE, onExceptionCrash)(JNIEnv*, jclass) {
-    mars::baseevent::OnExceptionCrash();
-}
-
-#else
-
 JNIEXPORT void JNICALL Java_com_tencent_mars_BaseEvent_onCreate(JNIEnv* env, jclass) {
     mars::baseevent::OnCreate();
 }

diff --git a/mars/comm/verinfo.h b/mars/comm/verinfo.h
@@ -2,10 +2,10 @@
 #ifndef Mars_verinfo_h
 #define Mars_verinfo_h
 
-#define MARS_REVISION "51c7056"
-#define MARS_PATH "feature/2019JUN/game_to_push"
+#define MARS_REVISION "0a65602"
+#define MARS_PATH "rb/2019-JUN"
 #define MARS_URL ""
-#define MARS_BUILD_TIME "2019-08-05 20:24:42"
-#define MARS_TAG ""
+#define MARS_BUILD_TIME "2019-08-28 15:47:49"
+#define MARS_TAG "test"
 
 #endif