Skip to content

Commit e696dbb

Browse files
danoli3danoli3
committed
Xcode Project Updates to XCFrameworks C++17 - Bleeding Edge
1 parent 05db383 commit e696dbb

File tree

3 files changed

+72
-15
lines changed

3 files changed

+72
-15
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,4 @@ projectGenerator*/
138138
libs/openFrameworksCompiled/project/vs/.vs/
139139
scripts/templates/vs/.vs/
140140
**/.vs/
141+
libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/xcshareddata

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// define which C++ library is required to build, based on target architecture
22
CLANG_CXX_LIBRARY = libc++
33
CLANG_ENABLE_OBJC_ARC = YES
4-
CLANG_CXX_LANGUAGE_STANDARD = c++14
5-
MACOSX_DEPLOYMENT_TARGET = 10.13
4+
CLANG_CXX_LANGUAGE_STANDARD = c++17
5+
MACOSX_DEPLOYMENT_TARGET = 10.15
66

77

88
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
@@ -27,21 +27,21 @@ LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworks.a"
2727
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworksDebug.a"
2828

2929
LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/osx/libfmod.dylib"
30-
LIB_GLFW = "$(OF_PATH)/libs/glfw/lib/osx/glfw3.a"
31-
LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a"
32-
LIB_FREETYPE = "$(OF_PATH)/libs/freetype/lib/osx/freetype.a"
33-
LIB_GLEW = "$(OF_PATH)/libs/glew/lib/osx/glew.a"
34-
LIB_RTAUDIO = "$(OF_PATH)/libs/rtAudio/lib/osx/rtaudio.a"
35-
LIB_TESS = "$(OF_PATH)/libs/tess2/lib/osx/tess2.a"
36-
LIB_CAIRO1 = "$(OF_PATH)/libs/cairo/lib/osx/cairo-script-interpreter.a"
37-
LIB_CAIRO2 = "$(OF_PATH)/libs/cairo/lib/osx/cairo.a"
38-
LIB_CAIRO3 = "$(OF_PATH)/libs/cairo/lib/osx/pixman-1.a"
30+
//LIB_GLFW = "$(OF_PATH)/libs/glfw/lib/osx/glfw3.a"
31+
//LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a"
32+
//LIB_FREETYPE = "$(OF_PATH)/libs/freetype/lib/osx/freetype.a"
33+
//LIB_GLEW = "$(OF_PATH)/libs/glew/lib/osx/glew.a"
34+
//LIB_RTAUDIO = "$(OF_PATH)/libs/rtAudio/lib/osx/rtaudio.a"
35+
//LIB_TESS = "$(OF_PATH)/libs/tess2/lib/osx/tess2.a"
36+
//LIB_CAIRO1 = "$(OF_PATH)/libs/cairo/lib/osx/cairo-script-interpreter.a"
37+
//LIB_CAIRO2 = "$(OF_PATH)/libs/cairo/lib/osx/cairo.a"
38+
//LIB_CAIRO3 = "$(OF_PATH)/libs/cairo/lib/osx/pixman-1.a"
3939
LIB_CURL = "-lcurl"
40-
LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a"
41-
LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a"
40+
//LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a"
41+
//LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a"
4242

4343

44-
OF_CORE_LIBS = $(LIB_TESS) $(LIB_GLEW) $(LIB_CAIRO1) $(LIB_CAIRO2) $(LIB_CAIRO3) $(LIB_FMOD) $(LIB_RTAUDIO) $(LIB_GLFW) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML)
44+
OF_CORE_LIBS = $(LIB_FMOD) $(LIB_CURL)
4545

4646
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_CAIRO) $(HEADER_RTAUDIO) $(HEADER_GLFW) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
4747

