Skip to content

Commit aa774a7

Browse files
dimitredimitre
authored
Removing Boost paths from OF XCode project (#7837)
#changelog #xcode
1 parent afe17ae commit aa774a7

13 files changed

Lines changed: 1288 additions & 4983 deletions

File tree

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

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
// once all libraries are compiled for libc++ / all architectures
2+
CLANG_CXX_LIBRARY = libc++
3+
CLANG_ENABLE_OBJC_ARC = YES
4+
CLANG_CXX_LANGUAGE_STANDARD = c++17
5+
IPHONEOS_DEPLOYMENT_TARGET = 13.0
6+
7+
18
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
29
HEADER_OFXIOS = "$(OF_PATH)/addons/ofxiOS/**"
310
HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
@@ -7,7 +14,6 @@ HEADER_GLEW = "$(OF_PATH)/libs/glew/include"
714
HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include"
815
HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
916
HEADER_RTAUDIO = "$(OF_PATH)/libs/rtaudio/include"
10-
//HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
1117
HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include"
1218
HEADER_JSON = "$(OF_PATH)/libs/json/include"
1319
HEADER_GLM = "$(OF_PATH)/libs/glm/include"
@@ -21,27 +27,28 @@ LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/ios/libofxiOS_${PLATFORM_NA
2127
LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/ios/freeimage.a"
2228
LIB_FREETYPE = "$(OF_PATH)/libs/freetype/lib/ios/freetype.a"
2329
LIB_TESS = "$(OF_PATH)/libs/tess2/lib/ios/tess2.a"
24-
//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/ios/boost_system.a"
25-
//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/ios/boost_filesystem.a"
26-
//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
2730
LIB_CURL = "$(OF_PATH)/libs/curl/lib/ios/curl.a"
2831
LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/ios/uriparser.a"
2932
LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/ios/pugixml.a"
3033

3134

3235
MISC_FLAGS = "-ObjC"
3336

34-
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_BOOST) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_OPENSSL) $(LIB_TESS) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML) $(LIB_OF)
37+
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_OPENSSL) $(LIB_TESS) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML) $(LIB_OF)
3538

36-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_BOOST) $(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)
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)
3740

3841
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
3942

40-
// once all libraries are compiled for libc++ / all architectures
41-
CLANG_CXX_LIBRARY = libc++
42-
CLANG_CXX_LANGUAGE_STANDARD = c++17
43-
IPHONEOS_DEPLOYMENT_TARGET = 13.0
44-
CLANG_ENABLE_OBJC_ARC = YES
43+
44+
// BOOST can be enabled in OF Core by uncommenting this block
45+
//HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
46+
//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/ios/boost_system.a"
47+
//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/ios/boost_filesystem.a"
48+
//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
49+
//OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
50+
//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
51+
4552

4653

4754
//COMPILER SETTINGS WHICH CAN BE OVERRIDDEN BY XCODE BUILD SETTINGS
@@ -64,15 +71,26 @@ CLANG_WARN_STRICT_PROTOTYPES = YES
6471
CLANG_WARN_SUSPICIOUS_MOVE = YES
6572
CLANG_WARN_UNREACHABLE_CODE = YES
6673
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
67-
ENABLE_STRICT_OBJC_MSGSEND = YES
74+
GCC_AUTO_VECTORIZATION = YES
75+
GCC_ENABLE_SSE3_EXTENSIONS = YES
76+
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES
77+
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
78+
GCC_MODEL_TUNING = G5
79+
GCC_NO_COMMON_BLOCKS = YES
80+
GCC_SYMBOLS_PRIVATE_EXTERN = NO
81+
GCC_WARN_64_TO_32_BIT_CONVERSION = NO
6882
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES
6983
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
84+
GCC_WARN_ABOUT_RETURN_TYPE = YES
7085
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
7186
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO
7287
GCC_WARN_UNDECLARED_SELECTOR = YES
73-
GCC_WARN_UNINITIALIZED_AUTOS = NO
88+
GCC_WARN_UNINITIALIZED_AUTOS = YES
7489
GCC_WARN_UNUSED_FUNCTION = YES
7590
GCC_WARN_UNUSED_VALUE = NO
7691
GCC_WARN_UNUSED_VARIABLE = NO
77-
GCC_NO_COMMON_BLOCKS = YES
78-
GCC_WARN_64_TO_32_BIT_CONVERSION = NO
92+
93+
COMPILER_INDEX_STORE_ENABLE = NO
94+
DEAD_CODE_STRIPPING = YES
95+
ENABLE_BITCODE = NO
96+
ENABLE_STRICT_OBJC_MSGSEND = YES

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
#include "Shared.xcconfig"
2-
3-
COPY_PHASE_STRIP = NO
4-
GCC_OPTIMIZATION_LEVEL = 0
5-
OTHER_CPLUSPLUSFLAGS = -D__MACOSX_CORE__

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
#include "Shared.xcconfig"
22

