make all 3rd party libraries work for ios

Author: zilongshanren

build/ios/build.sh

@@ -234,7 +234,7 @@ do
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
-        if [ $lib = "png" ] || [ $lib = "freetype2" ];  then
+        if [ $lib = "png" ] || [ $lib = "freetype2" ] || [ $lib = "websockets" ];  then
             echo "copying libz..."
             mkdir -p z/prebuilt/
             cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
@@ -265,6 +265,22 @@ do
             cp -r $top_dir/contrib/$install_library_path/$arch/include/j*.h  $archive_name/include/
         fi
 
+        if [ $lib = "tiff" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/tif*.h  $archive_name/include/
+        fi
+
+        if [ $lib = "webp" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/webp/  $archive_name/include/
+        fi
+
+        if [ $lib = "websockets" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/libwebsockets.h  $archive_name/include/
+        fi
+
+        if [ $lib = "zlib" ]; then
+            cp -r $top_dir/contrib/$install_library_path/$arch/include/z*.h  $archive_name/include/
+        fi
+
         # TODO: add more header files decides here
 
         echo "cleaning up"
@@ -279,7 +295,7 @@ do
         create_fat_library crypto
     fi
 
-    if [ $lib = "png" ] || [ $lib = "curl" ] || [ $lib = "freetype2" ]; then
+    if [ $lib = "png" ] || [ $lib = "curl" ] || [ $lib = "freetype2" ] || [ $lib = "websockets" ]; then
         create_fat_library z
     fi
 

contrib/src/main.mak

@@ -164,9 +164,9 @@ endif
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
-CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS := $(CPPFLAGS) $(CFLAGS)
 CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
-CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS)
+CXXFLAGS := $(CXXFLAGS) $(CFLAGS)
 EXTRA_LDFLAGS += -L$(PREFIX)/lib
 LDFLAGS := $(LDFLAGS) $(EXTRA_LDFLAGS)
 # Do not export those! Use HOSTVARS.

contrib/src/websockets/rules.mak

@@ -27,6 +27,6 @@ endif
 DEPS_websockets = zlib $(DEPS_zlib)
 
 .websockets: websockets .zlib toolchain.cmake
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DCMAKE_BUILD_TYPE=Release -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@