Skip to content

Commit fe32e8b

Browse files
authored
ios fmod remove (#8175)
1 parent 0d1e724 commit fe32e8b

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ HEADER_OF = "$(OF_PATH)/libs/openFrameworks/**"
1010
HEADER_OFXIOS = "$(OF_PATH)/addons/ofxiOS/**"
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"
@@ -39,7 +39,7 @@ MISC_FLAGS = "-ObjC"
3939

4040
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
4141

42-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
42+
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
4343

4444
OF_CORE_FRAMEWORKS = -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 -framework Metal
4545

libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ HEADER_OFXIOS = "$(OF_PATH)/addons/ofxiOS/**"
1212
HEADER_OFXMULTITOUCH = "$(OF_PATH)/addons/ofxMultiTouch/**"
1313
HEADER_FREETYPE = "$(OF_PATH)/libs/freetype/include"
1414
HEADER_FREETYPE2 = "$(OF_PATH)/libs/freetype/include/freetype"
15-
HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
15+
//HEADER_FMOD = "$(OF_PATH)/libs/fmod/include"
1616
HEADER_GLEW = "$(OF_PATH)/libs/glew/include"
1717
HEADER_FREEIMAGE = "$(OF_PATH)/libs/FreeImage/include"
1818
HEADER_TESS2 = "$(OF_PATH)/libs/tess2/include"
@@ -42,7 +42,7 @@ MISC_FLAGS = "-ObjC"
4242

4343
OF_CORE_LIBS = $(MISC_FLAGS) $(LIB_OF)
4444

45-
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_FMT) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
45+
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_OFXIOS) $(HEADER_UTF8) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_FMT) $(HEADER_RTAUDIO) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_FMT) $(HEADER_CURL) $(HEADER_URIPARSER) $(HEADER_PUGIXML)
4646

4747
OF_CORE_FRAMEWORKS = -framework AudioToolbox -framework Accelerate -framework AVFoundation -framework CoreAudio -framework CoreGraphics -framework CoreLocation -framework CoreMedia -framework CoreVideo -framework Foundation -framework GameController -framework GLKit -framework MapKit -framework OpenAL -framework OpenGLES -framework UIKit -framework Security -framework QuartzCore -framework Metal -framework MetalKit
4848

scripts/templates/ios/Project.xcconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ OF_PATH = ../../..
1111
// suggested to use semantic versioning format ala #.#.#
1212
MARKETING_VERSION = 0.1.0
1313

14+
15+
OF_NO_FMOD=1
16+
USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
17+
1418
// this is "Build" in the Xcode target Identity UI, an incremental build number
1519
// important for the App Store as new build submissions need a diff number even
1620
// if MARKETING_VERSION is the same

scripts/templates/tvOS/Project.xcconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ OF_PATH = ../../..
55
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
66
#include "../../../libs/openFrameworksCompiled/project/tvOS/CoreOF.xcconfig"
77

8+
OF_NO_FMOD=1
9+
USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
10+
811
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS)
912
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
1013

0 commit comments

Comments
 (0)