Created Xcode project for compiling universal static lib for iOS

.gitignore

@@ -1,2 +1,3 @@
 limelight-common/ARM/
 limelight-common/Debug/
+Build/

limelight-common.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:limelight-common.xcodeproj">
+   </FileRef>
+</Workspace>

limelight-common.xcodeproj/project.xcworkspace/xcshareddata/limelight-common.xccheckout

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>662F3EBE-A540-4F33-A434-3BBB22ECCB12</string>
+	<key>IDESourceControlProjectName</key>
+	<string>limelight-common</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>151E8452-E928-4FE9-BF31-5F5C490B9DD4</key>
+		<string>ssh://github.com/limelight-stream/limelight-common-c.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>limelight-common.xcodeproj/project.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>151E8452-E928-4FE9-BF31-5F5C490B9DD4</key>
+		<string>../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/limelight-stream/limelight-common-c.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>151E8452-E928-4FE9-BF31-5F5C490B9DD4</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>151E8452-E928-4FE9-BF31-5F5C490B9DD4</string>
+			<key>IDESourceControlWCCName</key>
+			<string>limelight-common-c</string>
+		</dict>
+	</array>
+</dict>
+</plist>

limelight-common.xcodeproj/xcuserdata/diegowaxemberg.xcuserdatad/xcschemes/limelight-common.xcscheme

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FB290E2D19B37A4E004C83CF"
+               BuildableName = "liblimelight-common.a"
+               BlueprintName = "limelight-common"
+               ReferencedContainer = "container:limelight-common.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

limelight-common.xcodeproj/xcuserdata/diegowaxemberg.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>limelight-common.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>FB290E2D19B37A4E004C83CF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

limelight-common/InputStream.c

@@ -4,8 +4,8 @@
 #include "LinkedBlockingQueue.h"
 #include "Input.h"
 
-#include "OpenAES\oaes_lib.h"
+#include "OpenAES/oaes_lib.h"
-#include "OpenAES\oaes_common.h"
+#include "OpenAES/oaes_common.h"
 
 static IP_ADDRESS host;
 static SOCKET inputSock = INVALID_SOCKET;

limelight-common/RtspConnection.c

@@ -1,5 +1,6 @@
 #include "Limelight-internal.h"
 #include "Rtsp.h"
+#include <arpa/inet.h>
 
 #define RTSP_MAX_RESP_SIZE 16384
 
@@ -250,7 +251,7 @@ static int sendVideoAnnounce(PRTSP_MESSAGE response, PSTREAM_CONFIGURATION strea
 			goto FreeMessage;
 		}
 