3-
COPY_PHASE_STRIP = YES
4-
GCC_OPTIMIZATION_LEVEL = s
5-
GCC_UNROLL_LOOPS = YES
6-
OTHER_CPLUSPLUSFLAGS = -D__MACOSX_CORE__ -DNDEBUG
7-
ZERO_LINK = NO

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

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,23 @@
22
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
33
OF_PATH = ../../../..
44

5-
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
5+
// All headers and libs for OF Core
66
#include "CoreOF.xcconfig"
77

88
OTHER_CFLAGS = $(OF_CORE_CFLAGS)
99
OTHER_LDFLAGS = $(OF_CORE_LIBS)
1010
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
1111

1212
CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/
13-
DEAD_CODE_STRIPPING = YES
14-
GCC_AUTO_VECTORIZATION = YES
15-
ENABLE_BITCODE = NO
16-
COMPILER_INDEX_STORE_ENABLE = NO
1713

18-
GCC_ENABLE_SSE3_EXTENSIONS = YES
19-
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES
20-
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
21-
GCC_MODEL_TUNING = G5
22-
GCC_SYMBOLS_PRIVATE_EXTERN = NO
23-
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO
24-
GCC_WARN_UNINITIALIZED_AUTOS = YES
25-
GCC_WARN_UNUSED_VALUE = NO
26-
GCC_WARN_UNUSED_VARIABLE = NO
27-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES
28-
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
29-
GCC_WARN_ABOUT_RETURN_TYPE = YES
14+
COPY_PHASE_STRIP[config=Debug] = NO
15+
COPY_PHASE_STRIP[config=Release] = YES
16+
17+
GCC_OPTIMIZATION_LEVEL[config=Debug] = 0
18+
GCC_OPTIMIZATION_LEVEL[config=Release] = s
19+
20+
OTHER_CPLUSPLUSFLAGS[config=Debug] = $(inherited) -D__MACOSX_CORE__
21+
OTHER_CPLUSPLUSFLAGS[config=Release] = $(inherited) -D__MACOSX_CORE__ -DNDEBUG
22+
23+
GCC_UNROLL_LOOPS[config=Release] = YES
24+
ZERO_LINK[config=Release] = NO

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,9 @@
634634
isa = PBXGroup;
635635
children = (
636636
E41D3E9013B38BE900A75A5D /* CoreOF.xcconfig */,
637+
E41D3E9313B38BE900A75A5D /* Shared.xcconfig */,
637638
E41D3E9113B38BE900A75A5D /* Debug.xcconfig */,
638639
E41D3E9213B38BE900A75A5D /* Release.xcconfig */,
639-
E41D3E9313B38BE900A75A5D /* Shared.xcconfig */,
640640
BB16F26B0F2B646B00518274 /* addons */,
641641
E4F76D69176CB27200798745 /* openFrameworks */,
642642
BB16E9930F2B1E5900518274 /* libs */,

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

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
//// define which C++ library is required to build, based on target architecture
1+
// define which C++ library is required to build, based on target architecture
22
CLANG_CXX_LIBRARY = libc++
3-
CLANG_CXX_LANGUAGE_STANDARD = c++14
4-
53
CLANG_ENABLE_OBJC_ARC = YES
6-
4+
CLANG_CXX_LANGUAGE_STANDARD = c++14
75
MACOSX_DEPLOYMENT_TARGET = 10.13
86

97

@@ -17,14 +15,17 @@ HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
1715
HEADER_CAIRO = "$(OF_PATH)/libs/cairo/include/cairo"
1816
HEADER_RTAUDIO = "$(OF_PATH)/libs/rtAudio/include"
1917
HEADER_GLFW = "$(OF_PATH)/libs/glfw/include"
20-
HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
2118
HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include"
2219
HEADER_JSON = "$(OF_PATH)/libs/json/include"
2320
HEADER_GLM = "$(OF_PATH)/libs/glm/include"
2421
HEADER_CURL = ""
2522
HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include"
2623
HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
2724

25+
//------- Libraries
26+
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworks.a"
27+
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworksDebug.a"
28+
2829
LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/osx/libfmod.dylib"
2930
LIB_GLFW = "$(OF_PATH)/libs/glfw/lib/osx/glfw3.a"
3031
LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a"
@@ -35,22 +36,25 @@ LIB_TESS = "$(OF_PATH)/libs/tess2/lib/osx/tess2.a"
3536
LIB_CAIRO1 = "$(OF_PATH)/libs/cairo/lib/osx/cairo-script-interpreter.a"
3637
LIB_CAIRO2 = "$(OF_PATH)/libs/cairo/lib/osx/cairo.a"
3738
LIB_CAIRO3 = "$(OF_PATH)/libs/cairo/lib/osx/pixman-1.a"
38-
LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
39-
LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
4039
LIB_CURL = "-lcurl"
4140
LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a"
4241
LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a"
4342

44-
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworks.a"
45-
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/osx/openFrameworksDebug.a"
4643

47-
OF_CORE_LIBS = $(LIB_TESS) $(LIB_GLEW) $(LIB_CAIRO1) $(LIB_CAIRO2) $(LIB_CAIRO3) $(LIB_FMOD) $(LIB_RTAUDIO) $(LIB_GLFW) $(LIB_FREEIMAGE) $(LIB_FREETYPE) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM) $(LIB_CURL) $(LIB_URIPARSER) $(LIB_PUGIXML)
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)
4845

