Updated to build on iOS 7.1 SDK and include x86_64 arch and no_asm

minsikzzang · Sep 9, 2014 · 65f7ce4 · 65f7ce4
1 parent 5987c71
commit 65f7ce4
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/build-librtmp.sh b/build-librtmp.sh
@@ -21,7 +21,7 @@
 ###########################################################################
 #  Change values here													                            #
 #																		                                      #
-SDKVERSION="7.0"														                              #
+SDKVERSION="7.1"														                              #
 #																		                                      #
 ###########################################################################
 #																		                                      #
@@ -30,7 +30,7 @@ SDKVERSION="7.0"														                              #
 ###########################################################################
 
 CURRENTPATH=`pwd`
-ARCHS="i386 armv7 armv7s arm64"
+ARCHS="i386 x86_64 armv7 armv7s arm64"
 LIBRTMPREPO="git://git.ffmpeg.org/rtmpdump"
 BUILDPATH="${CURRENTPATH}/build"
 LIBPATH="${CURRENTPATH}/lib"
@@ -75,7 +75,7 @@ LIBRTMP_REPO=""
 
 for ARCH in ${ARCHS}
 do
-  if [ "${ARCH}" == "i386" ];
+  if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ];
   then
   	PLATFORM="iPhoneSimulator"
   else  
@@ -97,7 +97,7 @@ do
 	export CROSS_COMPILE="${DEVELOPER}/usr/bin/"  
   export XCFLAGS="-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=7.0 -I${INCLUDEPATH} -arch ${ARCH}"
 
-  if [ "${ARCH}" == "i386" ];
+  if [ "${ARCH}" == "i386" ] || [ "${ARCH}" == "x86_64" ];
   then
   	export XLDFLAGS="-L${LIBPATH} -arch ${ARCH}"
   else

diff --git a/build-libssl.sh b/build-libssl.sh
@@ -39,7 +39,7 @@
 #  Change values here													                            #
 #																	                                    	  #
 VERSION="1.0.1e"													                                #
-SDKVERSION="7.0"														                              #
+SDKVERSION="7.1"														                              #
 #																		                                      #
 ###########################################################################
 #																		                                      #
@@ -48,7 +48,7 @@ SDKVERSION="7.0"														                              #
 ###########################################################################
 
 CURRENTPATH=`pwd`
-ARCHS="i386 armv7 armv7s arm64"
+ARCHS="i386 x86_64 armv7 armv7s arm64"
 BUILDPATH="${CURRENTPATH}/build"
 LIBPATH="${CURRENTPATH}/lib"
 INCLUDEPATH="${CURRENTPATH}/include"
@@ -90,7 +90,7 @@ LIBCRYPTO_REPO=""
 
 for ARCH in ${ARCHS}
 do
-	if [ "${ARCH}" == "i386" ];
+	if [ "${ARCH}" == "i386" ]|| [ "${ARCH}" == "x86_64" ];
 	then
 		PLATFORM="iPhoneSimulator"
 	else
@@ -114,7 +114,7 @@ do
   if [[ "$VERSION" =~ 1.0.0. ]]; then
 	  ./Configure BSD-generic32 --openssldir="${OUTPATH}" > "${LOG}" 2>&1
   else
-	  ./Configure iphoneos-cross --openssldir="${OUTPATH}" > "${LOG}" 2>&1
+	  ./Configure iphoneos-cross no-asm --openssldir="${OUTPATH}" > "${LOG}" 2>&1
   fi
 
 	# add -isysroot to CC=

diff --git a/include/librtmp/rtmp.h b/include/librtmp/rtmp.h
@@ -171,19 +171,15 @@ extern "C"
 #define RTMP_LF_PLST	0x0008	/* send playlist before play */
 #define RTMP_LF_BUFX	0x0010	/* toggle stream on BufferEmpty msg */
 #define RTMP_LF_FTCU	0x0020	/* free tcUrl on close */
+#define RTMP_LF_FAPU	0x0040	/* free app on close */
     int lFlags;
 
     int swfAge;
 
     int protocol;
     int timeout;		/* connection timeout in seconds */
 
-#define RTMP_PUB_NAME   0x0001  /* send login to server */
-#define RTMP_PUB_RESP   0x0002  /* send salted password hash */
-#define RTMP_PUB_ALLOC  0x0004  /* allocated data for new tcUrl & app */
-#define RTMP_PUB_CLEAN  0x0008  /* need to free allocated data for newer tcUrl & app at exit */
-#define RTMP_PUB_CLATE  0x0010  /* late clean tcUrl & app at exit */
-    int pFlags;
+    int pFlags;			/* unused, but kept to avoid breaking ABI */
 
     unsigned short socksport;
     unsigned short port;

diff --git a/include/openssl/opensslconf.h b/include/openssl/opensslconf.h
@@ -41,6 +41,9 @@
 #ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
 #endif
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
@@ -86,8 +89,8 @@
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/livestation/benchmarks/librtmp-iOS/build/openssl-iPhoneSimulator7.0-i386.sdk/lib/engines"
-#define OPENSSLDIR "/livestation/benchmarks/librtmp-iOS/build/openssl-iPhoneSimulator7.0-i386.sdk"
+#define ENGINESDIR "/Users/ashleysampson/Source/Livestation/librtmp-iOS/build/openssl-iPhoneSimulator7.1-i386.sdk/lib/engines"
+#define OPENSSLDIR "/Users/ashleysampson/Source/Livestation/librtmp-iOS/build/openssl-iPhoneSimulator7.1-i386.sdk"
 #endif
 #endif
 

diff --git a/lib/libcrypto.a b/lib/libcrypto.a
diff --git a/lib/librtmp.a b/lib/librtmp.a
diff --git a/lib/libssl.a b/lib/libssl.a
diff --git a/librtmp-iOS.podspec b/librtmp-iOS.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name     = 'librtmp-iOS'
-  s.version  = '1.0.0'
+  s.version  = '1.1.0'
   s.license  = 'MIT'
   s.summary  = 'librtmp build for iOS'
   s.homepage = 'https://github.com/ifactorylab/librtmp-iOS'
   s.authors  = { 'Min Kim' => 'minsikzzang@gmail.com' }
-  s.source   = { :git => 'https://github.com/ifactorylab/librtmp-iOS.git', :tag => "1.0.0", :submodules => true }
+  s.source   = { :git => 'https://github.com/ifactorylab/librtmp-iOS.git', :tag => "1.1.0", :submodules => true }
   s.requires_arc = false
 
-  s.ios.deployment_target = '6.0'
+  s.ios.deployment_target = '7.0'
   s.osx.deployment_target = '10.8'
 
   s.public_header_files = 'include/librtmp/{*}.h', 'include/openssl/{*}.h'