Skip to content

Commit 0d1e724

Browse files
authored
Removing fmod from macos and osx makefile configs (#8177)
1 parent e94bddb commit 0d1e724

2 files changed

Lines changed: 19 additions & 18 deletions

File tree

libs/openFrameworksCompiled/project/macos/config.macos.default.mk

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp
270270
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
271271

272272

273-
ifeq ($(USE_FMOD),0)
274-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
275-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
276-
PLATFORM_CFLAGS += -DUSE_FMOD=0
277-
endif
273+
# ifeq ($(USE_FMOD),0)
274+
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
275+
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
276+
PLATFORM_CFLAGS += -DUSE_FMOD=0
277+
# endif
278278

279279
##########################################################################################
280280
# PLATFORM HEADER SEARCH PATHS
@@ -431,10 +431,11 @@ afterplatform: $(TARGET_NAME)
431431
@echo TARGET=$(TARGET)
432432
@mv $(TARGET) bin/$(BIN_NAME).app/Contents/MacOS
433433

434-
ifneq ($(USE_FMOD),0)
435-
@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
436-
@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
437-
endif
434+
# ifneq ($(USE_FMOD),0)
435+
# @mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
436+
# @cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
437+
# endif
438+
438439

439440
@echo
440441
@echo " compiling done"

libs/openFrameworksCompiled/project/osx/config.osx.default.mk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/app/ofAppEGLWindow.cp
270270
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
271271

272272

273-
ifeq ($(USE_FMOD),0)
274-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
275-
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
276-
PLATFORM_CFLAGS += -DUSE_FMOD=0
277-
endif
273+
# ifeq ($(USE_FMOD),0)
274+
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/fmod/%
275+
PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/sound/ofFmodSoundPlayer.cpp
276+
PLATFORM_CFLAGS += -DUSE_FMOD=0
277+
# endif
278278

279279
##########################################################################################
280280
# PLATFORM HEADER SEARCH PATHS
@@ -431,10 +431,10 @@ afterplatform: $(TARGET_NAME)
431431
@echo TARGET=$(TARGET)
432432
@mv $(TARGET) bin/$(BIN_NAME).app/Contents/MacOS
433433

434-
ifneq ($(USE_FMOD),0)
435-
@mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
436-
@cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
437-
endif
434+
# ifneq ($(USE_FMOD),0)
435+
# @mkdir -p bin/$(BIN_NAME).app/Contents/Frameworks
436+
# @cp $(OF_LIBS_PATH)/*/lib/$(PLATFORM_LIB_SUBPATH)/*.$(SHARED_LIB_EXTENSION) bin/$(BIN_NAME).app/Contents/Frameworks/;
437+
# endif
438438

439439
@echo
440440
@echo " compiling done"

0 commit comments

Comments
 (0)