46+
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)
4947

50-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_CAIRO) $(HEADER_RTAUDIO) $(HEADER_GLFW) $(HEADER_BOOST) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
48+
OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -framework ApplicationServices -framework AudioToolbox -framework AVFoundation -framework Cocoa -framework CoreAudio -framework CoreFoundation -framework CoreMedia -framework CoreServices -framework CoreVideo -framework IOKit -framework OpenGL -framework QuartzCore -framework Security
5149

5250

53-
OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -framework ApplicationServices -framework AudioToolbox -framework AVFoundation -framework Cocoa -framework CoreAudio -framework CoreFoundation -framework CoreMedia -framework CoreServices -framework CoreVideo -framework IOKit -framework OpenGL -framework QuartzCore -framework Security
51+
// BOOST can be enabled in OF Core by uncommenting this block
52+
//HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
53+
//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
54+
//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
55+
//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
56+
//OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
57+
//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
5458

5559

5660
ALWAYS_SEARCH_USER_PATHS = NO
@@ -78,31 +82,34 @@ CLANG_WARN_STRICT_PROTOTYPES = YES
7882
CLANG_WARN_SUSPICIOUS_MOVE = YES
7983
CLANG_WARN_UNREACHABLE_CODE = YES
8084
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
81-
ENABLE_STRICT_OBJC_MSGSEND = YES
85+
GCC_AUTO_VECTORIZATION = YES
86+
GCC_ENABLE_SSE3_EXTENSIONS = YES
87+
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES
88+
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
89+
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
90+
GCC_MODEL_TUNING = G5
91+
GCC_MODEL_TUNING = NONE
92+
GCC_NO_COMMON_BLOCKS = YES
93+
GCC_SYMBOLS_PRIVATE_EXTERN = NO
94+
GCC_WARN_64_TO_32_BIT_CONVERSION = NO
8295
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES
8396
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
8497
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR
8598
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO
8699
GCC_WARN_UNDECLARED_SELECTOR = YES
87-
GCC_WARN_UNINITIALIZED_AUTOS = NO
100+
GCC_WARN_UNINITIALIZED_AUTOS = YES
88101
GCC_WARN_UNUSED_FUNCTION = YES
89102
GCC_WARN_UNUSED_VALUE = NO
90103
GCC_WARN_UNUSED_VARIABLE = NO
91-
GCC_NO_COMMON_BLOCKS = YES
92-
GCC_WARN_64_TO_32_BIT_CONVERSION = NO
93104

105+
ENABLE_STRICT_OBJC_MSGSEND = YES
94106
DEAD_CODE_STRIPPING = YES
95-
GCC_AUTO_VECTORIZATION = YES
96-
GCC_ENABLE_SSE3_EXTENSIONS = YES
97-
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES
98-
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
99-
GCC_SYMBOLS_PRIVATE_EXTERN = NO
100107
ONLY_ACTIVE_ARCH = YES
101108
OTHER_CODE_SIGN_FLAGS = --deep
102-
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
103-
GCC_MODEL_TUNING = NONE
104109
COMBINE_HIDPI_IMAGES = YES
105110
INSTALL_PATH = /Applications
106111
SDKROOT = macosx
107112
WRAPPER_EXTENSION = app
108-
CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/
113+
114+
115+
SKIP_INSTALL = YES

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,24 @@
22
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
33
OF_PATH = ../../../..
44