‎libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -59,6 +59,18 @@
5959
9979E8231A1CCC44007E55D1 /* ofMainLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */; };
6060
9979E8241A1CCC44007E55D1 /* ofMainLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 9979E8211A1CCC44007E55D1 /* ofMainLoop.h */; };
6161
BBA81C431FFBE4DB0064EA94 /* ofBaseApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */; };
62+
BF5BF8402B737C0A0049DEF6 /* zlib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */; };
63+
BF5BF8422B737C700049DEF6 /* uriparser.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8412B737C700049DEF6 /* uriparser.xcframework */; };
64+
BF5BF8442B737C7C0049DEF6 /* tess2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */; };
65+
BF5BF8462B737C870049DEF6 /* rtAudio.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */; };
66+
BF5BF8482B737D280049DEF6 /* pugixml.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8472B737D280049DEF6 /* pugixml.xcframework */; };
67+
BF5BF84A2B737E260049DEF6 /* cairo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8492B737E260049DEF6 /* cairo.xcframework */; };
68+
BF5BF84C2B737E320049DEF6 /* FreeImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */; };
69+
BF5BF84E2B737E3B0049DEF6 /* freetype.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */; };
70+
BF5BF8502B737E440049DEF6 /* glew.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF84F2B737E440049DEF6 /* glew.xcframework */; };
71+
BF5BF8522B737E4E0049DEF6 /* glfw.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */; };
72+
BF5BF8542B737E880049DEF6 /* libpng.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8532B737E880049DEF6 /* libpng.xcframework */; };
73+
BF5BF8562B737E930049DEF6 /* pixman.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5BF8552B737E930049DEF6 /* pixman.xcframework */; };
6274
DA48FE78131D85A6000062BC /* ofPolyline.h in Headers */ = {isa = PBXBuildFile; fileRef = DA48FE74131D85A6000062BC /* ofPolyline.h */; };
6375
DA94C2F01301D32200CCC773 /* ofRendererCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */; };
6476
DA97FD3C12F5A61A005C9991 /* ofCairoRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */; };
@@ -216,6 +228,18 @@
216228
9979E8201A1CCC44007E55D1 /* ofMainLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofMainLoop.cpp; sourceTree = "<group>"; };
217229
9979E8211A1CCC44007E55D1 /* ofMainLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofMainLoop.h; sourceTree = "<group>"; };
218230
BBA81C421FFBE4DB0064EA94 /* ofBaseApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofBaseApp.cpp; sourceTree = "<group>"; };
231+
BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = zlib.xcframework; path = ../../../zlib/lib/osx/zlib.xcframework; sourceTree = "<group>"; };
232+
BF5BF8412B737C700049DEF6 /* uriparser.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = uriparser.xcframework; path = ../../../uriparser/lib/osx/uriparser.xcframework; sourceTree = "<group>"; };
233+
BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = tess2.xcframework; path = ../../../tess2/lib/osx/tess2.xcframework; sourceTree = "<group>"; };
234+
BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = rtAudio.xcframework; path = ../../../rtAudio/lib/osx/rtAudio.xcframework; sourceTree = "<group>"; };
235+
BF5BF8472B737D280049DEF6 /* pugixml.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pugixml.xcframework; path = ../../../pugixml/lib/osx/pugixml.xcframework; sourceTree = "<group>"; };
236+
BF5BF8492B737E260049DEF6 /* cairo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = cairo.xcframework; path = ../../../cairo/lib/osx/cairo.xcframework; sourceTree = "<group>"; };
237+
BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FreeImage.xcframework; path = ../../../FreeImage/lib/osx/FreeImage.xcframework; sourceTree = "<group>"; };
238+
BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = freetype.xcframework; path = ../../../freetype/lib/osx/freetype.xcframework; sourceTree = "<group>"; };
239+
BF5BF84F2B737E440049DEF6 /* glew.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glew.xcframework; path = ../../../glew/lib/osx/glew.xcframework; sourceTree = "<group>"; };
240+
BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = glfw.xcframework; path = ../../../glfw/lib/osx/glfw.xcframework; sourceTree = "<group>"; };
241+
BF5BF8532B737E880049DEF6 /* libpng.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpng.xcframework; path = ../../../libpng/lib/osx/libpng.xcframework; sourceTree = "<group>"; };
242+
BF5BF8552B737E930049DEF6 /* pixman.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = pixman.xcframework; path = ../../../pixman/lib/osx/pixman.xcframework; sourceTree = "<group>"; };
219243
DA48FE74131D85A6000062BC /* ofPolyline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofPolyline.h; sourceTree = "<group>"; };
220244
DA94C2ED1301D32200CCC773 /* ofRendererCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofRendererCollection.h; sourceTree = "<group>"; };
221245
DA97FD3612F5A61A005C9991 /* ofCairoRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofCairoRenderer.cpp; sourceTree = "<group>"; };
@@ -338,12 +362,43 @@
338362
isa = PBXFrameworksBuildPhase;
339363
buildActionMask = 2147483647;
340364
files = (
365+
BF5BF8502B737E440049DEF6 /* glew.xcframework in Frameworks */,
366+
BF5BF8542B737E880049DEF6 /* libpng.xcframework in Frameworks */,
367+
BF5BF84A2B737E260049DEF6 /* cairo.xcframework in Frameworks */,
368+
BF5BF8442B737C7C0049DEF6 /* tess2.xcframework in Frameworks */,
369+
BF5BF8402B737C0A0049DEF6 /* zlib.xcframework in Frameworks */,
370+
BF5BF84C2B737E320049DEF6 /* FreeImage.xcframework in Frameworks */,
371+
BF5BF8462B737C870049DEF6 /* rtAudio.xcframework in Frameworks */,
372+
BF5BF8422B737C700049DEF6 /* uriparser.xcframework in Frameworks */,
373+
BF5BF8522B737E4E0049DEF6 /* glfw.xcframework in Frameworks */,
374+
BF5BF8482B737D280049DEF6 /* pugixml.xcframework in Frameworks */,
375+
BF5BF8562B737E930049DEF6 /* pixman.xcframework in Frameworks */,
376+
BF5BF84E2B737E3B0049DEF6 /* freetype.xcframework in Frameworks */,
341377
);
342378
runOnlyForDeploymentPostprocessing = 0;
343379
};
344380
/* End PBXFrameworksBuildPhase section */
345381

