File tree Expand file tree Collapse file tree
openFrameworksCompiled/project Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -436,37 +436,23 @@ typedef TESSindex ofIndexType;
436436#endif
437437
438438
439- #if defined(OF_USING_STD_FS)
440- #if defined(OF_USE_EXPERIMENTAL_FS)
441- // C++17 experimental fs support
442- #include < experimental/filesystem>
443- namespace std {
444- namespace experimental{
445- namespace filesystem {
446- using path = v1::path;
447- }
439+ #if defined(OF_USE_EXPERIMENTAL_FS)
440+ // C++17 experimental fs support
441+ #include < experimental/filesystem>
442+ namespace std {
443+ namespace experimental{
444+ namespace filesystem {
445+ using path = v1::path;
448446 }
449447 }
448+ }
450449
451- namespace of {
452- namespace filesystem = std::experimental::filesystem;
453- }
454- #else
455- #include < filesystem>
456- namespace of {
457- namespace filesystem = std::filesystem;
458- }
459- #endif
460- #else // not OF_USING_STD_FS
461- // No experimental or c++17 filesytem support use boost
462- #if !_MSC_VER
463- #define BOOST_NO_CXX11_SCOPED_ENUMS
464- #define BOOST_NO_SCOPED_ENUMS
465- #endif
466-
467- #include < boost/filesystem.hpp>
468450 namespace of {
469- namespace filesystem = boost::filesystem;
451+ namespace filesystem = std::experimental::filesystem;
452+ }
453+ #else
454+ #include < filesystem>
455+ namespace of {
456+ namespace filesystem = std::filesystem;
470457 }
471-
472458#endif
Original file line number Diff line number Diff line change @@ -50,14 +50,6 @@ OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_G
5050OF_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 Foundation -framework IOKit -framework OpenGL -framework QuartzCore -framework Security -framework SystemConfiguration -framework Metal
5151
5252
53- // BOOST can be enabled in OF Core by uncommenting this block
54- //HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
55- //LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
56- //LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
57- //LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
58- //OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
59- //OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
60-
6153
6254ALWAYS_SEARCH_USER_PATHS = NO
6355DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES
Original file line number Diff line number Diff line change @@ -31,14 +31,6 @@ LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/openFrameworkstv
3131
3232MISC_FLAGS = "-ObjC"
3333
34- // BOOST can be enabled in OF Core by uncommenting this block
35- //HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
36- //LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/tvos/boost_system.a"
37- //LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/tvos/boost_filesystem.a"
38- //LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS)
39- //OF_CORE_LIBS = $(inherited) $(LIB_BOOST)
40- //OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
41-
4234//LIB_CURL = "-lcurl"
4335
4436OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
Original file line number Diff line number Diff line change @@ -67,13 +67,6 @@ GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS)
6767//OF_BUNDLE_DATA_FOLDER = 1
6868//OF_BUNDLE_DYLIBS = 1
6969
70- // BOOST - UNCOMMENT BELOW TO ENABLE BOOST
71- //HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
72- //LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
73- //LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
74- //OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM)
75- //OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
76-
7770// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
7871#include? "App.xcconfig"
7972
Original file line number Diff line number Diff line change @@ -63,13 +63,6 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)
6363//OF_BUNDLE_DATA_FOLDER = 1
6464//OF_BUNDLE_DYLIBS = 1
6565
66- // BOOST - UNCOMMENT BELOW TO ENABLE BOOST
67- //HEADER_BOOST = "$(OF_PATH)/libs/boost/include"
68- //LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a"
69- //LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a"
70- //OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM)
71- //OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
72-
7366HIGH_RESOLUTION_CAPABLE = NO
7467
7568// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
Original file line number Diff line number Diff line change 44 "OF_LIBS_ROOT" : " ${OF_ROOT}/libs" ,
55 "OF_INCLUDE" : [" ${OF_LIBS_ROOT}/openFrameworks/**" ],
66 "OF_LIBS_INCLUDE" : [
7- " ${OF_LIBS_ROOT}/boost/include" ,
87 " ${OF_LIBS_ROOT}/cairo/include/cairo" ,
98 " ${OF_LIBS_ROOT}/curl/include" ,
109 " ${OF_LIBS_ROOT}/fmod/include" ,
You can’t perform that action at this time.
0 commit comments