Skip to content

Commit f3b9aa6

Browse files
authored
Removal of FMOD linking and dylib copying on osx, since it is not being used (#8152)
closes #167
1 parent a7a1a7a commit f3b9aa6

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MISC_FLAGS = "-ObjC"
1010
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
1111
HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
1212
HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype"
13-
HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
13+
//HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
1414
HEADER_GLEW = "$(OF_PATH)/libs/glew/include"
1515
HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include"
1616
HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
@@ -46,7 +46,7 @@ LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksD
4646
OF_CORE_LIBS = $(MISC_FLAGS)
4747
//$(LIB_FMOD)
4848

49-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREEIMAGE) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMOD)
49+
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREEIMAGE) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM)
5050
//$(HEADER_TESS2) $(HEADER_CAIRO) $(HEADER_RTAUDIO) $(HEADER_GLFW) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML) $(HEADER_GLEW)
5151

5252
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 IOKit -framework OpenGL -framework QuartzCore -framework Security

libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.15
99
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
1010
HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
1111
HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype2"
12-
HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
12+
//HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
1313
HEADER_GLEW = "$(OF_PATH)/libs/glew/include"
1414
HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include"
1515
HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
@@ -29,7 +29,7 @@ HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
2929
LIB_OF = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworks.a"
3030
LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksDebug.a"
3131

32-
LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib"
32+
//LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib"
3333

3434
//LIB_GLFW = "$(OF_PATH)/libs/glfw/lib/osx/glfw3.a"
3535
//LIB_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/lib/osx/freeimage.a"
@@ -44,9 +44,9 @@ LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib"
4444
//LIB_URIPARSER = "$(OF_PATH)/libs/uriparser/lib/osx/uriparser.a"
4545
//LIB_PUGIXML = "$(OF_PATH)/libs/pugixml/lib/osx/pugixml.a"
4646

47-
OF_CORE_LIBS = $(LIB_FMOD) //$(LIB_CURL)
47+
//OF_CORE_LIBS = $(LIB_FMOD) //$(LIB_CURL)
4848

49-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(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}
49+
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}
5050

5151
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
5252

scripts/templates/macos/Project.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/macos/$(ICON_NAME)
5858
// in a custom openFrameworks-Info.plist, set CFBundleIconFile to ICON_NAME
5959

6060
//FOR AV ENGINE SOUND PLAYER UNCOMMENT TWO LINES BELOW
61-
//OF_NO_FMOD=1
62-
//USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
61+
OF_NO_FMOD=1
62+
USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
6363
GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS)
6464

6565
//APPSTORE, uncomment next lines to bundle data folder and code sign

scripts/templates/osx/Project.xcconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ HIGH_RESOLUTION_CAPABLE = NO
7676
#include? "App.xcconfig"
7777

7878
//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW
79-
//OF_NO_FMOD=1
80-
//USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
81-
//LIB_FMOD=""
79+
OF_NO_FMOD=1
80+
USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
81+
LIB_FMOD=""
8282
GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(USER_PREPROCESSOR_DEFINITIONS)
8383

8484
OTHER_CFLAGS = $(OF_CORE_CFLAGS)

0 commit comments

Comments
 (0)