Merge pull request #8 from ckosmic/testing

Merge testing branch

Makefile

@@ -27,6 +27,7 @@ TARGET_RPI ?= 0
 # Build for Emscripten/WebGL
 TARGET_WEB ?= 0
 
+# Build for iOS devices
 TARGET_IOS ?= 1
 
 # Makeflag to enable OSX fixes
@@ -698,6 +699,7 @@ LOADER_FLAGS = -vwf
 SHA1SUM = sha1sum
 ZEROTERM = $(PYTHON) $(TOOLS_DIR)/zeroterm.py
 IBTOOL = ibtool
+CODESIGN = codesign
 
 ###################### Dependency Check #####################
 
@@ -746,6 +748,24 @@ $(BASEPACK_PATH): $(BASEPACK_LST)
 
 endif
 
+ios: default
+	$(RM) -rf $(BUILD_DIR_BASE)/$(TARGET).app
+	cp -a ios/. $(BUILD_DIR)
+	cp -R $(BUILD_DIR) build/$(TARGET).app
+	$(RM) -rf $(BUILD_DIR_BASE)/Payload
+	$(RM) -rf $(BUILD_DIR_BASE)/$(TARGET).ipa
+	mkdir $(BUILD_DIR_BASE)/Payload
+	cp -r $(BUILD_DIR_BASE)/$(TARGET).app $(BUILD_DIR_BASE)/Payload
+	$(CODESIGN) -f -s "$(CODE_SIGN_IDENTITY)" --entitlements "$(CODE_SIGN_ENTITLEMENTS)" $(BUILD_DIR_BASE)/Payload/$(TARGET).app
+	cd $(BUILD_DIR_BASE) && zip -r -q $(TARGET).ipa Payload && cd ..
+	$(RM) -rf $(BUILD_DIR_BASE)/Payload
+	$(RM) -rf $(BUILD_DIR_BASE)/$(TARGET).app
+
+sim: default
+	$(RM) -rf $(BUILD_DIR_BASE)/$(TARGET).app
+	cp -a ios/. $(BUILD_DIR)
+	cp -R $(BUILD_DIR) build/$(TARGET).app
+
 clean:
 	$(RM) -r $(BUILD_DIR_BASE)
 
@@ -1024,7 +1044,7 @@ $(BUILD_DIR)/%.o: %.s
 $(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(BUILD_DIR)/$(RPC_LIBS)
 	$(LD) -L $(BUILD_DIR) -o $@ $(O_FILES) $(SOUND_OBJ_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS)
 
-.PHONY: all clean distclean default diff test load libultra res
+.PHONY: all clean distclean default diff test load libultra res ios sim
 .PRECIOUS: $(BUILD_DIR)/bin/%.elf $(SOUND_BIN_DIR)/%.ctl $(SOUND_BIN_DIR)/%.tbl $(SOUND_SAMPLE_TABLES) $(SOUND_BIN_DIR)/%.s $(BUILD_DIR)/%
 .DELETE_ON_ERROR:
 

build.sh

@@ -0,0 +1,18 @@
+case ${PLATFORM_NAME} in
+    iphoneos)
+        export CC="clang -arch arm64 --target=arm64-apple-ios -mios-version-min=13.2 -fobjc-weak -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk -DUSE_GLES -DAAPI_SDL2 -DWAPI_SDL2"
+        export CXX="clang++ -arch arm64 -mios-version-min=13.2 -fobjc-weak -std=c++11 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk -DUSE_GLES -DAAPI_SDL2 -DWAPI_SDL2"
+        ;;
+    iphonesimulator)
+        export CC="clang -arch x86_64 -mios-version-min=13.2 -fobjc-weak -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk -DUSE_GLES -DAAPI_SDL2 -DWAPI_SDL2"
+        export CXX="clang++ -arch x86_64 -mios-version-min=13.2 -fobjc-weak -std=c++11 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk -DUSE_GLES -DAAPI_SDL2 -DWAPI_SDL2"
+        ;;
+esac
+
+export IOSINCLUDE="${SDL2_INCLUDE_DIR}/"
+export IOSLIBS="${BUILT_PRODUCTS_DIR}/"
+
+gmake -j4 TARGET_IOS=1
+
+cp -R "build/us_pc/." "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/"
+rsync -aP --exclude="Info.plist" "ios/" "${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}"

build_ios.sh

@@ -2,21 +2,7 @@ export CC="clang -arch arm64 -mios-version-min=13.2 -fobjc-weak -isysroot /Appli
 export CXX="clang++ -arch arm64 -mios-version-min=13.2 -fobjc-weak -std=c++11 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk -DUSE_GLES -DAAPI_SDL2 -DWAPI_SDL2"
 export IOSINCLUDE="../ioslib/include"
 export IOSLIBS="../ioslib/lib"
+export CODE_SIGN_IDENTITY="Apple Development"
+export CODE_SIGN_ENTITLEMENTS="sm64ios.entitlements"
 
-gmake -j4 TARGET_IOS=1
-
-if [ $? -eq 0 ]; then
-    rm -rf build/sm64ios.app
-    cp -a ios/. build/us_pc/
-    cp -R build/us_pc build/sm64ios.app
-    codesign -f -s "Apple Development" --entitlements sm64ios.entitlements build/sm64ios.app
-    rm -rf build/Payload
-    rm -rf build/sm64ios.ipa
-    mkdir build/Payload
-    cp -r build/sm64ios.app build/Payload
-    cd build
-    zip -r -q sm64ios.ipa Payload
-    rm -rf Payload
-    rm -rf sm64ios.app
-    cd ..
-fi
+gmake ios -j4 TARGET_IOS=1

build_sim.sh

@@ -3,10 +3,4 @@ export CXX="clang++ -arch x86_64 -mios-version-min=13.2 -fobjc-weak -std=c++11 -
 export IOSINCLUDE="../simlib/include"
 export IOSLIBS="../simlib/lib"
 
-gmake -j4 TARGET_IOS=1
-
-if [ $? -eq 0 ]; then
-    rm -rf build/sm64ios.app
-    cp -a ios/. build/us_pc/
-    cp -R build/us_pc build/sm64ios.app
-fi
+gmake sim -j4 TARGET_IOS=1

sm64ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

sm64ios/sm64ios.xcodeproj/TemplateInfo.plist

@@ -0,0 +1,10 @@
+<?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>Description</key>
+	<string>This project builds an SDL based project for iPhone OS using C or Objective-C.  It includes everything you need to get up and running with SDL on iPhone.</string>
+	<key>CFBundleIconFile</key>
+	<string>Icon.png</string>
+</dict>
+</plist>