Skip to content

Commit

Permalink
Implemented XP12 Sound System
Browse files Browse the repository at this point in the history
(FMOD system not yet re-integrated)
  • Loading branch information
TwinFan committed Jun 30, 2023
1 parent 890549f commit eed1bea
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else()
endif()

project(XPMP2-Sample
VERSION 3.2.0
VERSION 3.3.0
DESCRIPTION "XPMP2-Sample X-Plane plugin")

message ("== Building: ${PROJECT_NAME} ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ==")
Expand Down
4 changes: 2 additions & 2 deletions XPMP2-Sample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void CBPlaneNotifier(XPMPPlaneID inPlaneID,
}
}

#if defined(DEBUG) && defined(INCLUDE_FMOD_SOUND)
#if defined(DEBUG) && (INCLUDE_FMOD_SOUND + 0 >= 1)
/// Just for purposes of testing this functionality, we list all loaded sounds
void DebugListLoadedSoundNames()
{
Expand Down Expand Up @@ -1014,7 +1014,7 @@ PLUGIN_API int XPluginEnable(void)
LogMsg("XPMP2-Sample: Error while loading CSL packages: %s", res);
}

#if defined(DEBUG) && defined(INCLUDE_FMOD_SOUND)
#if defined(DEBUG) && (INCLUDE_FMOD_SOUND + 0 >= 1)
// Just for purposes of testing this functionality, we list all loaded sounds
// (This is likely not required in your plugin)
DebugListLoadedSoundNames();
Expand Down
6 changes: 2 additions & 4 deletions XPMP2-Sample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
254A0B792918533F004CA228 /* XPLM.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XPLM.framework; path = lib/SDK/Libraries/Mac/XPLM.framework; sourceTree = "<group>"; };
254A0B7B29185357004CA228 /* libfmod.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmod.dylib; path = lib/fmod/libfmod.dylib; sourceTree = "<group>"; };
254A0B7D291853CD004CA228 /* XPMP2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = XPMP2.xcodeproj; path = lib/XPMP2/XPMP2.xcodeproj; sourceTree = "<group>"; };
2572C40523D88802006A7726 /* XPMP2-Sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "XPMP2-Sample.cpp"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,7 +119,6 @@
25F4A2E62A3F9CF8002509C3 /* XPLM.framework */,
254A0B7D291853CD004CA228 /* XPMP2.xcodeproj */,
254A0B7B29185357004CA228 /* libfmod.dylib */,
254A0B792918533F004CA228 /* XPLM.framework */,
D6A7BDC016A1DEC000D1426A /* CoreFoundation.framework */,
D6A7BDA916A1DEA200D1426A /* OpenGL.framework */,
);
Expand Down Expand Up @@ -259,7 +257,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"INCLUDE_FMOD_SOUND=1",
"INCLUDE_FMOD_SOUND=0",
"APL=1",
"IBM=0",
"LIN=0",
Expand Down Expand Up @@ -363,7 +361,7 @@
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"INCLUDE_FMOD_SOUND=1",
"INCLUDE_FMOD_SOUND=0",
"APL=1",
"IBM=0",
"LIN=0",
Expand Down
2 changes: 1 addition & 1 deletion lib/XPMP2

0 comments on commit eed1bea

Please sign in to comment.