346382
/* Begin PBXGroup section */
383+
BF5BF83E2B7378ED0049DEF6 /* frameworks */ = {
384+
isa = PBXGroup;
385+
children = (
386+
BF5BF8552B737E930049DEF6 /* pixman.xcframework */,
387+
BF5BF8532B737E880049DEF6 /* libpng.xcframework */,
388+
BF5BF8512B737E4E0049DEF6 /* glfw.xcframework */,
389+
BF5BF84F2B737E440049DEF6 /* glew.xcframework */,
390+
BF5BF84D2B737E3B0049DEF6 /* freetype.xcframework */,
391+
BF5BF84B2B737E320049DEF6 /* FreeImage.xcframework */,
392+
BF5BF8492B737E260049DEF6 /* cairo.xcframework */,
393+
BF5BF8472B737D280049DEF6 /* pugixml.xcframework */,
394+
BF5BF8452B737C870049DEF6 /* rtAudio.xcframework */,
395+
BF5BF8432B737C7C0049DEF6 /* tess2.xcframework */,
396+
BF5BF8412B737C700049DEF6 /* uriparser.xcframework */,
397+
BF5BF83F2B737C0A0049DEF6 /* zlib.xcframework */,
398+
);
399+
name = frameworks;
400+
sourceTree = "<group>";
401+
};
347402
DACFA8C8132D09C7008D4B7A /* gl */ = {
348403
isa = PBXGroup;
349404
children = (
@@ -471,6 +526,7 @@
471526
E4328160138AC04A0047C5CB /* Release.xcconfig */,
472527
E4B27AAA10CBE92A00536013 /* openFrameworks */,
473528
E4B27C1510CBEB8E00536013 /* openFrameworksDebug.a */,
529+
BF5BF83E2B7378ED0049DEF6 /* frameworks */,
474530
);
475531
indentWidth = 4;
476532
sourceTree = "<group>";

0 commit comments

Comments
 (0)