Skip to content

Remove boost as alternative in ofConstants.h #8297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickHardeman merged 5 commits into from
Feb 28, 2025
Merged

Remove boost as alternative in ofConstants.h #8297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58aabf0
remove commented out boost include from Project.xcconfig
NickHardeman Feb 27, 2025
e8982a8
remove boost from ofConstants as alternate filesystem.
NickHardeman Feb 27, 2025
b2785a7
Remove commented out boost references in CoreOF.xcconfig
NickHardeman Feb 27, 2025
d4cb105
remove boost from vscode template.
NickHardeman Feb 28, 2025
e953306
remove boost from tvOS xcconfig.
NickHardeman Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions libs/openFrameworks/utils/ofConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <experimental/filesystem>
namespace std {
namespace experimental{
namespace filesystem {
using path = v1::path;
}
#if defined(OF_USE_EXPERIMENTAL_FS)
// C++17 experimental fs support
#include <experimental/filesystem>
namespace std {
namespace experimental{
namespace filesystem {
using path = v1::path;
}
}
}

namespace of {
namespace filesystem = std::experimental::filesystem;
}
#else
#include <filesystem>
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 <boost/filesystem.hpp>
namespace of {
namespace filesystem = boost::filesystem;
namespace filesystem = std::experimental::filesystem;
}
#else
#include <filesystem>
namespace of {
namespace filesystem = std::filesystem;
}

#endif
8 changes: 0 additions & 8 deletions libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions scripts/templates/macos/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
7 changes: 0 additions & 7 deletions scripts/templates/osx/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion scripts/templates/vscode/.vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down