Skip to content

Commit

Permalink
Removal of FMOD linking and dylib copying on osx, since it is not bei…
Browse files Browse the repository at this point in the history
…ng used (#8152)

closes #167
  • Loading branch information
roymacdonald authored Oct 23, 2024
1 parent a7a1a7a commit f3b9aa6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MISC_FLAGS = "-ObjC"
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype"
HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
//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"
Expand Down Expand Up @@ -46,7 +46,7 @@ LIB_OF_DEBUG = "$(OF_PATH)/libs/openFrameworksCompiled/lib/macos/openFrameworksD
OF_CORE_LIBS = $(MISC_FLAGS)
//$(LIB_FMOD)

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

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
Expand Down
8 changes: 4 additions & 4 deletions libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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_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"
Expand All @@ -29,7 +29,7 @@ HEADER_PUGIXML = "$(OF_PATH)/libs/pugixml/include"
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_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"
Expand All @@ -44,9 +44,9 @@ LIB_FMOD = "$(OF_PATH)/libs/fmod/lib/macos/libfmod.dylib"
//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)
//OF_CORE_LIBS = $(LIB_FMOD) //$(LIB_CURL)

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}
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

Expand Down
4 changes: 2 additions & 2 deletions scripts/templates/macos/Project.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ 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"
OF_NO_FMOD=1
USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
GCC_PREPROCESSOR_DEFINITIONS=$(inherited)$(USER_PREPROCESSOR_DEFINITIONS)

//APPSTORE, uncomment next lines to bundle data folder and code sign
Expand Down
6 changes: 3 additions & 3 deletions scripts/templates/osx/Project.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ HIGH_RESOLUTION_CAPABLE = NO
#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=""
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)
Expand Down

0 comments on commit f3b9aa6

Please sign in to comment.