diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 2dcbf0c5034..6679a41890f 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -436,37 +436,23 @@ typedef TESSindex ofIndexType; #endif -#if defined(OF_USING_STD_FS) - #if defined(OF_USE_EXPERIMENTAL_FS) - // C++17 experimental fs support - #include - namespace std { - namespace experimental{ - namespace filesystem { - using path = v1::path; - } +#if defined(OF_USE_EXPERIMENTAL_FS) + // C++17 experimental fs support + #include + namespace std { + namespace experimental{ + namespace filesystem { + using path = v1::path; } } + } - namespace of { - namespace filesystem = std::experimental::filesystem; - } - #else - #include - namespace of { - namespace filesystem = std::filesystem; - } - #endif -#else //not OF_USING_STD_FS - // No experimental or c++17 filesytem support use boost - #if !_MSC_VER - #define BOOST_NO_CXX11_SCOPED_ENUMS - #define BOOST_NO_SCOPED_ENUMS - #endif - - #include namespace of { - namespace filesystem = boost::filesystem; + namespace filesystem = std::experimental::filesystem; + } +#else + #include + namespace of { + namespace filesystem = std::filesystem; } - #endif diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index cf89c2a3038..f13fa788fae 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -50,14 +50,6 @@ OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_G 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 Foundation -framework IOKit -framework OpenGL -framework QuartzCore -framework Security -framework SystemConfiguration -framework Metal -// BOOST can be enabled in OF Core by uncommenting this block -//HEADER_BOOST = "$(OF_PATH)/libs/boost/include" -//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a" -//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a" -//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS) -//OF_CORE_LIBS = $(inherited) $(LIB_BOOST) -//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST) - ALWAYS_SEARCH_USER_PATHS = NO DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES diff --git a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig index 89eacc40ec7..230098f9cac 100644 --- a/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig @@ -31,14 +31,6 @@ LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/tvos/openFrameworkstv MISC_FLAGS = "-ObjC" -// BOOST can be enabled in OF Core by uncommenting this block -//HEADER_BOOST = "$(OF_PATH)/libs/boost/include" -//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/tvos/boost_system.a" -//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/tvos/boost_filesystem.a" -//LIB_BOOST = $(LIB_BOOST_SYSTEM) $(LIB_BOOST_FS) -//OF_CORE_LIBS = $(inherited) $(LIB_BOOST) -//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST) - //LIB_CURL = "-lcurl" OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF) diff --git a/scripts/templates/macos/Project.xcconfig b/scripts/templates/macos/Project.xcconfig index 3fb4cff2894..4dc5ec5b058 100644 --- a/scripts/templates/macos/Project.xcconfig +++ b/scripts/templates/macos/Project.xcconfig @@ -67,13 +67,6 @@ GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS) //OF_BUNDLE_DATA_FOLDER = 1 //OF_BUNDLE_DYLIBS = 1 -// BOOST - UNCOMMENT BELOW TO ENABLE BOOST -//HEADER_BOOST = "$(OF_PATH)/libs/boost/include" -//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a" -//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a" -//OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM) -//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST) - // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" diff --git a/scripts/templates/osx/Project.xcconfig b/scripts/templates/osx/Project.xcconfig index 72b6574c7f1..418b44744a6 100644 --- a/scripts/templates/osx/Project.xcconfig +++ b/scripts/templates/osx/Project.xcconfig @@ -63,13 +63,6 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) //OF_BUNDLE_DATA_FOLDER = 1 //OF_BUNDLE_DYLIBS = 1 -// BOOST - UNCOMMENT BELOW TO ENABLE BOOST -//HEADER_BOOST = "$(OF_PATH)/libs/boost/include" -//LIB_BOOST_SYSTEM = "$(OF_PATH)/libs/boost/lib/osx/boost_system.a" -//LIB_BOOST_FS = "$(OF_PATH)/libs/boost/lib/osx/boost_filesystem.a" -//OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM) -//OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST) - HIGH_RESOLUTION_CAPABLE = NO // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. diff --git a/scripts/templates/vscode/.vscode/c_cpp_properties.json b/scripts/templates/vscode/.vscode/c_cpp_properties.json index 4ae6c2ee53e..7b1fa035ae1 100644 --- a/scripts/templates/vscode/.vscode/c_cpp_properties.json +++ b/scripts/templates/vscode/.vscode/c_cpp_properties.json @@ -4,7 +4,6 @@ "OF_LIBS_ROOT": "${OF_ROOT}/libs", "OF_INCLUDE": ["${OF_LIBS_ROOT}/openFrameworks/**"], "OF_LIBS_INCLUDE": [ - "${OF_LIBS_ROOT}/boost/include", "${OF_LIBS_ROOT}/cairo/include/cairo", "${OF_LIBS_ROOT}/curl/include", "${OF_LIBS_ROOT}/fmod/include",