From ebae252ad9d712061411e01473285dd5d06e90f3 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 13:23:57 -0300 Subject: [PATCH 01/13] remove OF_NO_FMOD --- apps/projectGenerator | 2 +- libs/openFrameworks/utils/ofConstants.h | 20 ++------- .../project/macos/CoreOF.xcconfig | 2 +- .../project/macos/config.macos.default.mk | 4 -- scripts/osx/xcode_project.sh | 3 +- scripts/templates/ios/Project.xcconfig | 3 -- scripts/templates/macos/Project.xcconfig | 7 +-- scripts/templates/osx/Project.xcconfig | 45 +++++-------------- scripts/templates/tvOS/Project.xcconfig | 3 -- 9 files changed, 24 insertions(+), 65 deletions(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index a742c1fdb86..30f123082fc 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit a742c1fdb869983f7a6a813e69514aea62e89af5 +Subproject commit 30f123082fcccfdf8608414de79dac47962c85e5 diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 5b7a8e142e2..ebe172fe9ec 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -206,11 +206,6 @@ enum ofTargetPlatform{ #define OF_CAIRO #define OF_RTAUDIO - #ifndef OF_NO_FMOD - #define OF_NO_FMOD - #endif - - #include "GL/glew.h" #include "OpenGL/OpenGL.h" @@ -314,21 +309,14 @@ typedef TESSindex ofIndexType; #if (defined(_M_ARM64) || defined(_M_ARM64EC)) && defined(TARGET_WIN32) #undef USE_FMOD // No FMOD lib for ARM64 yet - #ifndef OF_NO_FMOD - #define OF_NO_FMOD - #endif #include // intrinsics SIMD on https://learn.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics?view=msvc-170 #endif //------------------------------------------------ soundplayer -//MAC_OS and IOS uncomment to enable AVEnginePlayer -#ifdef OF_NO_FMOD - #undef USE_FMOD - #if defined(TARGET_OF_IOS) || defined(TARGET_OSX) - #define OF_SOUND_PLAYER_AV_ENGINE - #elif defined(TARGET_WIN32) - #define OF_SOUND_PLAYER_MEDIA_FOUNDATION - #endif +#if defined(TARGET_OF_IOS) || defined(TARGET_OSX) + #define OF_SOUND_PLAYER_AV_ENGINE +#elif defined(TARGET_WIN32) + #define OF_SOUND_PLAYER_MEDIA_FOUNDATION #endif // check if any soundplayer api is defined from the compiler diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig index 0a2049b1bc1..572d055e8bc 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) GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 //COMPILER SETTINGS WHICH CAN BE OVERRIDDEN BY XCODE BUILD SETTINGS diff --git a/libs/openFrameworksCompiled/project/macos/config.macos.default.mk b/libs/openFrameworksCompiled/project/macos/config.macos.default.mk index 4c8d31cabd1..2b5da9a99f0 100644 --- a/libs/openFrameworksCompiled/project/macos/config.macos.default.mk +++ b/libs/openFrameworksCompiled/project/macos/config.macos.default.mk @@ -269,12 +269,8 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp # third party PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/% - -# ifeq ($(USE_FMOD),0) PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp -PLATFORM_CFLAGS += -DUSE_FMOD=0 -# endif ########################################################################################## # PLATFORM HEADER SEARCH PATHS diff --git a/scripts/osx/xcode_project.sh b/scripts/osx/xcode_project.sh index d365d500e1b..609476c36cd 100755 --- a/scripts/osx/xcode_project.sh +++ b/scripts/osx/xcode_project.sh @@ -22,8 +22,9 @@ copy_resources() { # echo rsync -aved --delete --exclude='.DS_Store' "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/" rsync -aved --delete --exclude='.DS_Store' "$ICON_FILE" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/" fi + # Copy libfmod and change install directory for fmod to run - if [ -z "$OF_NO_FMOD" ] ; then + if [ -n "$USE_FMOD" ] ; then msg "Copying Resources - Fmod" echo rsync -aved --delete --ignore-existing "$OF_PATH/libs/fmod/lib/macos/libfmod.dylib" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/"; rsync -aved --delete --ignore-existing "$OF_PATH/libs/fmod/lib/macos/libfmod.dylib" "$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/"; diff --git a/scripts/templates/ios/Project.xcconfig b/scripts/templates/ios/Project.xcconfig index 23877e2d5e1..3666e0f839d 100644 --- a/scripts/templates/ios/Project.xcconfig +++ b/scripts/templates/ios/Project.xcconfig @@ -12,9 +12,6 @@ OF_PATH = ../../.. MARKETING_VERSION = 0.1.0 -OF_NO_FMOD=1 -USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1" - // this is "Build" in the Xcode target Identity UI, an incremental build number // important for the App Store as new build submissions need a diff number even // if MARKETING_VERSION is the same diff --git a/scripts/templates/macos/Project.xcconfig b/scripts/templates/macos/Project.xcconfig index 3fb4cff2894..163ce5b9fea 100644 --- a/scripts/templates/macos/Project.xcconfig +++ b/scripts/templates/macos/Project.xcconfig @@ -58,9 +58,10 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/macos/$(ICON_NAME) // in a custom openFrameworks-Info.plist, set CFBundleIconFile to ICON_NAME //FOR AV ENGINE SOUND PLAYER UNCOMMENT TWO LINES BELOW -OF_NO_FMOD=1 -USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1" -GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS) + +// Uncomment to enable deprecated FMOD +// USE_FMOD=1 +// USER_PREPROCESSOR_DEFINITIONS="USE_FMOD=1" //APPSTORE, uncomment next lines to bundle data folder and code sign //OF_CODESIGN = 1 diff --git a/scripts/templates/osx/Project.xcconfig b/scripts/templates/osx/Project.xcconfig index 72b6574c7f1..f5e552de8bf 100644 --- a/scripts/templates/osx/Project.xcconfig +++ b/scripts/templates/osx/Project.xcconfig @@ -1,20 +1,19 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED +// OpenFrameworks root path, relative to this project path. +// This needs to be defined before CoreOF.xcconfig is included OF_PATH = ../../.. -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE +// OpenFrameworks Core headers and libs #include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" -//UNCOMMENT BELOW TO ENABLE C++ 17 and std::filesystem +// Project settings. Changes here will recompile OF Core CLANG_CXX_LANGUAGE_STANDARD = c++23 CLANG_C_LANGUAGE_STANDARD = c17 MACOSX_DEPLOYMENT_TARGET = 10.15 -// App Settings +// App Settings - overridden if changed in Xcode UI PRODUCT_NAME = $(TARGET_NAME) PRODUCT_NAME[config=Debug] = $(TARGET_NAME)Debug PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.${TARGET_NAME:rfc1034identifier} -//PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = cc.openFrameworks.$(TARGET_NAME)Debug DEVELOPMENT_LANGUAGE = English CODE_SIGN_IDENTITY = - INFOPLIST_FILE = openFrameworks-Info.plist @@ -24,28 +23,25 @@ GENERATE_INFOPLIST_FILE = YES // note: this sets the initial value in the Xcode UI INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.games -// VERSIONING - overridden if changed in Xcode UI - +// Versioning // this is "Version" in the Xcode target Identity UI // suggested to use semantic versioning format ala #.#.# MARKETING_VERSION = 0.1.0 -// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script -ENABLE_USER_SCRIPT_SANDBOXING=NO - // this is "Build" in the Xcode target Identity UI, an incremental build number // important for the App Store as new build submissions need a diff number even // if MARKETING_VERSION is the same CURRENT_PROJECT_VERSION = 1 -// ICONS +// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script +ENABLE_USER_SCRIPT_SANDBOXING=NO -// default oF app icon +// Icons - default oF app icon ICON_NAME = of.icns ICON_NAME[config=Debug] = of_debug.icns ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) -// custom app icon, placed in main project folder +// Icons - custom app icon, placed in main project folder //ICON_NAME = MyApp.icns //ICON_FILE = $(ICON_NAME) @@ -54,38 +50,21 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) //ICON_NAME[config=Debug] = icon-debug.icns //ICON_FILE = bin/data/$(ICON_NAME) -// note: oF 0.7.2 - 0.11 used ICON_FILE_PATH which is no longer used in oF 0.12+ -// ex. change ICON_FILE_PATH = bin/data/ -> ICON_FILE = bin/data/$(ICON_NAME) & -// in a custom openFrameworks-Info.plist, set CFBundleIconFile to ICON_NAME - -//APPSTORE, uncomment next lines to bundle data folder and code sign +// APPSTORE, uncomment next lines to bundle data folder and code sign //OF_CODESIGN = 1 //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) - +// Retina resolution HIGH_RESOLUTION_CAPABLE = NO // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" -//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW -OF_NO_FMOD=1 -USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1" -LIB_FMOD="" GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(USER_PREPROCESSOR_DEFINITIONS) OTHER_CFLAGS = $(OF_CORE_CFLAGS) OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS) HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) -//OF_CORE_BUILD_COMMAND = echo \"💾 Compiling openFrameworks\"\nxcodebuild -project \"$OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj\" -target openFrameworks -configuration \"${CONFIGURATION}\" CLANG_CXX_LANGUAGE_STANDARD=$CLANG_CXX_LANGUAGE_STANDARD MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET GCC_PREPROCESSOR_DEFINITIONS='$USER_PREPROCESSOR_DEFINITIONS' - - OF_CORE_BUILD_COMMAND = xcodebuild -project $OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj -target openFrameworks -configuration ${CONFIGURATION} CLANG_CXX_LANGUAGE_STANDARD=$CLANG_CXX_LANGUAGE_STANDARD MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET GCC_PREPROCESSOR_DEFINITIONS=$USER_PREPROCESSOR_DEFINITIONS diff --git a/scripts/templates/tvOS/Project.xcconfig b/scripts/templates/tvOS/Project.xcconfig index b403fbbf7ce..16baec63377 100644 --- a/scripts/templates/tvOS/Project.xcconfig +++ b/scripts/templates/tvOS/Project.xcconfig @@ -5,9 +5,6 @@ OF_PATH = ../../.. //THIS HAS ALL THE HEADER AND LIBS FOR OF CORE #include "../../../libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig" -OF_NO_FMOD=1 -USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1" - OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS) HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) From 1060e05a0c96d9357a3b284429e1e14ba590cf88 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 14:08:54 -0300 Subject: [PATCH 02/13] untangle constants --- .../sound/ofFmodSoundPlayer.cpp | 1 + libs/openFrameworks/sound/ofFmodSoundPlayer.h | 1 - libs/openFrameworks/sound/ofSoundPlayer.cpp | 2 ++ libs/openFrameworks/sound/ofSoundPlayer.h | 4 +++ libs/openFrameworks/utils/ofConstants.h | 35 +++++++++---------- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp index 5f1291c99e9..ac9a735a48a 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp @@ -126,6 +126,7 @@ void ofFmodSetBuffersize(unsigned int bs){ // now, the individual sound player: //------------------------------------------------------------ ofFmodSoundPlayer::ofFmodSoundPlayer(){ + std::cout << "ofFmodSoundPlayer YES" << std::endl; bLoop = false; bLoadedOk = false; pan = 0.0; // range for oF is -1 to 1 diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.h b/libs/openFrameworks/sound/ofFmodSoundPlayer.h index 58a6891d4a8..edef44582c6 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.h +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.h @@ -38,7 +38,6 @@ void ofFmodSetBuffersize(unsigned int bs); class ofFmodSoundPlayer : public ofBaseSoundPlayer { public: - ofFmodSoundPlayer(); virtual ~ofFmodSoundPlayer(); diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp index ba142e1de26..2231ae5388a 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofSoundPlayer.cpp @@ -4,6 +4,8 @@ #define GLM_ENABLE_EXPERIMENTAL #include + + #ifdef OF_SOUND_PLAYER_AV_ENGINE #include "ofAVEngineSoundPlayer.h" #define OF_SOUND_PLAYER_TYPE ofAVEngineSoundPlayer diff --git a/libs/openFrameworks/sound/ofSoundPlayer.h b/libs/openFrameworks/sound/ofSoundPlayer.h index 8330eabd07e..19d16034ea3 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.h +++ b/libs/openFrameworks/sound/ofSoundPlayer.h @@ -4,6 +4,10 @@ // MARK: ofConstants FS #include "ofConstants.h" + + + + /// \brief Stops all active sound players on FMOD-based systems (windows, osx). void ofSoundStopAll(); diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index ebe172fe9ec..79d29d990ed 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -312,28 +312,27 @@ typedef TESSindex ofIndexType; #include // intrinsics SIMD on https://learn.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics?view=msvc-170 #endif -//------------------------------------------------ soundplayer -#if defined(TARGET_OF_IOS) || defined(TARGET_OSX) - #define OF_SOUND_PLAYER_AV_ENGINE -#elif defined(TARGET_WIN32) - #define OF_SOUND_PLAYER_MEDIA_FOUNDATION -#endif + // check if any soundplayer api is defined from the compiler +//------------------------------------------------ soundplayer #if !defined(TARGET_NO_SOUND) -#if !defined(OF_SOUND_PLAYER_QUICKTIME) && !defined(OF_SOUND_PLAYER_FMOD) && !defined(OF_SOUND_PLAYER_OPENAL) && !defined(OF_SOUND_PLAYER_EMSCRIPTEN) && !defined(OF_SOUND_PLAYER_AV_ENGINE) && !defined(OF_SOUND_PLAYER_MEDIA_FOUNDATION) - #ifdef TARGET_OF_IOS - #define OF_SOUND_PLAYER_IPHONE - #elif defined(TARGET_LINUX) || defined(TARGET_MINGW) - #define OF_SOUND_PLAYER_OPENAL - #elif defined(TARGET_EMSCRIPTEN) - #define OF_SOUND_PLAYER_EMSCRIPTEN - #elif !defined(TARGET_ANDROID) && (!defined(USE_FMOD) || USE_FMOD) - #define OF_SOUND_PLAYER_FMOD - #endif -#endif - + #if defined(USE_FMOD) + #define OF_SOUND_PLAYER_FMOD + #else + #if defined(TARGET_OF_IOS) || defined(TARGET_OSX) + #define OF_SOUND_PLAYER_AV_ENGINE +// #ifdef TARGET_OF_IOS +// #define OF_SOUND_PLAYER_IPHONE + #elif defined(TARGET_LINUX) || defined(TARGET_MINGW) + #define OF_SOUND_PLAYER_OPENAL + #elif defined(TARGET_EMSCRIPTEN) + #define OF_SOUND_PLAYER_EMSCRIPTEN + #elif defined(TARGET_WIN32) + #define OF_SOUND_PLAYER_MEDIA_FOUNDATION + #endif + #endif #endif //------------------------------------------------ thread local storage From 5193705c37f90d02dd046ba0a62221d17a04e205 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 14:11:20 -0300 Subject: [PATCH 03/13] revert some --- libs/openFrameworks/sound/ofSoundPlayer.cpp | 2 -- libs/openFrameworks/sound/ofSoundPlayer.h | 4 ---- .../project/macos/config.macos.default.mk | 11 +++++++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp index 2231ae5388a..ba142e1de26 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofSoundPlayer.cpp @@ -4,8 +4,6 @@ #define GLM_ENABLE_EXPERIMENTAL #include - - #ifdef OF_SOUND_PLAYER_AV_ENGINE #include "ofAVEngineSoundPlayer.h" #define OF_SOUND_PLAYER_TYPE ofAVEngineSoundPlayer diff --git a/libs/openFrameworks/sound/ofSoundPlayer.h b/libs/openFrameworks/sound/ofSoundPlayer.h index 19d16034ea3..8330eabd07e 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.h +++ b/libs/openFrameworks/sound/ofSoundPlayer.h @@ -4,10 +4,6 @@ // MARK: ofConstants FS #include "ofConstants.h" - - - - /// \brief Stops all active sound players on FMOD-based systems (windows, osx). void ofSoundStopAll(); diff --git a/libs/openFrameworksCompiled/project/macos/config.macos.default.mk b/libs/openFrameworksCompiled/project/macos/config.macos.default.mk index 2b5da9a99f0..b36068df323 100644 --- a/libs/openFrameworksCompiled/project/macos/config.macos.default.mk +++ b/libs/openFrameworksCompiled/project/macos/config.macos.default.mk @@ -269,8 +269,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp # third party PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/% + +ifeq ($(USE_FMOD),0) PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/% PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp +endif ########################################################################################## # PLATFORM HEADER SEARCH PATHS @@ -427,10 +430,10 @@ afterplatform: $(TARGET_NAME) @echo TARGET=$(TARGET) @mv $(TARGET) bin/$(BIN_NAME).app/Contents/MacOS -# ifneq ($(USE_FMOD),0) -# @mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks -# @cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/; -# endif +ifneq ($(USE_FMOD),0) + @mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks + @cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/; +endif @echo From 551e6c823c96004fc8c07726ba0cbeafab4555a0 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 14:26:17 -0300 Subject: [PATCH 04/13] remove quicktime and qtkit mentions --- libs/openFrameworks/app/ofAppRunner.cpp | 11 --------- libs/openFrameworks/sound/ofFmodSoundPlayer.h | 1 - .../video/ofDirectShowGrabber.h | 6 ----- .../openFrameworks/video/ofDirectShowPlayer.h | 1 - libs/openFrameworks/video/ofVideoGrabber.cpp | 19 +-------------- libs/openFrameworks/video/ofVideoPlayer.cpp | 24 ++----------------- 6 files changed, 3 insertions(+), 59 deletions(-) diff --git a/libs/openFrameworks/app/ofAppRunner.cpp b/libs/openFrameworks/app/ofAppRunner.cpp index df84e27ffbb..26b606de6dc 100644 --- a/libs/openFrameworks/app/ofAppRunner.cpp +++ b/libs/openFrameworks/app/ofAppRunner.cpp @@ -33,11 +33,6 @@ using std::shared_ptr; #include "ofGstUtils.h" #endif -// adding this for vc2010 compile: error C3861: 'closeQuicktime': identifier not found -#if defined(OF_VIDEO_CAPTURE_QUICKTIME) || defined(OF_VIDEO_PLAYER_QUICKTIME) - #include "ofQtUtils.h" -#endif - #if defined (TARGET_WIN32) #include #endif @@ -248,12 +243,6 @@ void ofExitCallback(){ //------------------------ #endif - // try to close quicktime, for non-linux systems: - #if defined(OF_VIDEO_CAPTURE_QUICKTIME) || defined(OF_VIDEO_PLAYER_QUICKTIME) - closeQuicktime(); - #endif - - //------------------------ // try to close freeImage: ofCloseFreeImage(); diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.h b/libs/openFrameworks/sound/ofFmodSoundPlayer.h index edef44582c6..51b3d11fe3d 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.h +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.h @@ -36,7 +36,6 @@ void ofFmodSetBuffersize(unsigned int bs); // --------------------- player functions: class ofFmodSoundPlayer : public ofBaseSoundPlayer { - public: ofFmodSoundPlayer(); virtual ~ofFmodSoundPlayer(); diff --git a/libs/openFrameworks/video/ofDirectShowGrabber.h b/libs/openFrameworks/video/ofDirectShowGrabber.h index 96545e48dcb..0b755eca6e2 100644 --- a/libs/openFrameworks/video/ofDirectShowGrabber.h +++ b/libs/openFrameworks/video/ofDirectShowGrabber.h @@ -6,17 +6,11 @@ #include "ofVideoBaseTypes.h" #include "ofPixels.h" // MARK: ofPixels pixels -// comment out this following line, if you'd like to use the -// quicktime capture interface on windows -// if not, we default to videoInput library for -// direct show capture... #define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP #ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP #define OF_VIDEO_CAPTURE_DIRECTSHOW -#else - #define OF_VIDEO_CAPTURE_QUICKTIME #endif diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.h b/libs/openFrameworks/video/ofDirectShowPlayer.h index 85e3e3536f5..0bde3e8505c 100644 --- a/libs/openFrameworks/video/ofDirectShowPlayer.h +++ b/libs/openFrameworks/video/ofDirectShowPlayer.h @@ -1,6 +1,5 @@ //DirectShowVideo and ofDirectShowPlayer written by Theodore Watson, Jan 2014 //See the cpp file for the DirectShow implementation -//To allow for QuickTime video playback install the K-Lite Mega Codec Pack 10.2 #pragma once #include "ofVideoBaseTypes.h" diff --git a/libs/openFrameworks/video/ofVideoGrabber.cpp b/libs/openFrameworks/video/ofVideoGrabber.cpp index 2872fd4cdc8..d79a5e861c3 100644 --- a/libs/openFrameworks/video/ofVideoGrabber.cpp +++ b/libs/openFrameworks/video/ofVideoGrabber.cpp @@ -7,7 +7,7 @@ // ------------------------------------------------ capture // check if any video capture system is already defined from the compiler -#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && !defined(OF_VIDEO_CAPTURE_QUICKTIME) && !defined(OF_VIDEO_CAPTURE_DIRECTSHOW) && !defined(OF_VIDEO_CAPTURE_ANDROID) && !defined(OF_VIDEO_CAPTURE_IOS) +#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && !defined(OF_VIDEO_CAPTURE_DIRECTSHOW) && !defined(OF_VIDEO_CAPTURE_ANDROID) && !defined(OF_VIDEO_CAPTURE_IOS) #ifdef TARGET_LINUX #define OF_VIDEO_CAPTURE_GSTREAMER @@ -15,17 +15,10 @@ #define OF_VIDEO_CAPTURE_AVF #elif defined (TARGET_WIN32) - // comment out this following line, if you'd like to use the - // quicktime capture interface on windows - // if not, we default to videoInput library for - // direct show capture... - #define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP #ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP #define OF_VIDEO_CAPTURE_DIRECTSHOW - #else - #define OF_VIDEO_CAPTURE_QUICKTIME #endif #elif defined(TARGET_ANDROID) @@ -54,16 +47,6 @@ #define OF_VID_GRABBER_TYPE ofxiOSVideoGrabber #endif -// #ifdef OF_VIDEO_CAPTURE_QUICKTIME -// #include "ofQuickTimeGrabber.h" -// #define OF_VID_GRABBER_TYPE ofQuickTimeGrabber -// #endif - -// #ifdef OF_VIDEO_CAPTURE_QTKIT -// #include "ofQTKitGrabber.h" -// #define OF_VID_GRABBER_TYPE ofQTKitGrabber -// #endif - #ifdef OF_VIDEO_CAPTURE_AVF #include "ofAVFoundationGrabber.h" #define OF_VID_GRABBER_TYPE ofAVFoundationGrabber diff --git a/libs/openFrameworks/video/ofVideoPlayer.cpp b/libs/openFrameworks/video/ofVideoPlayer.cpp index bc84360afe6..17d8b3513bb 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.cpp +++ b/libs/openFrameworks/video/ofVideoPlayer.cpp @@ -6,7 +6,7 @@ //------------------------------------------------ video player // check if any video player system is already defined from the compiler -#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && !defined(OF_VIDEO_PLAYER_IOS) && !defined(OF_VIDEO_PLAYER_DIRECTSHOW) && !defined(OF_VIDEO_PLAYER_MEDIA_FOUNDATION) && !defined(OF_VIDEO_PLAYER_QUICKTIME) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN) +#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && !defined(OF_VIDEO_PLAYER_IOS) && !defined(OF_VIDEO_PLAYER_DIRECTSHOW) && !defined(OF_VIDEO_PLAYER_MEDIA_FOUNDATION) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN) #ifdef TARGET_LINUX #define OF_VIDEO_PLAYER_GSTREAMER #elif defined(TARGET_ANDROID) @@ -20,37 +20,17 @@ #define OF_VIDEO_PLAYER_DIRECTSHOW #endif #elif defined(TARGET_OSX) - //for 10.8 and 10.9 users we use AVFoundation, for 10.7 we use QTKit, for 10.6 users we use QuickTime - #ifndef MAC_OS_X_VERSION_10_7 - #define OF_VIDEO_PLAYER_QUICKTIME - #elif !defined(MAC_OS_X_VERSION_10_8) - #define OF_VIDEO_PLAYER_QTKIT - #else - #define OF_VIDEO_PLAYER_AVFOUNDATION - #endif + #define OF_VIDEO_PLAYER_AVFOUNDATION #elif defined(TARGET_EMSCRIPTEN) #define OF_VIDEO_PLAYER_EMSCRIPTEN - #else - #define OF_VIDEO_PLAYER_QUICKTIME #endif #endif - #ifdef OF_VIDEO_PLAYER_GSTREAMER #include "ofGstVideoPlayer.h" #define OF_VID_PLAYER_TYPE ofGstVideoPlayer #endif -//#ifdef OF_VIDEO_PLAYER_QUICKTIME -// #include "ofQuickTimePlayer.h" -// #define OF_VID_PLAYER_TYPE ofQuickTimePlayer -//#endif -// -//#ifdef OF_VIDEO_PLAYER_QTKIT -// #include "ofQTKitPlayer.h" -// #define OF_VID_PLAYER_TYPE ofQTKitPlayer -//#endif - #ifdef OF_VIDEO_PLAYER_AVFOUNDATION #include "ofAVFoundationPlayer.h" #define OF_VID_PLAYER_TYPE ofAVFoundationPlayer From c35e97bdb029f5939f94eab77fd8e054c7d133b5 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 16:33:08 -0300 Subject: [PATCH 05/13] more template changes --- .../sound/ofFmodSoundPlayer.cpp | 1 - libs/openFrameworks/sound/ofFmodSoundPlayer.h | 2 + libs/openFrameworks/sound/ofSoundPlayer.cpp | 2 + libs/openFrameworks/utils/ofConstants.h | 4 +- libs/openFrameworks/video/ofVideoGrabber.cpp | 15 ++--- libs/openFrameworks/video/ofVideoPlayer.cpp | 13 ++-- .../project/osx/CoreOF.xcconfig | 3 + .../project/qtcreator/openFrameworks.qbs | 12 ---- scripts/templates/macos/Project.xcconfig | 61 ++++++++----------- scripts/templates/osx/Project.xcconfig | 8 ++- 10 files changed, 57 insertions(+), 64 deletions(-) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp index ac9a735a48a..5f1291c99e9 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp @@ -126,7 +126,6 @@ void ofFmodSetBuffersize(unsigned int bs){ // now, the individual sound player: //------------------------------------------------------------ ofFmodSoundPlayer::ofFmodSoundPlayer(){ - std::cout << "ofFmodSoundPlayer YES" << std::endl; bLoop = false; bLoadedOk = false; pan = 0.0; // range for oF is -1 to 1 diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.h b/libs/openFrameworks/sound/ofFmodSoundPlayer.h index 51b3d11fe3d..58a6891d4a8 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.h +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.h @@ -36,7 +36,9 @@ void ofFmodSetBuffersize(unsigned int bs); // --------------------- player functions: class ofFmodSoundPlayer : public ofBaseSoundPlayer { + public: + ofFmodSoundPlayer(); virtual ~ofFmodSoundPlayer(); diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp index ba142e1de26..d74dbc875e4 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofSoundPlayer.cpp @@ -1,4 +1,6 @@ #include "ofSoundPlayer.h" +#include "ofConstants.h" + #include "ofLog.h" #define GLM_FORCE_CTOR_INIT #define GLM_ENABLE_EXPERIMENTAL diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 79d29d990ed..311eee81771 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -308,7 +308,7 @@ typedef TESSindex ofIndexType; #if (defined(_M_ARM64) || defined(_M_ARM64EC)) && defined(TARGET_WIN32) - #undef USE_FMOD // No FMOD lib for ARM64 yet + // #undef USE_FMOD // No FMOD lib for ARM64 yet #include // intrinsics SIMD on https://learn.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics?view=msvc-170 #endif @@ -323,7 +323,7 @@ typedef TESSindex ofIndexType; #else #if defined(TARGET_OF_IOS) || defined(TARGET_OSX) #define OF_SOUND_PLAYER_AV_ENGINE -// #ifdef TARGET_OF_IOS +// #elif defined(TARGET_OF_IOS) // #define OF_SOUND_PLAYER_IPHONE #elif defined(TARGET_LINUX) || defined(TARGET_MINGW) #define OF_SOUND_PLAYER_OPENAL diff --git a/libs/openFrameworks/video/ofVideoGrabber.cpp b/libs/openFrameworks/video/ofVideoGrabber.cpp index d79a5e861c3..1d593c80fec 100644 --- a/libs/openFrameworks/video/ofVideoGrabber.cpp +++ b/libs/openFrameworks/video/ofVideoGrabber.cpp @@ -7,7 +7,10 @@ // ------------------------------------------------ capture // check if any video capture system is already defined from the compiler -#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && !defined(OF_VIDEO_CAPTURE_DIRECTSHOW) && !defined(OF_VIDEO_CAPTURE_ANDROID) && !defined(OF_VIDEO_CAPTURE_IOS) +#if !defined(OF_VIDEO_CAPTURE_GSTREAMER) && \ + !defined(OF_VIDEO_CAPTURE_DIRECTSHOW) && \ + !defined(OF_VIDEO_CAPTURE_ANDROID) && \ + !defined(OF_VIDEO_CAPTURE_IOS) #ifdef TARGET_LINUX #define OF_VIDEO_CAPTURE_GSTREAMER @@ -16,28 +19,20 @@ #elif defined (TARGET_WIN32) #define OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP - - #ifdef OF_SWITCH_TO_DSHOW_FOR_WIN_VIDCAP - #define OF_VIDEO_CAPTURE_DIRECTSHOW - #endif + #define OF_VIDEO_CAPTURE_DIRECTSHOW #elif defined(TARGET_ANDROID) - #define OF_VIDEO_CAPTURE_ANDROID #elif defined(TARGET_EMSCRIPTEN) - #define OF_VIDEO_CAPTURE_EMSCRIPTEN #elif defined(TARGET_OF_IOS) - #define OF_VIDEO_CAPTURE_IOS #endif #endif - - #ifdef TARGET_OF_OSX #include #endif diff --git a/libs/openFrameworks/video/ofVideoPlayer.cpp b/libs/openFrameworks/video/ofVideoPlayer.cpp index 17d8b3513bb..d46f3495b1b 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.cpp +++ b/libs/openFrameworks/video/ofVideoPlayer.cpp @@ -6,7 +6,12 @@ //------------------------------------------------ video player // check if any video player system is already defined from the compiler -#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && !defined(OF_VIDEO_PLAYER_IOS) && !defined(OF_VIDEO_PLAYER_DIRECTSHOW) && !defined(OF_VIDEO_PLAYER_MEDIA_FOUNDATION) && !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && !defined(OF_VIDEO_PLAYER_EMSCRIPTEN) +#if !defined(OF_VIDEO_PLAYER_GSTREAMER) && \ + !defined(OF_VIDEO_PLAYER_IOS) && \ + !defined(OF_VIDEO_PLAYER_DIRECTSHOW) && \ + !defined(OF_VIDEO_PLAYER_MEDIA_FOUNDATION) && \ + !defined(OF_VIDEO_PLAYER_AVFOUNDATION) && \ + !defined(OF_VIDEO_PLAYER_EMSCRIPTEN) #ifdef TARGET_LINUX #define OF_VIDEO_PLAYER_GSTREAMER #elif defined(TARGET_ANDROID) @@ -14,11 +19,11 @@ #elif defined(TARGET_OF_IOS) #define OF_VIDEO_PLAYER_IOS #elif defined(TARGET_WIN32) - #ifdef _MSC_VER //use MF Foundation player for VS as mingw doesn't have needed symbols + #ifdef _MSC_VER //use MF Foundation player for VS as mingw doesn't have needed symbols #define OF_VIDEO_PLAYER_MEDIA_FOUNDATION - #else + #else #define OF_VIDEO_PLAYER_DIRECTSHOW - #endif + #endif #elif defined(TARGET_OSX) #define OF_VIDEO_PLAYER_AVFOUNDATION #elif defined(TARGET_EMSCRIPTEN) diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index ad7808cbdcc..cb449853616 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -50,6 +50,9 @@ 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 +OF_CORE_HEADERS = $(inherited) $(OF_PATH)/libs/fmod/include +OF_CORE_LIBS = $(inherited) $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib + // BOOST can be enabled in OF Core by uncommenting this block //HEADER_BOOST = "$(OF_PATH)/libs/boost/include" diff --git a/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs b/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs index 5e3f751c001..93b5ccd23f2 100644 --- a/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs +++ b/libs/openFrameworksCompiled/project/qtcreator/openFrameworks.qbs @@ -61,10 +61,6 @@ Product{ "video/ofDirectShowGrabber\\..*", "video/ofAVFoundationVideoPlayer\\..*", "video/ofAVFoundationVideoGrabber\\..*", - "video/ofQuickTimePlayer\\..*", - "video/ofQuickTimeGrabber\\..*", - "video/ofQtUtils\\..*", - "video/ofQTKit\\..*", "app/ofAppEGLWindow\\..*", ]; }else if(qbs.targetOS.indexOf("windows")>-1){ @@ -75,10 +71,6 @@ Product{ "video/ofGstUtils\\..*", "video/ofAVFoundationVideoPlayer\\..*", "video/ofAVFoundationVideoGrabber\\..*", - "video/ofQuickTimePlayer\\..*", - "video/ofQuickTimeGrabber\\..*", - "video/ofQtUtils\\..*", - "video/ofQTKit\\..*", "app/ofAppEGLWindow\\..*", ]; }else if(qbs.targetOS.indexOf("osx")>-1){ @@ -89,10 +81,6 @@ Product{ "video/ofGstUtils\\..*", "video/ofDirectShowPlayer\\..*", "video/ofDirectShowGrabber\\..*", - "video/ofQuickTimePlayer\\..*", - "video/ofQuickTimeGrabber\\..*", - "video/ofQtUtils\\..*", - "video/ofQTKit\\..*", "app/ofAppEGLWindow\\..*", ]; } diff --git a/scripts/templates/macos/Project.xcconfig b/scripts/templates/macos/Project.xcconfig index 163ce5b9fea..7923b4921c4 100644 --- a/scripts/templates/macos/Project.xcconfig +++ b/scripts/templates/macos/Project.xcconfig @@ -1,19 +1,19 @@ -//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT. -//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED +// OpenFrameworks root path, relative to this project path. +// This needs to be defined before CoreOF.xcconfig is included OF_PATH = ../../.. -//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE -#include "../../../libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig" +// OpenFrameworks Core headers and libs +#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig" -//UNCOMMENT BELOW TO ENABLE C++ 17 and std::filesystem -CLANG_CXX_LANGUAGE_STANDARD = c++17 +// Project settings. Changes here will recompile OF Core +CLANG_CXX_LANGUAGE_STANDARD = c++23 +CLANG_C_LANGUAGE_STANDARD = c17 MACOSX_DEPLOYMENT_TARGET = 10.15 -// App Settings +// App Settings - overridden if changed in Xcode UI PRODUCT_NAME = $(TARGET_NAME) PRODUCT_NAME[config=Debug] = $(TARGET_NAME)Debug PRODUCT_BUNDLE_IDENTIFIER = cc.openFrameworks.${TARGET_NAME:rfc1034identifier} -//PRODUCT_BUNDLE_IDENTIFIER[config=Debug] = cc.openFrameworks.$(TARGET_NAME)Debug DEVELOPMENT_LANGUAGE = English CODE_SIGN_IDENTITY = - INFOPLIST_FILE = openFrameworks-Info.plist @@ -23,28 +23,25 @@ GENERATE_INFOPLIST_FILE = YES // note: this sets the initial value in the Xcode UI INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.games -// VERSIONING - overridden if changed in Xcode UI - +// Versioning // this is "Version" in the Xcode target Identity UI // suggested to use semantic versioning format ala #.#.# MARKETING_VERSION = 0.1.0 -// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script -ENABLE_USER_SCRIPT_SANDBOXING=NO - // this is "Build" in the Xcode target Identity UI, an incremental build number // important for the App Store as new build submissions need a diff number even // if MARKETING_VERSION is the same CURRENT_PROJECT_VERSION = 1 -// ICONS +// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script +ENABLE_USER_SCRIPT_SANDBOXING=NO -// default oF app icon +// Icons - default oF app icon ICON_NAME = of.icns ICON_NAME[config=Debug] = of_debug.icns -ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/macos/$(ICON_NAME) +ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) -// custom app icon, placed in main project folder +// Icons - custom app icon, placed in main project folder //ICON_NAME = MyApp.icns //ICON_FILE = $(ICON_NAME) @@ -53,31 +50,27 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/macos/$(ICON_NAME) //ICON_NAME[config=Debug] = icon-debug.icns //ICON_FILE = bin/data/$(ICON_NAME) -// note: oF 0.7.2 - 0.11 used ICON_FILE_PATH which is no longer used in oF 0.12+ -// ex. change ICON_FILE_PATH = bin/data/ -> ICON_FILE = bin/data/$(ICON_NAME) & -// in a custom openFrameworks-Info.plist, set CFBundleIconFile to ICON_NAME - -//FOR AV ENGINE SOUND PLAYER UNCOMMENT TWO LINES BELOW - -// Uncomment to enable deprecated FMOD -// USE_FMOD=1 -// USER_PREPROCESSOR_DEFINITIONS="USE_FMOD=1" - -//APPSTORE, uncomment next lines to bundle data folder and code sign +// App Store, uncomment next lines to bundle data folder and code sign //OF_CODESIGN = 1 //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) +// Retina resolution +HIGH_RESOLUTION_CAPABLE = NO + +// Uncomment to enable deprecated FMOD +//USE_FMOD=1 +//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) +//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) +//OF_CORE_LIBS = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" +GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(USER_PREPROCESSOR_DEFINITIONS) + OTHER_CFLAGS = $(OF_CORE_CFLAGS) OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS) HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) + +OF_CORE_BUILD_COMMAND = xcodebuild -project $OF_PATH/libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj -target openFrameworks -configuration ${CONFIGURATION} CLANG_CXX_LANGUAGE_STANDARD=$CLANG_CXX_LANGUAGE_STANDARD MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET GCC_PREPROCESSOR_DEFINITIONS=$USER_PREPROCESSOR_DEFINITIONS diff --git a/scripts/templates/osx/Project.xcconfig b/scripts/templates/osx/Project.xcconfig index f5e552de8bf..7923b4921c4 100644 --- a/scripts/templates/osx/Project.xcconfig +++ b/scripts/templates/osx/Project.xcconfig @@ -50,7 +50,7 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) //ICON_NAME[config=Debug] = icon-debug.icns //ICON_FILE = bin/data/$(ICON_NAME) -// APPSTORE, uncomment next lines to bundle data folder and code sign +// App Store, uncomment next lines to bundle data folder and code sign //OF_CODESIGN = 1 //OF_BUNDLE_DATA_FOLDER = 1 //OF_BUNDLE_DYLIBS = 1 @@ -58,6 +58,12 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) // Retina resolution HIGH_RESOLUTION_CAPABLE = NO +// Uncomment to enable deprecated FMOD +//USE_FMOD=1 +//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) +//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) +//OF_CORE_LIBS = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) + // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" From 9787e2acaa8da4c237d92a7873a90d82c8de72fc Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 17:34:48 -0300 Subject: [PATCH 06/13] more changes --- libs/openFrameworks/sound/ofFmodSoundPlayer.h | 1 - .../project/osx/CoreOF.xcconfig | 78 +++++++++---------- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.h b/libs/openFrameworks/sound/ofFmodSoundPlayer.h index 58a6891d4a8..a651df01aac 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.h +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.h @@ -4,7 +4,6 @@ #include "ofConstants.h" #ifdef OF_SOUND_PLAYER_FMOD - #include "ofSoundBaseTypes.h" diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index cb449853616..37341e632f5 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -6,43 +6,44 @@ CLANG_C_LANGUAGE_STANDARD = c17 MACOSX_DEPLOYMENT_TARGET = 10.15 -HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**" -HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include" -HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype2" -//HEADER_FMOD = "$(OF_PATH)/libs/fmod/include" -HEADER_GLEW = "$(OF_PATH)/libs/glew/include" -HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include" -HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include" -HEADER_CAIRO = "$(OF_PATH)/libs/cairo/include" -HEADER_RTAUDIO = "$(OF_PATH)/libs/rtAudio/include" -HEADER_GLFW = "$(OF_PATH)/libs/glfw/include" -HEADER_UTF8 = "$(OF_PATH)/libs/utf8/include" -HEADER_JSON = "$(OF_PATH)/libs/json/include" -HEADER_GLM = "$(OF_PATH)/libs/glm/include" -HEADER_BROTLI = "$(OF_PATH)/libs/brotli/include" -HEADER_CURL = "$(OF_PATH)/libs/curl/include" -HEADER_SSL = "$(OF_PATH)/libs/openssl/include" -HEADER_URIPARSER = "$(OF_PATH)/libs/uriparser/include" -HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include" +HEADER_OF = $(OF_PATH)/libs/openFrameworks/** +HEADER_FREETYPE = $(OF_PATH)/libs/freetype/include +HEADER_FREETYPE2 = $(OF_PATH)/libs/freetype/include/freetype2 +//HEADER_FMOD = $(OF_PATH)/libs/fmod/include +HEADER_GLEW = $(OF_PATH)/libs/glew/include +HEADER_FREEIMAGE = $(OF_PATH)/libs/FreeImage/include +HEADER_TESS2 = $(OF_PATH)/libs/tess2/include +HEADER_CAIRO = $(OF_PATH)/libs/cairo/include +HEADER_RTAUDIO = $(OF_PATH)/libs/rtAudio/include +HEADER_GLFW = $(OF_PATH)/libs/glfw/include +HEADER_UTF8 = $(OF_PATH)/libs/utf8/include +HEADER_JSON = $(OF_PATH)/libs/json/include +HEADER_GLM = $(OF_PATH)/libs/glm/include +HEADER_BROTLI = $(OF_PATH)/libs/brotli/include +HEADER_CURL = $(OF_PATH)/libs/curl/include +HEADER_SSL = $(OF_PATH)/libs/openssl/include +HEADER_URIPARSER = $(OF_PATH)/libs/uriparser/include +HEADER_PUGIXML = $(OF_PATH)/libs/pugixml/include //------- Libraries -LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworks.a" -LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a" - -//LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib" - -//LIB_GLFW = "$(OF_PATH)/libs/glfw/lib/osx/glfw3.a" -//LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a" -//LIB_FREETYPE = "$(OF_PATH)/libs/freetype/lib/osx/freetype.a" -//LIB_GLEW = "$(OF_PATH)/libs/glew/lib/osx/glew.a" -//LIB_RTAUDIO = "$(OF_PATH)/libs/rtAudio/lib/osx/rtaudio.a" -//LIB_TESS = "$(OF_PATH)/libs/tess2/lib/osx/tess2.a" -//LIB_CAIRO1 = "$(OF_PATH)/libs/cairo/lib/osx/cairo-script-interpreter.a" -//LIB_CAIRO2 = "$(OF_PATH)/libs/cairo/lib/osx/cairo.a" -//LIB_CAIRO3 = "$(OF_PATH)/libs/cairo/lib/osx/pixman-1.a" +LIB_OF = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworks.a +LIB_OF_DEBUG = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a +//LIB_OF[Debug] = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a + +//LIB_FMOD = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib + +//LIB_GLFW = $(OF_PATH)/libs/glfw/lib/osx/glfw3.a +//LIB_FREEIMAGE = $(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a +//LIB_FREETYPE = $(OF_PATH)/libs/freetype/lib/osx/freetype.a +//LIB_GLEW = $(OF_PATH)/libs/glew/lib/osx/glew.a +//LIB_RTAUDIO = $(OF_PATH)/libs/rtAudio/lib/osx/rtaudio.a +//LIB_TESS = $(OF_PATH)/libs/tess2/lib/osx/tess2.a +//LIB_CAIRO1 = $(OF_PATH)/libs/cairo/lib/osx/cairo-script-interpreter.a +//LIB_CAIRO2 = $(OF_PATH)/libs/cairo/lib/osx/cairo.a +//LIB_CAIRO3 = $(OF_PATH)/libs/cairo/lib/osx/pixman-1.a //LIB_CURL = "-lcurl" -//LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a" -//LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a" +//LIB_URIPARSER = $(OF_PATH)/libs/uriparser/lib/osx/uriparser.a +//LIB_PUGIXML = $(OF_PATH)/libs/pugixml/lib/osx/pugixml.a //OF_CORE_LIBS = $(LIB_FMOD) //$(LIB_CURL) @@ -50,14 +51,11 @@ 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 -OF_CORE_HEADERS = $(inherited) $(OF_PATH)/libs/fmod/include -OF_CORE_LIBS = $(inherited) $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib - // 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" +//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) From 1a8b6c906240d80188f356c84385d4a6ef71eb3f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 20:57:57 -0300 Subject: [PATCH 07/13] updates --- libs/openFrameworks/sound/ofFmodSoundPlayer.cpp | 1 + .../project/osx/CoreOF.xcconfig | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp index 5f1291c99e9..43dc4814552 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp @@ -126,6 +126,7 @@ void ofFmodSetBuffersize(unsigned int bs){ // now, the individual sound player: //------------------------------------------------------------ ofFmodSoundPlayer::ofFmodSoundPlayer(){ + std::cout << "FMOD " << std::endl; bLoop = false; bLoadedOk = false; pan = 0.0; // range for oF is -1 to 1 diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index 37341e632f5..7215298da33 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -28,7 +28,7 @@ HEADER_PUGIXML = $(OF_PATH)/libs/pugixml/include //------- Libraries LIB_OF = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworks.a LIB_OF_DEBUG = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a -//LIB_OF[Debug] = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a +//LIB_OF[config=Debug] = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a //LIB_FMOD = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib @@ -47,18 +47,17 @@ LIB_OF_DEBUG = $(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDe //OF_CORE_LIBS = $(LIB_FMOD) //$(LIB_CURL) + + OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_CAIRO) $(HEADER_RTAUDIO) $(HEADER_GLFW) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) ${HEADER_SSL} $(HEADER_URIPARSER) $(HEADER_PUGIXML) ${HEADER_BROTLI} 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) +// FMOD can be enabled in OF Core by uncommenting this block +//USE_FMOD=1 +//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) +//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) +//OF_CORE_LIBS=$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) ALWAYS_SEARCH_USER_PATHS = NO From dbda2abe6b1ae1063db9a1312a5c9832b533fc00 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 21:00:10 -0300 Subject: [PATCH 08/13] ok --- .../project/macos/CoreOF.xcconfig | 14 +++++--------- scripts/templates/macos/Project.xcconfig | 6 ------ scripts/templates/osx/Project.xcconfig | 6 ------ 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig index 572d055e8bc..510fa9bf8d5 100644 --- a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig @@ -53,15 +53,11 @@ OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -fra //-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 // - -// 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) - +//FMOD can be enabled in OF Core by uncommenting this block +//USE_FMOD=1 +//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) +//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) +//OF_CORE_LIBS=$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) ALWAYS_SEARCH_USER_PATHS = NO DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES diff --git a/scripts/templates/macos/Project.xcconfig b/scripts/templates/macos/Project.xcconfig index 7923b4921c4..62fd344d2e9 100644 --- a/scripts/templates/macos/Project.xcconfig +++ b/scripts/templates/macos/Project.xcconfig @@ -58,12 +58,6 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) // Retina resolution HIGH_RESOLUTION_CAPABLE = NO -// Uncomment to enable deprecated FMOD -//USE_FMOD=1 -//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) -//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) -//OF_CORE_LIBS = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) - // 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 7923b4921c4..62fd344d2e9 100644 --- a/scripts/templates/osx/Project.xcconfig +++ b/scripts/templates/osx/Project.xcconfig @@ -58,12 +58,6 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) // Retina resolution HIGH_RESOLUTION_CAPABLE = NO -// Uncomment to enable deprecated FMOD -//USE_FMOD=1 -//USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) -//OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) -//OF_CORE_LIBS = $(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) - // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" From e0abfcd242100b0dc5be3d1435769ccf83f6ea4a Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 21:00:52 -0300 Subject: [PATCH 09/13] revert cout --- libs/openFrameworks/sound/ofFmodSoundPlayer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp index 43dc4814552..5f1291c99e9 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.cpp @@ -126,7 +126,6 @@ void ofFmodSetBuffersize(unsigned int bs){ // now, the individual sound player: //------------------------------------------------------------ ofFmodSoundPlayer::ofFmodSoundPlayer(){ - std::cout << "FMOD " << std::endl; bLoop = false; bLoadedOk = false; pan = 0.0; // range for oF is -1 to 1 From 88eefa2e688ce624da0116cd57ea20e328c45e6c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 21:01:13 -0300 Subject: [PATCH 10/13] revert cout --- libs/openFrameworks/sound/ofFmodSoundPlayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/openFrameworks/sound/ofFmodSoundPlayer.h b/libs/openFrameworks/sound/ofFmodSoundPlayer.h index a651df01aac..58a6891d4a8 100644 --- a/libs/openFrameworks/sound/ofFmodSoundPlayer.h +++ b/libs/openFrameworks/sound/ofFmodSoundPlayer.h @@ -4,6 +4,7 @@ #include "ofConstants.h" #ifdef OF_SOUND_PLAYER_FMOD + #include "ofSoundBaseTypes.h" From 44320b8916504db29acac8a2060065fc54fa83c5 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 9 Nov 2024 21:02:17 -0300 Subject: [PATCH 11/13] cleanup --- libs/openFrameworks/sound/ofSoundPlayer.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp index d74dbc875e4..ba142e1de26 100644 --- a/libs/openFrameworks/sound/ofSoundPlayer.cpp +++ b/libs/openFrameworks/sound/ofSoundPlayer.cpp @@ -1,6 +1,4 @@ #include "ofSoundPlayer.h" -#include "ofConstants.h" - #include "ofLog.h" #define GLM_FORCE_CTOR_INIT #define GLM_ENABLE_EXPERIMENTAL From c468077fe2e39f6f6b279e05d4f59898469cc922 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 9 Dec 2024 19:58:12 -0300 Subject: [PATCH 12/13] update osx makefile --- .../project/osx/config.osx.default.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libs/openFrameworksCompiled/project/osx/config.osx.default.mk b/libs/openFrameworksCompiled/project/osx/config.osx.default.mk index be27db25062..f4eaa03a8c7 100644 --- a/libs/openFrameworksCompiled/project/osx/config.osx.default.mk +++ b/libs/openFrameworksCompiled/project/osx/config.osx.default.mk @@ -253,28 +253,23 @@ endif # core sources PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppGlutWindow.cpp +PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofDirectShowGrabber.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofDirectShowPlayer.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofMediaFoundationPlayer.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofMediaFoundationSoundPlayer.cpp +PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofOpenALSoundPlayer.cpp +PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp ifneq ($(USE_GST),1) PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofGstUtils.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofGstVideoGrabber.cpp PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofGstVideoPlayer.cpp endif -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cpp - # third party PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/% - - -# ifeq ($(USE_FMOD),0) PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/% -PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp -PLATFORM_CFLAGS += -DUSE_FMOD=0 -# endif ########################################################################################## # PLATFORM HEADER SEARCH PATHS From a6d5537bd6e90a7ebd7e65c40c5d4fe4deb1aacb Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 28 Mar 2025 20:20:46 -0300 Subject: [PATCH 13/13] fix --- libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig index 631ba61ca8a..dfda8e1c9c5 100644 --- a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig +++ b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig @@ -51,14 +51,11 @@ 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 -<<<<<<< HEAD // FMOD can be enabled in OF Core by uncommenting this block //USE_FMOD=1 //USER_PREPROCESSOR_DEFINITIONS=USE_FMOD=1 $(inherited) //OF_CORE_HEADERS = $(OF_PATH)/libs/fmod/include $(inherited) //OF_CORE_LIBS=$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib $(inherited) -======= ->>>>>>> master ALWAYS_SEARCH_USER_PATHS = NO