5-
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
5+
// All headers and libs for OF Core
66
#include "CoreOF.xcconfig"
77

88
OTHER_CFLAGS = $(OF_CORE_CFLAGS)
99
OTHER_LDFLAGS = $(OF_CORE_LIBS)
1010
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
1111

1212
CONFIGURATION_BUILD_DIR = $(SRCROOT)/bin/
13-
DEAD_CODE_STRIPPING = YES
14-
GCC_AUTO_VECTORIZATION = YES
15-
16-
GCC_ENABLE_SSE3_EXTENSIONS = YES
17-
GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS = YES
18-
GCC_INLINES_ARE_PRIVATE_EXTERN = NO
19-
GCC_MODEL_TUNING = G5
20-
GCC_SYMBOLS_PRIVATE_EXTERN = NO
21-
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO
22-
GCC_WARN_UNINITIALIZED_AUTOS = YES
23-
GCC_WARN_UNUSED_VALUE = NO
24-
GCC_WARN_UNUSED_VARIABLE = NO
25-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES
26-
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
27-
GCC_WARN_ABOUT_RETURN_TYPE = YES
2813

2914
COPY_PHASE_STRIP[config=Debug] = NO
3015
COPY_PHASE_STRIP[config=Release] = YES
3116

32-
OTHER_CPLUSPLUSFLAGS = -D__MACOSX_CORE__
33-
OTHER_CPLUSPLUSFLAGS[config=Release] = $(inherited) -DNDEBUG
17+
GCC_OPTIMIZATION_LEVEL[config=Debug] = 0
3418
GCC_OPTIMIZATION_LEVEL[config=Release] = 3
19+
20+
OTHER_CPLUSPLUSFLAGS[config=Debug] = $(inherited) -D__MACOSX_CORE__
21+
OTHER_CPLUSPLUSFLAGS[config=Release] = $(inherited) -DNDEBUG
22+
3523
GCC_UNROLL_LOOPS[config=Release] = YES
3624
ZERO_LINK[config=Release] = NO
25+
GCC_FAST_MATH[config=Release] = NO

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@
465465
E4B69B4A0A3A1720003C02F2 = {
466466
isa = PBXGroup;
467467
children = (
468-
E432815E138ABFDD0047C5CB /* Shared.xcconfig */,
469468
E4EB6916138AFC8500A09F29 /* CoreOF.xcconfig */,
469+
E432815E138ABFDD0047C5CB /* Shared.xcconfig */,
470470
E432815F138AC0470047C5CB /* Debug.xcconfig */,
471471
E4328160138AC04A0047C5CB /* Release.xcconfig */,
472472
E4B27AAA10CBE92A00536013 /* openFrameworks */,
@@ -853,9 +853,7 @@
853853
E4B27C1610CBEB8E00536013 /* Debug */ = {
854854
isa = XCBuildConfiguration;
855855
buildSettings = {
856-
COMBINE_HIDPI_IMAGES = YES;
857856
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/";
858-
COPY_PHASE_STRIP = NO;
859857
EXECUTABLE_PREFIX = "";
860858
INSTALL_PATH = /usr/local/lib;
861859
LIBRARY_SEARCH_PATHS = (
@@ -873,19 +871,15 @@
873871
OBJROOT = "$(SRCROOT)/../../lib/osx/build/debug/";
874872
PRODUCT_NAME = openFrameworksDebug;
875873
SDKROOT = "";
876-
SKIP_INSTALL = YES;
877874
};
878875
name = Debug;
879876
};
880877
E4B27C1710CBEB8E00536013 /* Release */ = {
881878
isa = XCBuildConfiguration;
882879
buildSettings = {
883-
COMBINE_HIDPI_IMAGES = YES;
884880
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../lib/osx/";
885-
COPY_PHASE_STRIP = YES;
886881
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
887882
EXECUTABLE_PREFIX = "";
888-
GCC_FAST_MATH = NO;
889883
INSTALL_PATH = /usr/local/lib;
890884
LIBRARY_SEARCH_PATHS = (
891885
"$(inherited)",
@@ -902,7 +896,6 @@
902896
OBJROOT = "$(SRCROOT)/../../lib/osx/build/release/";
903897
PRODUCT_NAME = openFrameworks;
904898
SDKROOT = "";
905-
SKIP_INSTALL = YES;
906899
};
907900
name = Release;
908901
};

0 commit comments

Comments
 (0)