From 82b58bbe4beed16c13bf6f9c5ad419e2a9270fbc Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 15 Nov 2024 12:32:04 -0300 Subject: [PATCH 1/2] gl silence deprecation tidy up --- apps/projectGenerator | 2 +- libs/openFrameworks/utils/ofConstants.h | 60 +++++++++---------- .../project/macos/CoreOF.xcconfig | 2 +- .../project/osx/CoreOF.xcconfig | 2 +- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index a742c1fdb86..2e354a713af 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit a742c1fdb869983f7a6a813e69514aea62e89af5 +Subproject commit 2e354a713af4c8169c6988df747db0e323e7b9bc diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 5b7a8e142e2..57780376627 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -98,6 +98,10 @@ enum ofTargetPlatform{ #define TARGET_MINGW #endif #elif defined( __APPLE_CC__) + #define GL_SILENCE_DEPRECATION + #define GLES_SILENCE_DEPRECATION + #define COREVIDEO_SILENCE_GL_DEPRECATION + #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 #include #if (TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_TV && !TARGET_OS_WATCH && !TARGET_OS_MACCATALYST && !TARGET_OS_VISION @@ -144,7 +148,7 @@ enum ofTargetPlatform{ // then the the platform specific includes: -#ifdef TARGET_WIN32 +#if defined(TARGET_WIN32) #define GLEW_STATIC #define GLEW_NO_GLU #define TARGET_GLFW_WINDOW @@ -196,13 +200,9 @@ enum ofTargetPlatform{ // problems) // info: http://www.geisswerks.com/ryan/FAQS/timing.html -#endif -#if defined(TARGET_OS_OSX) && !defined(TARGET_OF_IOS) - #ifndef __MACOSX_CORE__ - #define __MACOSX_CORE__ - #endif - #define TARGET_GLFW_WINDOW +#elif defined(TARGET_OSX) + #define TARGET_GLFW_WINDOW #define OF_CAIRO #define OF_RTAUDIO @@ -210,9 +210,8 @@ enum ofTargetPlatform{ #define OF_NO_FMOD #endif - - #include "GL/glew.h" - #include "OpenGL/OpenGL.h" + #include + #include #if defined(__LITTLE_ENDIAN__) #define TARGET_LITTLE_ENDIAN // intel cpu @@ -221,10 +220,24 @@ enum ofTargetPlatform{ #if defined(__OBJC__) && !__has_feature(objc_arc) #warning "Please enable ARC (Automatic Reference Counting) at the project level" #endif -#endif -#ifdef TARGET_LINUX +#elif defined (TARGET_OF_IOS) + #import + #import + #import + #import + #import + #import + #define TARGET_LITTLE_ENDIAN // arm cpu + #if defined(__OBJC__) && !__has_feature(objc_arc) + #warning "ARC (Automatic Reference Counting) is not enabled." + #warning "Enable ARC at the project level, or if using Objective-C/C++ with manual memory management," + #warning "add '-fno-objc-arc' in Build Phases -> Compile Sources -> Compiler Flags." + #endif + + +#elif defined (TARGET_LINUX) #ifdef TARGET_LINUX_ARM #ifdef TARGET_RASPBERRY_PI #include @@ -258,25 +271,8 @@ enum ofTargetPlatform{ #define B14400 14400 #define B28800 28800 -#endif - -#ifdef TARGET_OF_IOS - #import - #import - #import - #import - #import - #import - #define TARGET_LITTLE_ENDIAN // arm cpu - #if defined(__OBJC__) && !__has_feature(objc_arc) - #warning "ARC (Automatic Reference Counting) is not enabled." - #warning "Enable ARC at the project level, or if using Objective-C/C++ with manual memory management," - #warning "add '-fno-objc-arc' in Build Phases -> Compile Sources -> Compiler Flags." - #endif -#endif - -#ifdef TARGET_ANDROID +#elif defined (TARGET_ANDROID) #include #include #define GL_GLEXT_PROTOTYPES @@ -286,9 +282,9 @@ enum ofTargetPlatform{ #include #define TARGET_LITTLE_ENDIAN -#endif -#ifdef TARGET_EMSCRIPTEN + +#elif defined (TARGET_EMSCRIPTEN) #define GL_GLEXT_PROTOTYPES #include #include diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig index 0a2049b1bc1..f067f57b316 100644 --- a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig @@ -65,7 +65,7 @@ OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -fra ALWAYS_SEARCH_USER_PATHS = NO DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 OF_NO_FMOD +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) //COMPILER SETTINGS WHICH CAN BE OVERRIDDEN BY XCODE BUILD SETTINGS diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index ad7808cbdcc..c3d7a736707 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -62,7 +62,7 @@ OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -fra ALWAYS_SEARCH_USER_PATHS = NO DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 COREVIDEO_SILENCE_GL_DEPRECATION=1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) //COMPILER SETTINGS WHICH CAN BE OVERRIDDEN BY XCODE BUILD SETTINGS From 0f7683c37b8ce481e9679bad839b7d6d53998aa6 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 02:44:12 -0300 Subject: [PATCH 2/2] merge master --- scripts/apothecary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apothecary b/scripts/apothecary index 7d5a6d85683..bd4f4c10d5a 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 7d5a6d856838d02224464d57ef19bd17609d4e50 +Subproject commit bd4f4c10d5a26fd4352f05c962d3ebbc13d57e18