修复MAC下编码Lua文件可执行文件路径。

jarjin · Jul 18, 2017 · 091d149 · 091d149
1 parent 0e43041
commit 091d149
Show file tree

Hide file tree

Showing 32 changed files with 14 additions and 6 deletions.
diff --git a/Assets/LuaFramework/Editor/Packager.cs b/Assets/LuaFramework/Editor/Packager.cs
@@ -267,7 +267,7 @@ public static void EncodeLuaFile(string srcFile, string outFile) {
             File.Copy(srcFile, outFile, true);
             return;
         }
-        bool isWin = true;
+        bool isWin = true; 
         string luaexe = string.Empty;
         string args = string.Empty;
         string exedir = string.Empty;
@@ -279,17 +279,17 @@ public static void EncodeLuaFile(string srcFile, string outFile) {
             exedir = AppDataPath.Replace("assets", "") + "LuaEncoder/luajit/";
         } else if (Application.platform == RuntimePlatform.OSXEditor) {
             isWin = false;
-            luaexe = "./luac";
-            args = "-o " + outFile + " " + srcFile;
-            exedir = AppDataPath.Replace("assets", "") + "LuaEncoder/luavm/";
+            luaexe = "./luajit";
+            args = "-b " + srcFile + " " + outFile;
+            exedir = AppDataPath.Replace("assets", "") + "LuaEncoder/luajit_mac/";
         }
         Directory.SetCurrentDirectory(exedir);
         ProcessStartInfo info = new ProcessStartInfo();
         info.FileName = luaexe;
         info.Arguments = args;
         info.WindowStyle = ProcessWindowStyle.Hidden;
-        info.ErrorDialog = true;
         info.UseShellExecute = isWin;
+        info.ErrorDialog = true;
         Util.Log(info.FileName + " " + info.Arguments);
 
         Process pro = Process.Start(info);

diff --git a/Assets/LuaFramework/ToLua/Editor/ToLuaMenu.cs b/Assets/LuaFramework/ToLua/Editor/ToLuaMenu.cs
@@ -48,7 +48,7 @@ public static class ToLuaMenu
 #if !UNITY_5 && !UNITY_2017
         typeof(Motion),                                     //很多平台只是空类
 #endif
-        typeof(UnityEngine.CustomYieldInstruction),
+        //typeof(UnityEngine.CustomYieldInstruction),
         typeof(UnityEngine.YieldInstruction),               //无需导出的类      
         typeof(UnityEngine.WaitForEndOfFrame),              //内部支持
         typeof(UnityEngine.WaitForFixedUpdate),
@@ -1035,7 +1035,11 @@ static void CopyBuildBat(string path, string tempDir)
                 File.Copy(path + "/Luajit64/Build.bat", tempDir + "/Build.bat", true);
             }
         }
+#if UNITY_5 || UNITY_2017
         else if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iOS)
+#else
+        else if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.iPhone)
+#endif
         {
             //Debug.Log("iOS默认用64位，32位自行考虑");
             File.Copy(path + "/Luajit64/Build.bat", tempDir + "/Build.bat", true);

diff --git a/Assets/LuaFramework/ToLua/Examples/01_HelloWorld/HelloWorld.unity b/Assets/LuaFramework/ToLua/Examples/01_HelloWorld/HelloWorld.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/02_ScriptsFromFile/ScriptsFromFile.unity b/Assets/LuaFramework/ToLua/Examples/02_ScriptsFromFile/ScriptsFromFile.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/03_CallLuaFunction/CallLuaFunction.unity b/Assets/LuaFramework/ToLua/Examples/03_CallLuaFunction/CallLuaFunction.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/04_AccessingLuaVariables/AccessingLuaVariables.unity b/Assets/LuaFramework/ToLua/Examples/04_AccessingLuaVariables/AccessingLuaVariables.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/05_LuaCoroutine/LuaCoroutine.unity b/Assets/LuaFramework/ToLua/Examples/05_LuaCoroutine/LuaCoroutine.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/06_LuaCoroutine2/Coroutine.unity b/Assets/LuaFramework/ToLua/Examples/06_LuaCoroutine2/Coroutine.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/07_LuaThread/TestThread.unity b/Assets/LuaFramework/ToLua/Examples/07_LuaThread/TestThread.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/08_AccessingArray/AccessingArray.unity b/Assets/LuaFramework/ToLua/Examples/08_AccessingArray/AccessingArray.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/09_Dictionary/UseDictionary.unity b/Assets/LuaFramework/ToLua/Examples/09_Dictionary/UseDictionary.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/10_Enum/AccessingEnum.unity b/Assets/LuaFramework/ToLua/Examples/10_Enum/AccessingEnum.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/11_Delegate/UseDelegate.unity b/Assets/LuaFramework/ToLua/Examples/11_Delegate/UseDelegate.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/12_GameObject/TestGameObject.unity b/Assets/LuaFramework/ToLua/Examples/12_GameObject/TestGameObject.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/13_CustomLoader/CustomLoader.unity b/Assets/LuaFramework/ToLua/Examples/13_CustomLoader/CustomLoader.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/14_Out/TestOut.unity b/Assets/LuaFramework/ToLua/Examples/14_Out/TestOut.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/15_ProtoBuffer/ProtoBuffer.unity b/Assets/LuaFramework/ToLua/Examples/15_ProtoBuffer/ProtoBuffer.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/16_Int64/TestInt64.unity b/Assets/LuaFramework/ToLua/Examples/16_Int64/TestInt64.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/17_Inherit/Inherit.unity b/Assets/LuaFramework/ToLua/Examples/17_Inherit/Inherit.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/18_Bundle/TesetAssetBundle.unity b/Assets/LuaFramework/ToLua/Examples/18_Bundle/TesetAssetBundle.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/19_cjson/testcjson.unity b/Assets/LuaFramework/ToLua/Examples/19_cjson/testcjson.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/20_utf8/utf8.unity b/Assets/LuaFramework/ToLua/Examples/20_utf8/utf8.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/21_String/TestString.unity b/Assets/LuaFramework/ToLua/Examples/21_String/TestString.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/22_Reflection/TestReflection.unity b/Assets/LuaFramework/ToLua/Examples/22_Reflection/TestReflection.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/23_List/UseList.unity b/Assets/LuaFramework/ToLua/Examples/23_List/UseList.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/24_Struct/Struct.unity b/Assets/LuaFramework/ToLua/Examples/24_Struct/Struct.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/Performance/Performance.unity b/Assets/LuaFramework/ToLua/Examples/Performance/Performance.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestInstantiate.prefab b/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestInstantiate.prefab
diff --git a/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestInstantiate2.prefab b/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestInstantiate2.prefab
diff --git a/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestLuaStack.unity b/Assets/LuaFramework/ToLua/Examples/TestErrorStack/TestLuaStack.unity
diff --git a/Assets/LuaFramework/ToLua/Examples/TestOverload/TestOverload.unity b/Assets/LuaFramework/ToLua/Examples/TestOverload/TestOverload.unity
diff --git a/ReadMe.txt b/ReadMe.txt
@@ -21,6 +21,10 @@ XlsxToLua:   https://github.com/zhangqi-ulua/XlsxToLua
 UnityHello:  https://github.com/woshihuo12/UnityHello
 Excel配置：https://github.com/sy-yanghuan/proton
 
+//-------------2017-07-18-------------
+(1)修复部分BUG报错。
+(2)修复MAC下编码Lua文件可执行文件路径。
+
 //-------------2017-07-17-------------
 (1)更新tolua#到1.0.7.343版