Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ HEADER_OPENSSL = "$(OF_PATH)/libs/openssl/include"


//------- Libraries
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/openFrameworksiOS.a"
LIB_OF_RELEASE = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/openFrameworksiOS.a"
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/openFrameworksiOSDebug.a"

//LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/ios/freeimage.a"
Expand All @@ -36,9 +36,8 @@ LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/openFrameworksiOS
//LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/ios/uriparser.a"
//LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/ios/pugixml.a"



MISC_FLAGS = "-ObjC"
LINK_OBJC_RUNTIME = YES

OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
BB24DE5C10DA7A3F00E9C588 /* iOS+OF Static Library */ = {
BB24DE5C10DA7A3F00E9C588 /* openFrameworks */ = {
isa = PBXNativeTarget;
buildConfigurationList = BB24DED210DA7A3F00E9C588 /* Build configuration list for PBXNativeTarget "iOS+OF Static Library" */;
buildConfigurationList = BB24DED210DA7A3F00E9C588 /* Build configuration list for PBXNativeTarget "openFrameworks" */;
buildPhases = (
BB24DE5D10DA7A3F00E9C588 /* Headers */,
BB24DEB110DA7A3F00E9C588 /* Sources */,
Expand All @@ -1153,7 +1153,7 @@
);
dependencies = (
);
name = "iOS+OF Static Library";
name = openFrameworks;
productName = "Static Library";
productReference = BB24DED610DA7A3F00E9C588 /* openFrameworksiOSDebug.a */;
productType = "com.apple.product-type.library.static";
Expand All @@ -1179,7 +1179,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
BB24DE5C10DA7A3F00E9C588 /* iOS+OF Static Library */,
BB24DE5C10DA7A3F00E9C588 /* openFrameworks */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -1398,9 +1398,9 @@
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
OBJROOT = "$(SRCROOT)/../../lib/ios/build/obj/Debug/";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
OBJROOT = "$(SRCROOT)/../../lib/ios/build/obj/Debug/";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
WARNING_CFLAGS = (
"-Wno-non-virtual-dtor",
Expand Down Expand Up @@ -1438,8 +1438,8 @@
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
ONLY_ACTIVE_ARCH = NO;
OBJROOT = "$(SRCROOT)/../../lib/ios/build/obj/Release/";
ONLY_ACTIVE_ARCH = NO;
SDKROOT = iphoneos;
WARNING_CFLAGS = (
"-Wno-non-virtual-dtor",
Expand All @@ -1451,7 +1451,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
BB24DED210DA7A3F00E9C588 /* Build configuration list for PBXNativeTarget "iOS+OF Static Library" */ = {
BB24DED210DA7A3F00E9C588 /* Build configuration list for PBXNativeTarget "openFrameworks" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BB24DED310DA7A3F00E9C588 /* Debug */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB24DE5C10DA7A3F00E9C588"
BuildableName = "openFrameworksiOSDebug.a"
BlueprintName = "iOS+OF Static Library"
BlueprintName = "openFrameworks"
ReferencedContainer = "container:iOS+OFLib.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -51,7 +51,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB24DE5C10DA7A3F00E9C588"
BuildableName = "openFrameworksiOSDebug.a"
BlueprintName = "iOS+OF Static Library"
BlueprintName = "openFrameworks"
ReferencedContainer = "container:iOS+OFLib.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"

//------- Libraries
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworks.a"
LIB_OF_RELEASE = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworks.a"
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworksDebug.a"

//LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; };
9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; };
BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */; };
BF14DA522D75650400A4B85E /* fmt.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF14DA512D75650400A4B85E /* fmt.xcframework */; };
BF6276A62BAD9900008864C1 /* ofBaseTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BF6276A52BAD9900008864C1 /* ofBaseTypes.h */; };
BFB0B3F52C50DFE8008FB5A3 /* brotli.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7C462D2C097CCE00461163 /* brotli.xcframework */; };
BFB0B3F62C50DFE8008FB5A3 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF6276A32BAD6639008864C1 /* curl.xcframework */; };
Expand Down Expand Up @@ -235,6 +236,7 @@
9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = "<group>"; };
9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = "<group>"; };
BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofBaseApp.cpp; sourceTree = "<group>"; };
BF14DA512D75650400A4B85E /* fmt.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = fmt.xcframework; path = ../../../fmt/lib/macos/fmt.xcframework; sourceTree = "<group>"; };
BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = "<group>"; };
BF5BF8412B737C700049DEF6 /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = "<group>"; };
BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -385,6 +387,7 @@
BFB0B3FF2C50DFE8008FB5A3 /* pugixml.xcframework in Frameworks */,
BFB0B4002C50DFE8008FB5A3 /* rtAudio.xcframework in Frameworks */,
BFB0B4012C50DFE8008FB5A3 /* tess2.xcframework in Frameworks */,
BF14DA522D75650400A4B85E /* fmt.xcframework in Frameworks */,
BFB0B4022C50DFE8008FB5A3 /* uriparser.xcframework in Frameworks */,
BFB0B4032C50DFE8008FB5A3 /* zlib.xcframework in Frameworks */,
);
Expand All @@ -396,6 +399,7 @@
BF5BF83E2B7378ED0049DEF6 /* frameworks */ = {
isa = PBXGroup;
children = (
BF14DA512D75650400A4B85E /* fmt.xcframework */,
BF7C462D2C097CCE00461163 /* brotli.xcframework */,
BF6276A32BAD6639008864C1 /* curl.xcframework */,
BF6276A12BAD6619008864C1 /* openssl.xcframework */,
Expand Down
43 changes: 41 additions & 2 deletions scripts/ci/ios/build.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,48 @@
#!/bin/bash
set -ev
set -e
echo "Building openFrameworks - iOS Template Project"
ROOT=${TRAVIS_BUILD_DIR:-"$( cd "$(dirname "$0")/../../.." ; pwd -P )"}
if [[ "$GITHUB_ACTIONS" = true ]]; then
ROOT=$GITHUB_WORKSPACE
fi
SKIP_DEVICE=${SKIP_DEVICE:-1} ## SKIP until figure out Identity
HOST_ARCH=$(uname -m)
if [[ "$HOST_ARCH" == "arm64" ]]; then
SIM_ARCH="arm64"
else
SIM_ARCH="x86_64 arm64"
fi
if [ -z "${IDENTITY+x}" ]; then
IDENTITY="-"
fi
echo "Building emptyExample for iphonesimulator"
xcodebuild -configuration Release \
-project "$ROOT/scripts/templates/ios/emptyExample.xcodeproj" \
-target emptyExample \
-sdk iphonesimulator \
-arch "$SIM_ARCH" \
CODE_SIGNING_ALLOWED=NO
if [ $? -ne 0 ]; then
echo "Error: Failed to build emptyExample for iphonesimulator"
exit 1
fi
echo "emptyExample simulotor built successfully"

if [[ "$SKIP_DEVICE" = 0 ]]; then
echo "Building emptyExample for iphoneos"
xcodebuild -configuration Release \
-project "$ROOT/scripts/templates/ios/emptyExample.xcodeproj" \
-target emptyExample \
-sdk iphoneos \
-arch "arm64" \
CODE_SIGN_STYLE=Automatic \
DEVELOPMENT_TEAM="$IDENTITY" \
CODE_SIGN_IDENTITY="Apple Development"
if [ $? -ne 0 ]; then
echo "Error: Failed to build emptyExample for device"
exit 1
fi
echo "emptyExample device built successfully"
fi

xcodebuild -configuration Release -project "$ROOT/scripts/templates/ios/emptyExample.xcodeproj" -target emptyExample -sdk 'iphonesimulator' ARCHS='x86_64'
echo "ios tests complete"
Loading
Loading