delete redundancy cflags, make png working

Author: zilongshanren

build/ios/build.sh

@@ -165,19 +165,20 @@ fi
 
 export LDFLAGS="-L${SDKROOT}/usr/lib -arch ${ARCH} -isysroot ${SDKROOT} -miphoneos-version-min=${SDK_MIN}"
 
-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}"
+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/main.mak

@@ -106,8 +106,8 @@ AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
 RANLIB=xcrun ranlib
-EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
+# EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
+# EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 ifeq ($(ARCH),x86_64)
 EXTRA_CFLAGS += -m64 -O3 -DNDEBUG
 EXTRA_LDFLAGS += -m64 -O3 -DNDEBUG
@@ -141,8 +141,8 @@ AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
 RANLIB=xcrun ranlib
-EXTRA_CFLAGS += $(CFLAGS)
-EXTRA_LDFLAGS += $(LDFLAGS)
+# EXTRA_CFLAGS += $(CFLAGS)
+# EXTRA_LDFLAGS += $(LDFLAGS)
 endif
 
 ifdef HAVE_WIN32