make lua compile correct

Author: zilongshanren

build/ios/build.sh

@@ -204,6 +204,7 @@ do
             continue
         fi
 
+
         is_simulator=""
         install_library_path="install-ios-OS"
         build_library_path="iPhoneOS"
@@ -248,6 +249,10 @@ do
             cp -r $top_dir/contrib/$install_library_path/$arch/include/luajit-2.0/  $archive_name/include/
         fi
 
+        if [ $lib = "lua" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/l*.h*  $archive_name/include/
+        fi
+
         if [ $lib = "curl" ]; then
             cp -r $top_dir/contrib/$install_library_path/$arch/include/curl/  $archive_name/include/
         fi
@@ -256,6 +261,10 @@ do
             cp -r $top_dir/contrib/$install_library_path/$arch/include/freetype2  $archive_name/include
         fi
 
+        if [ $lib = "jpeg" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/j*.h  $archive_name/include/
+        fi
+
         # TODO: add more header files decides here
 
         echo "cleaning up"

contrib/build_ios.sh

@@ -174,19 +174,6 @@ fi
 export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
 
 EXTRA_CFLAGS=""
-# if [ "$PLATFORM" = "OS" ]; then
-#     EXTRA_CFLAGS="-arch ${ARCH}"
-# if [ "$ARCH" != "arm64" ]; then
-#     EXTRA_CFLAGS+=" -mcpu=cortex-a8"
-# fi
-#     EXTRA_LDFLAGS="-arch ${ARCH}"
-# else
-#     EXTRA_CFLAGS="-arch ${ARCH}"
-#     EXTRA_LDFLAGS="-arch ${ARCH}"
-# fi
-
-# EXTRA_CFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
-# EXTRA_LDFLAGS+=" -miphoneos-version-min=${SDK_MIN}"
 
 info "LD FLAGS SELECTED = '${LDFLAGS}'"
 

contrib/src/lua/lua-ios-support.patch

@@ -3,11 +3,11 @@ diff -ru lua/Makefile lua-f/Makefile
 +++ lua-f/Makefile	2012-03-21 13:58:30.000000000 +0100
 @@ -38,7 +38,7 @@
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
- 
+
  # Convenience platforms targets.
 -PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
 +PLATS= aix ansi bsd freebsd generic linux ios macosx mingw posix solaris
- 
+
  # What to install.
  TO_BIN= lua luac
 diff -ru lua/src/Makefile lua-f/src/Makefile
@@ -16,9 +16,9 @@ diff -ru lua/src/Makefile lua-f/src/Makefile
 @@ -98,6 +98,9 @@
  linux:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
- 
+
 +ios:
-+	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX
++	$(MAKE) all
 +
  macosx:
  	$(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"

contrib/src/lua/rules.mak

@@ -51,14 +51,12 @@ lua: lua-$(LUA_VERSION).tar.gz .sum-lua
 ifdef HAVE_DARWIN_OS
 	(cd $(UNPACK_DIR) && \
 	sed -e 's%gcc%$(CC)%' \
-		-e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
-		-i.orig src/Makefile)
-endif
-ifdef HAVE_SOLARIS
-	(cd $(UNPACK_DIR) && \
-	sed -e 's%LIBS="-ldl"$$%LIBS="-ldl" MYLDFLAGS="$(EXTRA_LDFLAGS)"%' \
+		-e 's%LDFLAGS=%LDFLAGS=$(LDFLAGS)%' \
+		-e 's%CFLAGS= -O2 -Wall $(MYCFLAGS)%CFLAGS=$(MYCFLAGS)%' \
+		-e 's%MYCFLAGS=%MYCFLAGS=$(CFLAGS)%' \
 		-i.orig src/Makefile)
 endif
+
 ifdef HAVE_WIN32
 	cd $(UNPACK_DIR) && sed -i.orig -e 's/lua luac/lua.exe luac.exe/' Makefile
 endif
@@ -70,7 +68,7 @@ endif
 	$(MOVE)
 
 .lua: lua
-	cd $< && $(HOSTVARS_PIC) $(MAKE) $(LUA_TARGET)
+	cd $< && $(HOSTVARS_PIC) $(MAKE) VERBOS=1 $(LUA_TARGET)
 ifdef HAVE_WIN32
 	cd $</src && $(HOSTVARS) $(MAKE) liblua.a
 endif