Merge pull request #4043 from samuele3hu/developHttp

Modify the all luajit build scripts and let libluajit.a of mac only support 64bit

build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-99dcbba48124bf51788735fe775650f659d7302c
+e2d62e7c366bf3a2c2bbd08ce9b482dab2aa38c4

external/lua/luajit/build_android.sh

@@ -2,7 +2,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 host_os=`uname -s | tr "[:upper:]" "[:lower:]"`
 
-SRCDIR=$DIR/LuaJit-2.0.1
+SRCDIR=$DIR/src
 cd "$SRCDIR"
 
 NDK=$NDK_ROOT
@@ -12,7 +12,7 @@ NDKP=$NDKVER/prebuilt/${host_os}-x86/bin/arm-linux-androideabi-
 NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"
 
 # Android/ARM, armeabi (ARMv5TE soft-float), Android 2.2+ (Froyo)
-DESTDIR=$DIR/android/armeabi
+DESTDIR=$DIR/prebuilt/android/armeabi
 rm "$DESTDIR"/*.a
 make clean
 make HOST_CC="gcc -m32" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF"
@@ -23,7 +23,7 @@ fi;
 
 # Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.0+ (ICS)
 NDKARCH="-march=armv7-a -mfloat-abi=softfp -Wl,--fix-cortex-a8"
-DESTDIR=$DIR/android/armeabi-v7a
+DESTDIR=$DIR/prebuilt/android/armeabi-v7a
 rm "$DESTDIR"/*.a
 make clean
 make HOST_CC="gcc -m32" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF $NDKARCH"
@@ -34,7 +34,7 @@ fi;
 
 # Android/x86, x86 (i686 SSE3), Android 4.0+ (ICS)
 NDKABI=14
-DESTDIR=$DIR/android/x86
+DESTDIR=$DIR/prebuilt/android/x86
 NDKVER=$NDK/toolchains/x86-4.6
 NDKP=$NDKVER/prebuilt/${host_os}-x86/bin/i686-linux-android-
 NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-x86"

external/lua/luajit/build_ios.sh

@@ -3,8 +3,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 LIPO="xcrun -sdk iphoneos lipo"
 STRIP="xcrun -sdk iphoneos strip"
 
-SRCDIR=$DIR/LuaJit-2.0.1
-DESTDIR=$DIR/ios
+SRCDIR=$DIR/src
+DESTDIR=$DIR/prebuilt/ios
 IXCODE=`xcode-select -print-path`
 ISDK=$IXCODE/Platforms/iPhoneOS.platform/Developer
 ISDKVER=iPhoneOS6.1.sdk

external/lua/luajit/build_mac.sh

@@ -1,36 +1,17 @@
 #!/bin/sh
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SRCDIR=$DIR/LuaJit-2.0.1
-DESTDIR=$DIR/mac
+SRCDIR=$DIR/src
+DESTDIR=$DIR/prebuilt/mac
 MACOSX_DEPLOYMENT_TARGET="10.6"
 
 rm "$DESTDIR"/*.a
 
 cd $SRCDIR
-make clean
-make CC="gcc -m32 -arch i386" clean all
-
-if [ -f $SRCDIR/src/libluajit.a ]; then
-    mv $SRCDIR/src/libluajit.a $DESTDIR/libluajit_32.a
-fi;
-
 make clean
 make CC="gcc -m64 -arch x86_64" clean all
 
 if [ -f $SRCDIR/src/libluajit.a ]; then
-    mv $SRCDIR/src/libluajit.a $DESTDIR/libluajit_64.a
+    mv $SRCDIR/src/libluajit.a $DESTDIR/libluajit.a
 fi;
 
 make clean
-
-# create lipo library
-lipo -create -output $DESTDIR/libluajit.a $DESTDIR/libluajit_32.a $DESTDIR/libluajit_64.a
-
-rm $DESTDIR/libluajit_32.a $DESTDIR/libluajit_64.a
-
-# strip
-strip -S $DESTDIR/libluajit.a
-
-# info
-lipo -info $DESTDIR/libluajit.a
-

external/lua/luajit/prebuilt/mac/libluajit.a.REMOVED.git-id

@@ -1 +1 @@
-51a333ce3c98512e50967762ab907be96d6d14e5
+c319cbee7c1d56c5e7add0ba9dcd272ccb36366d

tools/tolua/cocos2dx.ini

@@ -103,7 +103,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
         Camera::[getEyeXYZ getCenterXYZ getUpXYZ],
         ccFontDefinition::[*],
         Object::[autorelease isEqual acceptVisitor update],
-        UserDefault::[getInstance (s|g)etDataForKey]
+        UserDefault::[getInstance (s|g)etDataForKey],
+        Label::[getLettersInfo]
 
 rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame],
     ProgressTimer::[setReverseProgress=setReverseDirection],