-		sdpAddr.S_un.S_addr = remoteAddr;
+        memcpy(&sdpAddr, &remoteAddr, sizeof(remoteAddr));
 		request.payload = getSdpPayloadForStreamConfig(streamConfig, sdpAddr, &payloadLength);
 		if (request.payload == NULL) {
 			goto FreeMessage;
@@ -278,7 +279,7 @@ int performRtspHandshake(IP_ADDRESS addr, PSTREAM_CONFIGURATION streamConfigPtr)
 
 	// Initialize global state
 	remoteAddr = addr;
-	inaddr.S_un.S_addr = addr;
+    memcpy(&inaddr, &addr, sizeof(addr));
 	sprintf(rtspTargetUrl, "rtsp://%s", inet_ntoa(inaddr));
 
 	{

limelight-common/SdpGenerator.c

@@ -1,4 +1,5 @@
 #include "Limelight-internal.h"
+#include <arpa/inet.h>
 
 #define MAX_OPTION_NAME_LEN 128
 

make_fat_lib.sh

@@ -0,0 +1,122 @@
+##########################################
+#
+# c.f. http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4
+#
+# Version 2.7
+#
+# Latest Change:
+# - Supports iPhone 5 / iPod Touch 5 (uses Apple's workaround to lipo bug)
+# 
+# Purpose:
+#   Automatically create a Universal static library for iPhone + iPad + iPhone Simulator from within XCode
+#
+# Author: Adam Martin - http://twitter.com/t_machine_org
+# Based on: original script from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI - it WILL CRASH YOUR COMPUTER)
+#
+
+set -e
+set -o pipefail
+
+#################[ Tests: helps workaround any future bugs in Xcode ]########
+#
+DEBUG_THIS_SCRIPT="false"
+
+if [ $DEBUG_THIS_SCRIPT = "true" ]
+then
+echo "########### TESTS #############"
+echo "Use the following variables when debugging this script; note that they may change on recursions"
+echo "BUILD_DIR = $BUILD_DIR"
+echo "BUILD_ROOT = $BUILD_ROOT"
+echo "CONFIGURATION_BUILD_DIR = $CONFIGURATION_BUILD_DIR"
+echo "BUILT_PRODUCTS_DIR = $BUILT_PRODUCTS_DIR"
+echo "CONFIGURATION_TEMP_DIR = $CONFIGURATION_TEMP_DIR"
+echo "TARGET_BUILD_DIR = $TARGET_BUILD_DIR"
+fi
+
+#####################[ part 1 ]##################
+# First, work out the BASESDK version number (NB: Apple ought to report this, but they hide it)
+#    (incidental: searching for substrings in sh is a nightmare! Sob)
+
+SDK_VERSION=$(echo ${SDK_NAME} | grep -o '.\{3\}$')
+
+# Next, work out if we're in SIM or DEVICE
+
+if [ ${PLATFORM_NAME} = "iphonesimulator" ]
+then
+OTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}
+else
+OTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}
+fi
+
+echo "XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION} (although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})"
+echo "...therefore, OTHER_SDK_TO_BUILD = ${OTHER_SDK_TO_BUILD}"
+#
+#####################[ end of part 1 ]##################
+
+#####################[ part 2 ]##################
+#
+# IF this is the original invocation, invoke WHATEVER other builds are required
+#
+# Xcode is already building ONE target...
+#
+# ...but this is a LIBRARY, so Apple is wrong to set it to build just one.
+# ...we need to build ALL targets
+# ...we MUST NOT re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER if you try this (infinite recursion!)
+#
+#
+# So: build ONLY the missing platforms/configurations.
+
+if [ "true" == ${ALREADYINVOKED:-false} ]
+then
+echo "RECURSION: I am NOT the root invocation, so I'm NOT going to recurse"
+else
+# CRITICAL:
+# Prevent infinite recursion (Xcode sucks)
+export ALREADYINVOKED="true"
+
+echo "RECURSION: I am the root ... recursing all missing build targets NOW..."
+echo "RECURSION: ...about to invoke: xcodebuild -configuration \"${CONFIGURATION}\" -project \"${PROJECT_NAME}.xcodeproj\" -target \"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO" BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" SYMROOT=\"${SYMROOT}\"
+
+xcodebuild -configuration "${CONFIGURATION}" -project "${PROJECT_NAME}.xcodeproj" -target "${TARGET_NAME}" -sdk "${OTHER_SDK_TO_BUILD}" ${ACTION} RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR="${BUILD_DIR}" BUILD_ROOT="${BUILD_ROOT}" SYMROOT="${SYMROOT}"
+
+ACTION="build"
+
+#Merge all platform binaries as a fat binary for each configurations.
+
+# Calculate where the (multiple) built files are coming from:
+CURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos
+CURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator
+
+echo "Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}"
+echo "Taking simulator build from: ${CURRENTCONFIG_SIMULATOR_DIR}"
+
+CREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal
+echo "...I will output a universal build to: ${CREATING_UNIVERSAL_DIR}"
+
+# ... remove the products of previous runs of this script
+#      NB: this directory is ONLY created by this script - it should be safe to delete!
+
+rm -rf "${CREATING_UNIVERSAL_DIR}"
+mkdir "${CREATING_UNIVERSAL_DIR}"
+
+#
+echo "lipo: for current configuration (${CONFIGURATION}) creating output file: ${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}"
+xcrun -sdk iphoneos lipo -create -output "${CREATING_UNIVERSAL_DIR}/${EXECUTABLE_NAME}" "${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}" "${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}"
+
+#########
+#
+# Added: StackOverflow suggestion to also copy "include" files
+#    (untested, but should work OK)
+#
+echo "Fetching headers from ${PUBLIC_HEADERS_FOLDER_PATH}"
+echo "  (if you embed your library project in another project, you will need to add"
+echo "   a "User Search Headers" build setting of: (NB INCLUDE THE DOUBLE QUOTES BELOW!)"
+echo '        "$(TARGET_BUILD_DIR)/usr/local/include/"'
+if [ -d "${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}" ]
+then
+mkdir -p "${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}"
+# * needs to be outside the double quotes?
+cp -r "${CURRENTCONFIG_DEVICE_DIR}${PUBLIC_HEADERS_FOLDER_PATH}"* "${CREATING_UNIVERSAL_DIR}${PUBLIC_HEADERS_FOLDER_PATH}"
+fi
+fi
+open "${CREATING_UNIVERSAL_DIR}"