From 27b6c0924fbd8760c90e519b8609606f096b5c2c Mon Sep 17 00:00:00 2001
From: cebgcontract <99630598+cebgcontract@users.noreply.github.com>
Date: Thu, 30 Jun 2022 15:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86arm64=E7=9A=84ios=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84js=E5=BC=95=E6=93=8E=E6=94=B9=E4=B8=BAjsc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/cocos2d_libs.xcodeproj/project.pbxproj  |  4 ++-
 cocos/platform/ios/CCApplication-ios.mm       | 29 -------------------
 .../js-bindings/jswrapper/config.hpp          |  4 +--
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj
index f5c4596..5dcffd5 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj
@@ -2458,6 +2458,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -2506,6 +2507,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2647,7 +2649,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				EXCLUDED_ARCHS = "";
 				EXECUTABLE_PREFIX = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
diff --git a/cocos/platform/ios/CCApplication-ios.mm b/cocos/platform/ios/CCApplication-ios.mm
index 264e790..1e10425 100644
--- a/cocos/platform/ios/CCApplication-ios.mm
+++ b/cocos/platform/ios/CCApplication-ios.mm
@@ -66,15 +66,7 @@ namespace
         _application = application;
         _scheduler = _application->getScheduler();
         
-//        _lastRotation = cocos2d::Device::getDeviceRotation();
         _isAppActive = [UIApplication sharedApplication].applicationState == UIApplicationStateActive;
-//        NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-//        [nc addObserver:self selector:@selector(appDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
-//        [nc addObserver:self selector:@selector(appDidBecomeInactive) name:UIApplicationWillResignActiveNotification object:nil];
-//
-//        [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
-//        [nc addObserver:self selector:@selector(statusBarOrientationChanged:)name:UIApplicationDidChangeStatusBarOrientationNotification
-//              object:nil];
     }
     return self;
 }
@@ -136,27 +128,6 @@ namespace
 
 -(void) firstStart:(id) view
 {
-//    if ([view isReady])
-//    {
-//        auto scheduler = _application->getScheduler();
-//        scheduler->removeAllFunctionsToBePerformedInCocosThread();
-//        scheduler->unscheduleAll();
-//
-//        se::ScriptEngine::getInstance()->cleanup();
-//        cocos2d::PoolManager::getInstance()->getCurrentPool()->clear();
-//        cocos2d::EventDispatcher::init();
-//
-//        cocos2d::ccInvalidateStateCache();
-//        se::ScriptEngine* se = se::ScriptEngine::getInstance();
-//        se->addRegisterCallback(setCanvasCallback);
-//
-//        if(!_application->applicationDidFinishLaunching())
-//            return;
-//
-//        [self startMainLoop];
-//    }
-//    else
-//        [self performSelector:@selector(firstStart:) withObject:view afterDelay:0];
     // 这里直接开始
     if(!_application->applicationDidFinishLaunching())
         return;
diff --git a/cocos/scripting/js-bindings/jswrapper/config.hpp b/cocos/scripting/js-bindings/jswrapper/config.hpp
index 68e147b..e0d43fd 100644
--- a/cocos/scripting/js-bindings/jswrapper/config.hpp
+++ b/cocos/scripting/js-bindings/jswrapper/config.hpp
@@ -41,10 +41,10 @@
             #define SCRIPT_ENGINE_TYPE           SCRIPT_ENGINE_V8
         #endif
     #endif
-
+    // 在__arm64__的机器上, 用jsc比v8少17m左右的内存
     #if TARGET_OS_IOS
         #ifdef __arm64__
-            #define SCRIPT_ENGINE_TYPE           SCRIPT_ENGINE_V8
+            #define SCRIPT_ENGINE_TYPE           SCRIPT_ENGINE_JSC
         #else
             #define SCRIPT_ENGINE_TYPE           SCRIPT_ENGINE_JSC
         #endif