Skip to content

Commit 01f5944

Browse files
danoli3danoli3
committed
tvOS Project Working
1 parent 4a48d85 commit 01f5944

File tree

6 files changed

+93
-45
lines changed

6 files changed

+93
-45
lines changed

‎libs/openFrameworks/utils/ofConstants.h

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ enum ofTargetPlatform{
100100
#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
101101
#include <TargetConditionals.h>
102102
// #include <unistd.h>
103-
104103
#if (TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_TV && !TARGET_OS_WATCH
105104
#define TARGET_OF_IPHONE
106105
#define TARGET_OF_IOS

‎libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ HEADER_RTAUDIO = "$(OF_PATH)/libs/rtaudio/include"
1717
HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include"
1818
HEADER_JSON = "$(OF_PATH)/libs/json/include"
1919
HEADER_GLM = "$(OF_PATH)/libs/glm/include"
20+
HEADER_FMT = "$(OF_PATH)/libs/fmt/include"
2021
HEADER_CURL = "$(OF_PATH)/libs/curl/include"
2122
HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
2223
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
@@ -32,11 +33,12 @@ LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/libofxiOS_${PLATFORM_NA
3233
//LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/ios/pugixml.a"
3334

3435

36+
3537
MISC_FLAGS = "-ObjC"
3638

3739
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
3840

39-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
41+
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
4042

4143
OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMotion -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore -framework CoreHaptics
4244

‎libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
BB24DECF10DA7A3F00E9C588 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
124124
BB24DED010DA7A3F00E9C588 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5326AEA710A23A0500278DE6 /* CoreLocation.framework */; };
125125
BB24DED110DA7A3F00E9C588 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB16EBD80F2B2AB500518274 /* QuartzCore.framework */; };
126+
BF4730B12BA4056B00E6E3C6 /* curl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF4730B02BA4056B00E6E3C6 /* curl.xcframework */; };
126127
BF7E59062BA203BC00E5C52E /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59052BA203BC00E5C52E /* FreeImage.xcframework */; };
127128
BF7E590C2BA204BC00E5C52E /* fmt.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590B2BA204BC00E5C52E /* fmt.xcframework */; };
128129
BF7E590E2BA204D300E5C52E /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E590D2BA204D300E5C52E /* freetype.xcframework */; };
@@ -131,8 +132,6 @@
131132
BF7E591A2BA2054700E5C52E /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59192BA2054700E5C52E /* tess2.xcframework */; };
132133
BF7E591C2BA2056600E5C52E /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591B2BA2056600E5C52E /* uriparser.xcframework */; };
133134
BF7E591E2BA2057A00E5C52E /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591D2BA2057900E5C52E /* zlib.xcframework */; };
134-
BF7E59202BA2068200E5C52E /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E591F2BA2068200E5C52E /* CoreHaptics.framework */; };
135-
BF7E59222BA206BD00E5C52E /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF7E59212BA206BD00E5C52E /* Metal.framework */; };
136135
E4F76E19176CB27200798745 /* of3dPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F76D6F176CB27200798745 /* of3dPrimitives.cpp */; };
137136
E4F76E1A176CB27200798745 /* of3dPrimitives.h in Headers */ = {isa = PBXBuildFile; fileRef = E4F76D70176CB27200798745 /* of3dPrimitives.h */; };
138137
E4F76E1B176CB27200798745 /* of3dUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4F76D71176CB27200798745 /* of3dUtils.cpp */; };
@@ -366,6 +365,7 @@
366365
BB16EBD80F2B2AB500518274 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
367366
BB24DED610DA7A3F00E9C588 /* libofxiOS_iphoneos_Debug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libofxiOS_iphoneos_Debug.a; sourceTree = BUILT_PRODUCTS_DIR; };
368367
BBE5EAB70F49AD8400F28951 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
368+
BF4730B02BA4056B00E6E3C6 /* curl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = curl.xcframework; path = ../../../curl/lib/macos/curl.xcframework; sourceTree = "<group>"; };
369369
BF7E59052BA203BC00E5C52E /* FreeImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FreeImage.xcframework; path = ../../../FreeImage/lib/macos/FreeImage.xcframework; sourceTree = "<group>"; };
370370
BF7E590B2BA204BC00E5C52E /* fmt.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = fmt.xcframework; path = ../../../fmt/lib/macos/fmt.xcframework; sourceTree = "<group>"; };
371371
BF7E590D2BA204D300E5C52E /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/macos/freetype.xcframework; sourceTree = "<group>"; };
@@ -374,8 +374,8 @@
374374
BF7E59192BA2054700E5C52E /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/macos/tess2.xcframework; sourceTree = "<group>"; };
375375
BF7E591B2BA2056600E5C52E /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/macos/uriparser.xcframework; sourceTree = "<group>"; };
376376
BF7E591D2BA2057900E5C52E /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/macos/zlib.xcframework; sourceTree = "<group>"; };
377-
BF7E591F2BA2068200E5C52E /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk/System/Library/Frameworks/CoreHaptics.framework; sourceTree = DEVELOPER_DIR; };
378-
BF7E59212BA206BD00E5C52E /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk/System/Library/Frameworks/Metal.framework; sourceTree = DEVELOPER_DIR; };
377+
BF94EDEC2BA58493009EF752 /* CoreHaptics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreHaptics.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk/System/Library/Frameworks/CoreHaptics.framework; sourceTree = DEVELOPER_DIR; };
378+
BF94EDED2BA58494009EF752 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk/System/Library/Frameworks/Metal.framework; sourceTree = DEVELOPER_DIR; };
379379
E41D3E9013B38BE900A75A5D /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CoreOF.xcconfig; sourceTree = SOURCE_ROOT; };
380380
E41D3E9113B38BE900A75A5D /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = SOURCE_ROOT; };
381381
E41D3E9213B38BE900A75A5D /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = SOURCE_ROOT; };
@@ -496,8 +496,6 @@
496496
isa = PBXFrameworksBuildPhase;
497497
buildActionMask = 2147483647;
498498
files = (
499-
BF7E59222BA206BD00E5C52E /* Metal.framework in Frameworks */,
500-
BF7E59202BA2068200E5C52E /* CoreHaptics.framework in Frameworks */,
501499
BF7E591E2BA2057A00E5C52E /* zlib.xcframework in Frameworks */,
502500
99752D331BF21EEE0026316A /* GameController.framework in Frameworks */,
503501
67D48ED01C10399900F719BC /* CoreMotion.framework in Frameworks */,
@@ -510,6 +508,7 @@
510508
BF7E59182BA2052D00E5C52E /* pugixml.xcframework in Frameworks */,
511509
BB24DECE10DA7A3F00E9C588 /* Foundation.framework in Frameworks */,
512510
BF7E590C2BA204BC00E5C52E /* fmt.xcframework in Frameworks */,
511+
BF4730B12BA4056B00E6E3C6 /* curl.xcframework in Frameworks */,
513512
BF7E59062BA203BC00E5C52E /* FreeImage.xcframework in Frameworks */,
514513
BB24DECF10DA7A3F00E9C588 /* CoreGraphics.framework in Frameworks */,
515514
BF7E591A2BA2054700E5C52E /* tess2.xcframework in Frameworks */,
@@ -679,6 +678,8 @@
679678
29B97323FDCFA39411CA2CEA /* core frameworks */ = {
680679
isa = PBXGroup;
681680
children = (
681+
BF94EDED2BA58494009EF752 /* Metal.framework */,
682+
BF94EDEC2BA58493009EF752 /* CoreHaptics.framework */,
682683
99752D321BF21EEE0026316A /* GameController.framework */,
683684
5E2E99DC10ED147800587639 /* MapKit.framework */,
684685
901808B8205362D7004A7774 /* GLKit.framework */,
@@ -986,8 +987,7 @@
986987
E9F39181299E892200280B58 /* Frameworks */ = {
987988
isa = PBXGroup;
988989
children = (
989-
BF7E59212BA206BD00E5C52E /* Metal.framework */,
990-
BF7E591F2BA2068200E5C52E /* CoreHaptics.framework */,
990+
BF4730B02BA4056B00E6E3C6 /* curl.xcframework */,
991991
BF7E591D2BA2057900E5C52E /* zlib.xcframework */,
992992
BF7E591B2BA2056600E5C52E /* uriparser.xcframework */,
993993
BF7E59192BA2054700E5C52E /* tess2.xcframework */,

‎libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig

+12-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ HEADER_RTAUDIO = "$(OF_PATH)/libs/rtaudio/include"
2020
HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include"
2121
HEADER_JSON = "$(OF_PATH)/libs/json/include"
2222
HEADER_GLM = "$(OF_PATH)/libs/glm/include"
23-
HEADER_FMT = "$(OF_PATH)/libs/glm/include"
23+
HEADER_FMT = "$(OF_PATH)/libs/fmt/include"
2424
HEADER_CURL = "$(OF_PATH)/libs/curl/include"
2525
HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
2626
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
@@ -30,13 +30,6 @@ LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/libtvOS+OFLib_${CONFIG
3030

3131
MISC_FLAGS = "-ObjC"
3232

33-
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
34-
35-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_FMT) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
36-
37-
OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore
38-
39-
4033
// BOOST can be enabled in OF Core by uncommenting this block
4134
//HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
4235
//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/tvos/boost_system.a"
@@ -45,6 +38,17 @@ OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AV
4538
//OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
4639
//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
4740

41+
//LIB_CURL = "-lcurl"
42+
43+
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
44+
45+
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_FMT) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
46+
47+
OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore
48+
49+
50+
51+
4852

4953
DEAD_CODE_STRIPPING = YES
5054
GCC_AUTO_VECTORIZATION = YES

0 commit comments

Comments
 (0)