Skip to content

Commit 887d1fc

Browse files
committed
Re-integrated FMOD instance sound system
1 parent 62a3a6f commit 887d1fc

File tree

177 files changed

+9112
-4838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+9112
-4838
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ endif()
200200
# (The actual FMOD lib is not included here, that needs to be done by the plugin target)
201201
if(INCLUDE_FMOD_SOUND)
202202
# Compile options
203-
add_compile_definitions(INCLUDE_FMOD_SOUND)
203+
add_compile_definitions(INCLUDE_FMOD_SOUND=1)
204204
target_sources(XPMP2 PRIVATE
205205
src/SoundFMOD.h
206206
src/SoundFMOD.cpp

XPMP2.xcodeproj/project.pbxproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
2599B92123BF63F600F92BB5 /* XPMP2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPMP2.h; sourceTree = "<group>"; };
8888
25AE8CB323E376E1000BE21E /* 2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2D.cpp; sourceTree = "<group>"; };
8989
25AE8CB423E376E2000BE21E /* 2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 2D.h; sourceTree = "<group>"; };
90+
25B8D14A2A50CF2A00D8DAE9 /* SharedDataRefs.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = SharedDataRefs.md; sourceTree = "<group>"; };
91+
25B8D14B2A50CF2A00D8DAE9 /* Wake.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Wake.md; sourceTree = "<group>"; };
92+
25B8D14C2A50CF2A00D8DAE9 /* Contrails.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Contrails.md; sourceTree = "<group>"; };
93+
25B8D14D2A50CF2B00D8DAE9 /* CopyingObjFiles.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CopyingObjFiles.md; sourceTree = "<group>"; };
94+
25B8D14E2A50CF2B00D8DAE9 /* Sound.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Sound.md; sourceTree = "<group>"; };
95+
25B8D14F2A50CF2B00D8DAE9 /* Remote.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Remote.md; sourceTree = "<group>"; };
9096
25D1D25523C9285300D20D58 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
9197
25D680B123BE936B00C83CC5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9298
25D680B623BE95FB00C83CC5 /* XPCAircraft.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = XPCAircraft.h; sourceTree = "<group>"; };
@@ -220,14 +226,20 @@
220226
children = (
221227
25019BCB24919A1500355472 /* BackwardsCompatibility.md */,
222228
25019BC924919A1500355472 /* Building.md */,
229+
25B8D14C2A50CF2A00D8DAE9 /* Contrails.md */,
230+
25B8D14D2A50CF2B00D8DAE9 /* CopyingObjFiles.md */,
223231
25019BC724919A1500355472 /* CSLdataRefs.md */,
224232
25019BCA24919A1500355472 /* Deploying.md */,
225233
25019BC624919A1500355472 /* HowTo.md */,
226234
2574E0052457842A000E8156 /* html */,
227235
2574E00424578419000E8156 /* index.md */,
228236
25D680BF23BE9BB900C83CC5 /* MainPage.md */,
229237
25019BCC24919A1600355472 /* Matching.md */,
238+
25B8D14F2A50CF2B00D8DAE9 /* Remote.md */,
239+
25B8D14A2A50CF2A00D8DAE9 /* SharedDataRefs.md */,
240+
25B8D14E2A50CF2B00D8DAE9 /* Sound.md */,
230241
25019BC824919A1500355472 /* TCAS.md */,
242+
25B8D14B2A50CF2A00D8DAE9 /* Wake.md */,
231243
25D680BE23BE9BB900C83CC5 /* XPMP2.doxygen */,
232244
25997FB62476A33E00F36447 /* XSBAircraftFormat.md */,
233245
);
@@ -424,7 +436,7 @@
424436
GCC_PRECOMPILE_PREFIX_HEADER = YES;
425437
GCC_PREPROCESSOR_DEFINITIONS = (
426438
"DEBUG=1",
427-
"INCLUDE_FMOD_SOUND=0",
439+
"INCLUDE_FMOD_SOUND=1",
428440
"APL=1",
429441
"IBM=0",
430442
"LIN=0",
@@ -527,7 +539,7 @@
527539
GCC_PRECOMPILE_PREFIX_HEADER = YES;
528540
GCC_PREPROCESSOR_DEFINITIONS = (
529541
"NDEBUG=1",
530-
"INCLUDE_FMOD_SOUND=0",
542+
"INCLUDE_FMOD_SOUND=1",
531543
"APL=1",
532544
"IBM=0",
533545
"LIN=0",

docs/html/2D_8cpp.html

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/2D_8h.html

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/2D_8h_source.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/AIMultiplayer_8cpp.html

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/AIMultiplayer_8h.html

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/html/AIMultiplayer_8h_source.html

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)