update luajit related scripts and libs

Author: dualface

bin/install_luajit.sh

@@ -3,14 +3,19 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_DIR="`dirname $DIR`"
 LUAJIT_SRC_DIR="$ROOT_DIR/lib/cocos2d-x/scripting/lua/luajit/LuaJIT-2.0.3"
 
+XCODE_PATH=`xcode-select -p`
+if [ ! -d "$XCODE_PATH" ]; then
+    echo PLEASE INSTALL XCODE AND XCODE COMMAND LINE TOOLS.
+    exit
+fi
+
 cd $LUAJIT_SRC_DIR
 make
 
 echo ""
 echo ""
-echo Install LuaJIT, please enter your password.
-echo ""
+echo Install LuaJIT, please enter your password:
 sudo make install
 echo ""
-echo "DONE."
+echo "LuaJIT install successed."
 echo ""

bin/pack_files.sh

@@ -13,7 +13,7 @@ make clean
 make CC="clang -arch x86_64" clean all
 
 if [ -f $SRCDIR/src/libluajit.a ]; then
-    mv $SRCDIR/src/libluajit.a $DESTDIR/libluajit2.a
+    mv $SRCDIR/src/libluajit.a $DESTDIR/libluajit.a
 fi;
 
 make clean

lib/cocos2d-x/scripting/lua/luajit/android/armeabi-v7a/libluajit.a

@@ -103,7 +103,7 @@
 		2EBA8474191B6AC500256D60 /* LuaCocoStudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2EBA8470191B6AC500256D60 /* LuaCocoStudio.cpp */; };
 		4983220E187FE0A900733BFB /* HelperFunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4983220C187FE0A900733BFB /* HelperFunc.cpp */; };
 		49832211187FE0BE00733BFB /* CZHelperFunc_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4983220F187FE0BE00733BFB /* CZHelperFunc_luabinding.cpp */; };
-		F411F3E1175CEAFC00EF549A /* libluajit2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F411F3E0175CEAFC00EF549A /* libluajit2.a */; };
+		F411F3E1175CEAFC00EF549A /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F411F3E0175CEAFC00EF549A /* libluajit.a */; };
 		F41D98F417F08B85007171D8 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F41D98F217F08B85007171D8 /* WebSocket.cpp */; };
 		F41D98FC17F08B9E007171D8 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F41D98FB17F08B9E007171D8 /* libwebsockets.a */; };
 		F41D98FF17F08BEB007171D8 /* Lua_web_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F41D98FD17F08BEB007171D8 /* Lua_web_socket.cpp */; };
@@ -636,7 +636,7 @@
 		F411F3DC175CEAFC00EF549A /* lua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua.h; sourceTree = "<group>"; };
 		F411F3DD175CEAFC00EF549A /* luaconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = luaconf.h; sourceTree = "<group>"; };
 		F411F3DE175CEAFC00EF549A /* lualib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lualib.h; sourceTree = "<group>"; };
-		F411F3E0175CEAFC00EF549A /* libluajit2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libluajit2.a; sourceTree = "<group>"; };
+		F411F3E0175CEAFC00EF549A /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libluajit.a; sourceTree = "<group>"; };
 		F41D98F217F08B85007171D8 /* WebSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocket.cpp; sourceTree = "<group>"; };
 		F41D98F317F08B85007171D8 /* WebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocket.h; sourceTree = "<group>"; };
 		F41D98F917F08B9E007171D8 /* libwebsockets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libwebsockets.h; sourceTree = "<group>"; };
@@ -1265,7 +1265,7 @@
 				F45FF35416C7DE1F00275222 /* libcurl.dylib in Frameworks */,
 				F4DE082416800061005DB2DB /* Cocoa.framework in Frameworks */,
 				F41D98FC17F08B9E007171D8 /* libwebsockets.a in Frameworks */,
-				F411F3E1175CEAFC00EF549A /* libluajit2.a in Frameworks */,
+				F411F3E1175CEAFC00EF549A /* libluajit.a in Frameworks */,
 				F4E880EE1770075400577406 /* libwebp.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1856,7 +1856,7 @@
 		F411F3DF175CEAFC00EF549A /* mac */ = {
 			isa = PBXGroup;
 			children = (
-				F411F3E0175CEAFC00EF549A /* libluajit2.a */,
+				F411F3E0175CEAFC00EF549A /* libluajit.a */,
 			);
 			path = mac;
 			sourceTree = "<group>";

lib/cocos2d-x/scripting/lua/luajit/android/armeabi/libluajit.a

@@ -55,5 +55,17 @@ echo "$QUICK_COCOS2DX_ROOT" > ~/.QUICK_COCOS2DX_ROOT
 echo "> ~/.QUICK_COCOS2DX_ROOT updated."
 echo ""
 
+while true; do
+    read -p "Do you wish to install LuaJIT (Y/N) ? " yn
+    case $yn in
+        [Yy]* ) echo ""; $QUICK_COCOS2DX_ROOT/bin/install_luajit.sh; break;;
+        [Nn]* ) exit;;
+        * ) echo "Please answer yes or no.";;
+    esac
+done
+
+echo ""
+echo ""
+
 echo "done."
 echo ""