bugfix changes iOS template to allow simulator/device linking. (#6364)

* bugfix changes iOS template to allow simulator/device linking. Closes #6192 * fix for ci to build debug for both OF lib and emptyExample app * one more try - maybe needs to be Release?
openframeworks · Sep 3, 2019 · 04579e7 · 04579e7
1 parent 95ccc98
commit 04579e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
@@ -18,6 +18,7 @@ HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
 
 
 //------- Libraries
+LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/libofxiOS_${PLATFORM_NAME}_${CONFIGURATION}.a"
 LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/ios/freeimage.a"
 LIB_FREETYPE = "$(OF_PATH)/libs/freetype/lib/ios/freetype.a"
 LIB_TESS = "$(OF_PATH)/libs/tess2/lib/ios/tess2.a"
@@ -31,7 +32,7 @@ LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/ios/pugixml.a"
 
 MISC_FLAGS = "-ObjC"
 
-OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_BOOST) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_OPENSSL) $(LIB_TESS) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML)
+OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_BOOST) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_OPENSSL) $(LIB_TESS) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML) $(LIB_OF)
 
 OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_OFXACCELEROMETER) $(HEADER_BOOST) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMODEX) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
 

diff --git a/scripts/ci/ios/build.sh b/scripts/ci/ios/build.sh
@@ -4,4 +4,4 @@ echo "Building openFrameworks - iOS Template Project"
 ROOT=${TRAVIS_BUILD_DIR:-"$( cd "$(dirname "$0")/../../.." ; pwd -P )"}
 source $ROOT/scripts/ci/ccache.sh
 
-xcodebuild -project "$ROOT/scripts/templates/ios/emptyExample.xcodeproj"  -target emptyExample -sdk 'iphonesimulator' ARCHS='x86_64'
+xcodebuild -configuration Release -project "$ROOT/scripts/templates/ios/emptyExample.xcodeproj"  -target emptyExample -sdk 'iphonesimulator' ARCHS='x86_64'
diff --git a/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj b/scripts/templates/ios/emptyExample.xcodeproj/project.pbxproj
@@ -999,13 +999,6 @@
 			<key>targetProxy</key>
 			<string>E41D410313B3A11300A75A5D</string>
 		</dict>
-		<key>E41D421413B3A95300A75A5D</key>
-		<dict>
-			<key>fileRef</key>
-			<string>E41D410213B3A0D800A75A5D</string>
-			<key>isa</key>
-			<string>PBXBuildFile</string>
-		</dict>
 		<key>E4A823A312561BE3002F86A2</key>
 		<dict>
 			<key>isa</key>