Use OpenAL in Mac builds
This commit is contained in:
Jens Ayton
parent
88d8d6df6c
commit
9579dcfb6a
@ -1 +1 @@
|
||||
Subproject commit b8124f2f7565bab62aa7388805081ddd7bb9f2b0
|
||||
Subproject commit e6b72d6f1eeed7cd8e10db78cbb79ef85822a16a
|
||||
@ -70,7 +70,6 @@
|
||||
1A047B7F0DCB3D7500EE1CD0 /* OOProbabilitySet.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A047B7D0DCB3D7500EE1CD0 /* OOProbabilitySet.m */; };
|
||||
1A062C8911B28D8A00727C1D /* NSObjectOOExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A062C8711B28D8A00727C1D /* NSObjectOOExtensions.h */; };
|
||||
1A062C8A11B28D8A00727C1D /* NSObjectOOExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A062C8811B28D8A00727C1D /* NSObjectOOExtensions.m */; };
|
||||
1A06F2861196E5B100AFA5B4 /* OOCASoundDebugMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A06F2851196E5B100AFA5B4 /* OOCASoundDebugMonitor.h */; };
|
||||
1A06F3151196FB6F00AFA5B4 /* oolite-player-AI.plist in Copy AIs */ = {isa = PBXBuildFile; fileRef = 1A06F3141196FB6F00AFA5B4 /* oolite-player-AI.plist */; };
|
||||
1A0729D90EF56D1200B0F925 /* OOConvertSystemDescriptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0729D70EF56D1200B0F925 /* OOConvertSystemDescriptions.h */; };
|
||||
1A0729DA0EF56D1200B0F925 /* OOConvertSystemDescriptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A0729D80EF56D1200B0F925 /* OOConvertSystemDescriptions.m */; };
|
||||
@ -567,8 +566,6 @@
|
||||
1A817DBF106D441200AA2F97 /* oolite-particle-flash.png in Copy Textures */ = {isa = PBXBuildFile; fileRef = 1A817DBE106D441200AA2F97 /* oolite-particle-flash.png */; };
|
||||
1A817DC3106D443B00AA2F97 /* OOFlashEffectEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A817DC1106D443B00AA2F97 /* OOFlashEffectEntity.h */; };
|
||||
1A817DC4106D443B00AA2F97 /* OOFlashEffectEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A817DC2106D443B00AA2F97 /* OOFlashEffectEntity.m */; };
|
||||
1A81F7090A7BAC4D006580AD /* OOCAMusic.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A81F7070A7BAC4D006580AD /* OOCAMusic.m */; };
|
||||
1A81F70A0A7BAC4D006580AD /* OOCAMusic.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81F7080A7BAC4D006580AD /* OOCAMusic.h */; };
|
||||
1A87063E1172029F003FDD2A /* OODebugFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A87063D1172029F003FDD2A /* OODebugFlags.h */; };
|
||||
1A89CBCD182533D900A4E455 /* oolite_adder.dat in Copy Models */ = {isa = PBXBuildFile; fileRef = 1A89CBA1182533BE00A4E455 /* oolite_adder.dat */; };
|
||||
1A89CBCE182533D900A4E455 /* oolite_anaconda.dat in Copy Models */ = {isa = PBXBuildFile; fileRef = 1A89CBA2182533BE00A4E455 /* oolite_anaconda.dat */; };
|
||||
@ -724,6 +721,25 @@
|
||||
1A9FCF2315DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9FCF2115DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.h */; };
|
||||
1A9FCF2415DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A9FCF2215DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.m */; };
|
||||
1A9FCF2615DAC9BC00E965D5 /* GameController+FullScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A9FCF2515DAC9BC00E965D5 /* GameController+FullScreen.m */; };
|
||||
1AA085FE182578AF007CCAEB /* OOALBufferedSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085EE182578AF007CCAEB /* OOALBufferedSound.h */; };
|
||||
1AA085FF182578AF007CCAEB /* OOALBufferedSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085EF182578AF007CCAEB /* OOALBufferedSound.m */; };
|
||||
1AA08600182578AF007CCAEB /* OOALConcreteSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085F0182578AF007CCAEB /* OOALConcreteSound.h */; };
|
||||
1AA08602182578AF007CCAEB /* OOALMusic.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085F2182578AF007CCAEB /* OOALMusic.h */; };
|
||||
1AA08603182578AF007CCAEB /* OOALMusic.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085F3182578AF007CCAEB /* OOALMusic.m */; };
|
||||
1AA08604182578AF007CCAEB /* OOALSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085F4182578AF007CCAEB /* OOALSound.h */; };
|
||||
1AA08605182578AF007CCAEB /* OOALSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085F5182578AF007CCAEB /* OOALSound.m */; };
|
||||
1AA08606182578AF007CCAEB /* OOALSoundChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085F6182578AF007CCAEB /* OOALSoundChannel.h */; };
|
||||
1AA08607182578AF007CCAEB /* OOALSoundChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085F7182578AF007CCAEB /* OOALSoundChannel.m */; };
|
||||
1AA08608182578AF007CCAEB /* OOALSoundDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085F8182578AF007CCAEB /* OOALSoundDecoder.h */; };
|
||||
1AA08609182578AF007CCAEB /* OOALSoundDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085F9182578AF007CCAEB /* OOALSoundDecoder.m */; settings = {COMPILER_FLAGS = "-Wno-unused-variable"; }; };
|
||||
1AA0860A182578AF007CCAEB /* OOALSoundMixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085FA182578AF007CCAEB /* OOALSoundMixer.h */; };
|
||||
1AA0860B182578AF007CCAEB /* OOALSoundMixer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085FB182578AF007CCAEB /* OOALSoundMixer.m */; };
|
||||
1AA0860C182578AF007CCAEB /* OOALStreamedSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA085FC182578AF007CCAEB /* OOALStreamedSound.h */; };
|
||||
1AA0860D182578AF007CCAEB /* OOALStreamedSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA085FD182578AF007CCAEB /* OOALStreamedSound.m */; };
|
||||
1AA08611182578B8007CCAEB /* OOOpenAL.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA0860E182578B8007CCAEB /* OOOpenAL.h */; };
|
||||
1AA08612182578B8007CCAEB /* OOOpenALController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA0860F182578B8007CCAEB /* OOOpenALController.h */; };
|
||||
1AA08613182578B8007CCAEB /* OOOpenALController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA08610182578B8007CCAEB /* OOOpenALController.m */; };
|
||||
1AA0861618257A11007CCAEB /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA0861518257A11007CCAEB /* OpenAL.framework */; };
|
||||
1AA59C6C1780396C007C7373 /* OOJSWormhole.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA59C6A1780396C007C7373 /* OOJSWormhole.h */; };
|
||||
1AA59C6D1780396C007C7373 /* OOJSWormhole.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AA59C6B1780396C007C7373 /* OOJSWormhole.m */; };
|
||||
1AA7FCAB10C2B9BA0058FBED /* OOPlanetDrawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA7FCA910C2B9BA0058FBED /* OOPlanetDrawable.h */; };
|
||||
@ -856,25 +872,6 @@
|
||||
2512834609BA281500F43D55 /* CollisionRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 2512834409BA281500F43D55 /* CollisionRegion.h */; };
|
||||
2512834709BA281500F43D55 /* CollisionRegion.m in Sources */ = {isa = PBXBuildFile; fileRef = 2512834509BA281500F43D55 /* CollisionRegion.m */; settings = {COMPILER_FLAGS = $OO_MATHS_OPTS; }; };
|
||||
25160E2F0995362F0037C2E1 /* OOCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 25160E2E0995362F0037C2E1 /* OOCocoa.h */; };
|
||||
251610DD099544090037C2E1 /* OOCABufferedSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610CA099544090037C2E1 /* OOCABufferedSound.h */; };
|
||||
251610DE099544090037C2E1 /* OOCASoundMixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610CB099544090037C2E1 /* OOCASoundMixer.h */; };
|
||||
251610E0099544090037C2E1 /* OOCASoundChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610CD099544090037C2E1 /* OOCASoundChannel.h */; };
|
||||
251610E2099544090037C2E1 /* OOCASoundReferencePoint.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610CF099544090037C2E1 /* OOCASoundReferencePoint.m */; };
|
||||
251610E3099544090037C2E1 /* OOCASound.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610D0099544090037C2E1 /* OOCASound.h */; };
|
||||
251610E4099544090037C2E1 /* OOCASoundMixer.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610D1099544090037C2E1 /* OOCASoundMixer.m */; };
|
||||
251610E5099544090037C2E1 /* OOCABufferedSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610D2099544090037C2E1 /* OOCABufferedSound.m */; };
|
||||
251610E6099544090037C2E1 /* OOCAStreamingSound.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610D3099544090037C2E1 /* OOCAStreamingSound.m */; };
|
||||
251610E7099544090037C2E1 /* OOCASoundDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610D4099544090037C2E1 /* OOCASoundDecoder.h */; };
|
||||
251610E8099544090037C2E1 /* OOCASound.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610D5099544090037C2E1 /* OOCASound.m */; };
|
||||
251610E9099544090037C2E1 /* OOCASoundChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610D6099544090037C2E1 /* OOCASoundChannel.m */; };
|
||||
251610EA099544090037C2E1 /* OOCAStreamingSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610D7099544090037C2E1 /* OOCAStreamingSound.h */; };
|
||||
251610EB099544090037C2E1 /* OOErrorDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610D8099544090037C2E1 /* OOErrorDescription.h */; };
|
||||
251610EC099544090037C2E1 /* OOCASoundReferencePoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610D9099544090037C2E1 /* OOCASoundReferencePoint.h */; };
|
||||
251610ED099544090037C2E1 /* OOCASoundInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610DA099544090037C2E1 /* OOCASoundInternal.h */; };
|
||||
251610EE099544090037C2E1 /* OOCASoundDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610DB099544090037C2E1 /* OOCASoundDecoder.m */; };
|
||||
251610EF099544090037C2E1 /* OOErrorDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610DC099544090037C2E1 /* OOErrorDescription.m */; };
|
||||
251610F2099544190037C2E1 /* VirtualRingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610F0099544190037C2E1 /* VirtualRingBuffer.m */; };
|
||||
251610F3099544190037C2E1 /* VirtualRingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 251610F1099544190037C2E1 /* VirtualRingBuffer.h */; };
|
||||
25161153099544390037C2E1 /* AI.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161101099544380037C2E1 /* AI.m */; };
|
||||
25161158099544390037C2E1 /* AI.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161106099544390037C2E1 /* AI.h */; };
|
||||
2516115A099544390037C2E1 /* OOTrumble.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161108099544390037C2E1 /* OOTrumble.m */; };
|
||||
@ -2309,6 +2306,26 @@
|
||||
1A9FCF2115DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOMacSnowLeopardFullScreenController.h; sourceTree = "<group>"; };
|
||||
1A9FCF2215DAC8E100E965D5 /* OOMacSnowLeopardFullScreenController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOMacSnowLeopardFullScreenController.m; sourceTree = "<group>"; };
|
||||
1A9FCF2515DAC9BC00E965D5 /* GameController+FullScreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GameController+FullScreen.m"; sourceTree = "<group>"; };
|
||||
1AA085EE182578AF007CCAEB /* OOALBufferedSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALBufferedSound.h; sourceTree = "<group>"; };
|
||||
1AA085EF182578AF007CCAEB /* OOALBufferedSound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALBufferedSound.m; sourceTree = "<group>"; };
|
||||
1AA085F0182578AF007CCAEB /* OOALConcreteSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALConcreteSound.h; sourceTree = "<group>"; };
|
||||
1AA085F1182578AF007CCAEB /* OOALConcreteSound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALConcreteSound.m; sourceTree = "<group>"; };
|
||||
1AA085F2182578AF007CCAEB /* OOALMusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALMusic.h; sourceTree = "<group>"; };
|
||||
1AA085F3182578AF007CCAEB /* OOALMusic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALMusic.m; sourceTree = "<group>"; };
|
||||
1AA085F4182578AF007CCAEB /* OOALSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALSound.h; sourceTree = "<group>"; };
|
||||
1AA085F5182578AF007CCAEB /* OOALSound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALSound.m; sourceTree = "<group>"; };
|
||||
1AA085F6182578AF007CCAEB /* OOALSoundChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALSoundChannel.h; sourceTree = "<group>"; };
|
||||
1AA085F7182578AF007CCAEB /* OOALSoundChannel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALSoundChannel.m; sourceTree = "<group>"; };
|
||||
1AA085F8182578AF007CCAEB /* OOALSoundDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALSoundDecoder.h; sourceTree = "<group>"; };
|
||||
1AA085F9182578AF007CCAEB /* OOALSoundDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALSoundDecoder.m; sourceTree = "<group>"; };
|
||||
1AA085FA182578AF007CCAEB /* OOALSoundMixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALSoundMixer.h; sourceTree = "<group>"; };
|
||||
1AA085FB182578AF007CCAEB /* OOALSoundMixer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALSoundMixer.m; sourceTree = "<group>"; };
|
||||
1AA085FC182578AF007CCAEB /* OOALStreamedSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOALStreamedSound.h; sourceTree = "<group>"; };
|
||||
1AA085FD182578AF007CCAEB /* OOALStreamedSound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOALStreamedSound.m; sourceTree = "<group>"; };
|
||||
1AA0860E182578B8007CCAEB /* OOOpenAL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOOpenAL.h; sourceTree = "<group>"; };
|
||||
1AA0860F182578B8007CCAEB /* OOOpenALController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOOpenALController.h; sourceTree = "<group>"; };
|
||||
1AA08610182578B8007CCAEB /* OOOpenALController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOOpenALController.m; sourceTree = "<group>"; };
|
||||
1AA0861518257A11007CCAEB /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
|
||||
1AA59C6A1780396C007C7373 /* OOJSWormhole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOJSWormhole.h; sourceTree = "<group>"; };
|
||||
1AA59C6B1780396C007C7373 /* OOJSWormhole.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOJSWormhole.m; sourceTree = "<group>"; };
|
||||
1AA7FCA910C2B9BA0058FBED /* OOPlanetDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOPlanetDrawable.h; sourceTree = "<group>"; };
|
||||
@ -2526,6 +2543,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1AA0861618257A11007CCAEB /* OpenAL.framework in Frameworks */,
|
||||
0878FD30086EF845004CB752 /* Carbon.framework in Frameworks */,
|
||||
0865431C06B8447D000CA0AB /* Cocoa.framework in Frameworks */,
|
||||
0865431D06B8447D000CA0AB /* OpenGL.framework in Frameworks */,
|
||||
@ -3229,7 +3247,8 @@
|
||||
1ACBF06F0D82DF9B00CC005F /* OOSoundSourcePool.h */,
|
||||
1ACBF0700D82DF9B00CC005F /* OOSoundSourcePool.m */,
|
||||
1A7B967E0E620C9E00322821 /* OOSoundInternal.h */,
|
||||
1A8A3D8F0B9B058500AB7625 /* Mac-specific */,
|
||||
1AA085E81825788E007CCAEB /* OpenAL */,
|
||||
1A8A3D8F0B9B058500AB7625 /* CoreAudio */,
|
||||
);
|
||||
name = Audio;
|
||||
sourceTree = "<group>";
|
||||
@ -3768,7 +3787,7 @@
|
||||
name = Mathematics;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
1A8A3D8F0B9B058500AB7625 /* Mac-specific */ = {
|
||||
1A8A3D8F0B9B058500AB7625 /* CoreAudio */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
251610D0099544090037C2E1 /* OOCASound.h */,
|
||||
@ -3794,10 +3813,36 @@
|
||||
251610F0099544190037C2E1 /* VirtualRingBuffer.m */,
|
||||
1A06F2851196E5B100AFA5B4 /* OOCASoundDebugMonitor.h */,
|
||||
);
|
||||
name = "Mac-specific";
|
||||
name = CoreAudio;
|
||||
path = ../Cocoa;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
1AA085E81825788E007CCAEB /* OpenAL */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1AA0860E182578B8007CCAEB /* OOOpenAL.h */,
|
||||
1AA0860F182578B8007CCAEB /* OOOpenALController.h */,
|
||||
1AA08610182578B8007CCAEB /* OOOpenALController.m */,
|
||||
1AA085EE182578AF007CCAEB /* OOALBufferedSound.h */,
|
||||
1AA085EF182578AF007CCAEB /* OOALBufferedSound.m */,
|
||||
1AA085F0182578AF007CCAEB /* OOALConcreteSound.h */,
|
||||
1AA085F1182578AF007CCAEB /* OOALConcreteSound.m */,
|
||||
1AA085F2182578AF007CCAEB /* OOALMusic.h */,
|
||||
1AA085F3182578AF007CCAEB /* OOALMusic.m */,
|
||||
1AA085F4182578AF007CCAEB /* OOALSound.h */,
|
||||
1AA085F5182578AF007CCAEB /* OOALSound.m */,
|
||||
1AA085F6182578AF007CCAEB /* OOALSoundChannel.h */,
|
||||
1AA085F7182578AF007CCAEB /* OOALSoundChannel.m */,
|
||||
1AA085F8182578AF007CCAEB /* OOALSoundDecoder.h */,
|
||||
1AA085F9182578AF007CCAEB /* OOALSoundDecoder.m */,
|
||||
1AA085FA182578AF007CCAEB /* OOALSoundMixer.h */,
|
||||
1AA085FB182578AF007CCAEB /* OOALSoundMixer.m */,
|
||||
1AA085FC182578AF007CCAEB /* OOALStreamedSound.h */,
|
||||
1AA085FD182578AF007CCAEB /* OOALStreamedSound.m */,
|
||||
);
|
||||
name = OpenAL;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
1AA2E7061191E39600DFBA23 /* Build stuff */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@ -3963,6 +4008,7 @@
|
||||
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1AA0861518257A11007CCAEB /* OpenAL.framework */,
|
||||
1A5D58811825241800C779AE /* MiniZip */,
|
||||
1AB775FC12CA2E53001478BB /* libjs.xcodeproj */,
|
||||
1AE3454B12CB77A700FD8C62 /* Ogg.xcodeproj */,
|
||||
@ -3985,16 +4031,7 @@
|
||||
25F3E6310994F033002F25FD /* legacy_random.h in Headers */,
|
||||
25F3E63B0994F08A002F25FD /* OOOpenGL.h in Headers */,
|
||||
25160E2F0995362F0037C2E1 /* OOCocoa.h in Headers */,
|
||||
251610DD099544090037C2E1 /* OOCABufferedSound.h in Headers */,
|
||||
251610DE099544090037C2E1 /* OOCASoundMixer.h in Headers */,
|
||||
251610E0099544090037C2E1 /* OOCASoundChannel.h in Headers */,
|
||||
251610E3099544090037C2E1 /* OOCASound.h in Headers */,
|
||||
251610E7099544090037C2E1 /* OOCASoundDecoder.h in Headers */,
|
||||
251610EA099544090037C2E1 /* OOCAStreamingSound.h in Headers */,
|
||||
251610EB099544090037C2E1 /* OOErrorDescription.h in Headers */,
|
||||
251610EC099544090037C2E1 /* OOCASoundReferencePoint.h in Headers */,
|
||||
251610ED099544090037C2E1 /* OOCASoundInternal.h in Headers */,
|
||||
251610F3099544190037C2E1 /* VirtualRingBuffer.h in Headers */,
|
||||
1AA08611182578B8007CCAEB /* OOOpenAL.h in Headers */,
|
||||
25161158099544390037C2E1 /* AI.h in Headers */,
|
||||
2516115D099544390037C2E1 /* GameController.h in Headers */,
|
||||
25161162099544390037C2E1 /* OOTrumble.h in Headers */,
|
||||
@ -4008,9 +4045,9 @@
|
||||
2576E7B309B4F418007410F7 /* MyOpenGLView.h in Headers */,
|
||||
2512833F09BA27C100F43D55 /* Octree.h in Headers */,
|
||||
2512834209BA27EC00F43D55 /* OOMeshToOctreeConverter.h in Headers */,
|
||||
1AA08608182578AF007CCAEB /* OOALSoundDecoder.h in Headers */,
|
||||
2512834609BA281500F43D55 /* CollisionRegion.h in Headers */,
|
||||
083325DD09DDBCDE00F5B8E4 /* OOColor.h in Headers */,
|
||||
1A81F70A0A7BAC4D006580AD /* OOCAMusic.h in Headers */,
|
||||
1A8A37570B960337007D20B8 /* NSMutableDictionaryOOExtensions.h in Headers */,
|
||||
1A8A394F0B96229C007D20B8 /* NSFileManagerOOExtensions.h in Headers */,
|
||||
1A8A3A380B962AEF007D20B8 /* NSScannerOOExtensions.h in Headers */,
|
||||
@ -4026,6 +4063,7 @@
|
||||
1A94057F0BAF52AD005F6CF3 /* OOQuaternion.h in Headers */,
|
||||
1A94062B0BAF6170005F6CF3 /* OOBoundingBox.h in Headers */,
|
||||
1A9406840BAF66D6005F6CF3 /* OOVoxel.h in Headers */,
|
||||
1AA08604182578AF007CCAEB /* OOALSound.h in Headers */,
|
||||
1A9406B40BAF67BF005F6CF3 /* OOTriangle.h in Headers */,
|
||||
1AB01ABE0BB15AED00F1B949 /* OOTextureScaling.h in Headers */,
|
||||
1AB01BBB0BB16A8A00F1B949 /* OOFastArithmetic.h in Headers */,
|
||||
@ -4090,6 +4128,7 @@
|
||||
1A7D3B9B0C4F7843008EDC33 /* OOCheckDemoShipsPListVerifierStage.h in Headers */,
|
||||
1A7D3C490C4F818C008EDC33 /* OOCheckEquipmentPListVerifierStage.h in Headers */,
|
||||
1A7D3D2B0C4F8D02008EDC33 /* OOTextureVerifierStage.h in Headers */,
|
||||
1AA0860C182578AF007CCAEB /* OOALStreamedSound.h in Headers */,
|
||||
1A7D41870C516B90008EDC33 /* OOModelVerifierStage.h in Headers */,
|
||||
1A7D41E20C516E9E008EDC33 /* OOCheckShipDataPListVerifierStage.h in Headers */,
|
||||
1A6DD1230C57B5BC00A892F4 /* OOPListSchemaVerifier.h in Headers */,
|
||||
@ -4099,6 +4138,8 @@
|
||||
1A73712D0C623DAE0097AC37 /* OOJSStation.h in Headers */,
|
||||
1A7376BE0C64AE330097AC37 /* OOJSSystem.h in Headers */,
|
||||
1A4FB3350C8DC86800DC8E1F /* OOJSOolite.h in Headers */,
|
||||
1AA0860A182578AF007CCAEB /* OOALSoundMixer.h in Headers */,
|
||||
1AA08602182578AF007CCAEB /* OOALMusic.h in Headers */,
|
||||
1ACEA3490C91507000C7CE97 /* OORoleSet.h in Headers */,
|
||||
1ACEA6BF0C91DA3E00C7CE97 /* OOJSGlobal.h in Headers */,
|
||||
1ACEA7280C91DF2800C7CE97 /* OOJSMissionVariables.h in Headers */,
|
||||
@ -4113,6 +4154,7 @@
|
||||
1A2DA2B00CB4CB5C00DE6823 /* OOTCPStreamDecoder.h in Headers */,
|
||||
1A2DA34D0CB4D0D800DE6823 /* OOJSConsole.h in Headers */,
|
||||
1A2DA34E0CB4D0D800DE6823 /* OODebugMonitor.h in Headers */,
|
||||
1AA08600182578AF007CCAEB /* OOALConcreteSound.h in Headers */,
|
||||
1A2DA3550CB4D10800DE6823 /* OODebuggerInterface.h in Headers */,
|
||||
1A2DA3EF0CB4E84900DE6823 /* OODebugSupport.h in Headers */,
|
||||
1A43A0CC0CB91D2C00D0E239 /* OOJSPlanet.h in Headers */,
|
||||
@ -4188,12 +4230,13 @@
|
||||
1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */,
|
||||
1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */,
|
||||
1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */,
|
||||
1A06F2861196E5B100AFA5B4 /* OOCASoundDebugMonitor.h in Headers */,
|
||||
1AEB491A119D5AAA007BD514 /* OORegExpMatcher.h in Headers */,
|
||||
1A062C8911B28D8A00727C1D /* NSObjectOOExtensions.h in Headers */,
|
||||
1AABA83E11B941D1003487D5 /* OOPixMapTextureLoader.h in Headers */,
|
||||
1A11C2B111CFC35000F3EE77 /* OOJSEngineTimeManagement.h in Headers */,
|
||||
1A143A4811EF22C5001BAB8D /* JAPersistentFileReference.h in Headers */,
|
||||
1AA08606182578AF007CCAEB /* OOALSoundChannel.h in Headers */,
|
||||
1AA085FE182578AF007CCAEB /* OOALBufferedSound.h in Headers */,
|
||||
1AB5E1EF12BD628500C334DD /* OOJoystickManager.h in Headers */,
|
||||
1A35257212E1FFA900244C9D /* OOConstToJSString.h in Headers */,
|
||||
1AEF57D312E51DDB00546444 /* OOJSEngineNativeWrappers.h in Headers */,
|
||||
@ -4220,6 +4263,7 @@
|
||||
1AD8522517947BD600CBE743 /* OOHPVector.h in Headers */,
|
||||
1AD8522E17947C9500CBE743 /* OOJSPopulatorDefinition.h in Headers */,
|
||||
1A9438CF17F84C560011F80B /* OOExplosionCloudEntity.h in Headers */,
|
||||
1AA08612182578B8007CCAEB /* OOOpenALController.h in Headers */,
|
||||
1A5D5893182525DE00C779AE /* NSDataOOExtensions.h in Headers */,
|
||||
1A1F6D0D180AC324002AD52E /* OOWaypointEntity.h in Headers */,
|
||||
1A1F6D16180AC371002AD52E /* OOJSWaypoint.h in Headers */,
|
||||
@ -4495,15 +4539,6 @@
|
||||
files = (
|
||||
25F3E6330994F04C002F25FD /* legacy_random.c in Sources */,
|
||||
25F3E6BD0994F30A002F25FD /* main.m in Sources */,
|
||||
251610E2099544090037C2E1 /* OOCASoundReferencePoint.m in Sources */,
|
||||
251610E4099544090037C2E1 /* OOCASoundMixer.m in Sources */,
|
||||
251610E5099544090037C2E1 /* OOCABufferedSound.m in Sources */,
|
||||
251610E6099544090037C2E1 /* OOCAStreamingSound.m in Sources */,
|
||||
251610E8099544090037C2E1 /* OOCASound.m in Sources */,
|
||||
251610E9099544090037C2E1 /* OOCASoundChannel.m in Sources */,
|
||||
251610EE099544090037C2E1 /* OOCASoundDecoder.m in Sources */,
|
||||
251610EF099544090037C2E1 /* OOErrorDescription.m in Sources */,
|
||||
251610F2099544190037C2E1 /* VirtualRingBuffer.m in Sources */,
|
||||
25161153099544390037C2E1 /* AI.m in Sources */,
|
||||
2516115A099544390037C2E1 /* OOTrumble.m in Sources */,
|
||||
2516115E099544390037C2E1 /* GameController.m in Sources */,
|
||||
@ -4518,7 +4553,6 @@
|
||||
1A68A4A51615F4A400D7BB08 /* OOMeshToOctreeConverter.m in Sources */,
|
||||
2512834709BA281500F43D55 /* CollisionRegion.m in Sources */,
|
||||
083325DE09DDBCDE00F5B8E4 /* OOColor.m in Sources */,
|
||||
1A81F7090A7BAC4D006580AD /* OOCAMusic.m in Sources */,
|
||||
1A8A37560B960337007D20B8 /* NSMutableDictionaryOOExtensions.m in Sources */,
|
||||
1A8A394E0B96229C007D20B8 /* NSFileManagerOOExtensions.m in Sources */,
|
||||
1A8A3A390B962AEF007D20B8 /* NSScannerOOExtensions.m in Sources */,
|
||||
@ -4540,6 +4574,7 @@
|
||||
1A5DBAAB0BC000DC00D57389 /* OOPListScript.m in Sources */,
|
||||
1A5DBAAE0BC000DC00D57389 /* OOScript.m in Sources */,
|
||||
1A5DBD590BC17F0900D57389 /* NSStringOOExtensions.m in Sources */,
|
||||
1AA08603182578AF007CCAEB /* OOALMusic.m in Sources */,
|
||||
1A3AFF200BC4462200B5E2D9 /* OOJSVector.m in Sources */,
|
||||
1A2A8C160BC65FFD001E00FB /* OOJSEntity.m in Sources */,
|
||||
1A2A8D3B0BC6765F001E00FB /* EntityOOJavaScriptExtensions.m in Sources */,
|
||||
@ -4606,7 +4641,9 @@
|
||||
1ACEA7AB0C91E32800C7CE97 /* OOJSMission.m in Sources */,
|
||||
1A6B1EF10C9AA5C6000717CF /* OOScriptTimer.m in Sources */,
|
||||
1A6B1F360C9AAA60000717CF /* OOPriorityQueue.m in Sources */,
|
||||
1AA08613182578B8007CCAEB /* OOOpenALController.m in Sources */,
|
||||
1A6B228E0C9B40D4000717CF /* OOJSTimer.m in Sources */,
|
||||
1AA085FF182578AF007CCAEB /* OOALBufferedSound.m in Sources */,
|
||||
1A6B25EF0C9C2746000717CF /* OOJSClock.m in Sources */,
|
||||
1A2DA3830CB4D25D00DE6823 /* OOTCPStreamDecoderAbstractionLayer.m in Sources */,
|
||||
1A2DA3870CB4D27400DE6823 /* OOTCPStreamDecoder.c in Sources */,
|
||||
@ -4657,8 +4694,11 @@
|
||||
1AE24374105439B500EAA7F2 /* OOLightParticleEntity.m in Sources */,
|
||||
1A11273C105994D000DF9D12 /* OOExhaustPlumeEntity.m in Sources */,
|
||||
1A1F2843105AAB7900ADB8C5 /* OOSparkEntity.m in Sources */,
|
||||
1AA0860D182578AF007CCAEB /* OOALStreamedSound.m in Sources */,
|
||||
1AA0860B182578AF007CCAEB /* OOALSoundMixer.m in Sources */,
|
||||
1A3BA25A106555D100C5C6F3 /* NSNumberOOExtensions.m in Sources */,
|
||||
1A00C65610663D3700A8737D /* OOProfilingStopwatch.m in Sources */,
|
||||
1AA08609182578AF007CCAEB /* OOALSoundDecoder.m in Sources */,
|
||||
1A00C7BB10667D3100A8737D /* OOECMBlastEntity.m in Sources */,
|
||||
1A00C7E01066814C00A8737D /* OOAsyncWorkManager.m in Sources */,
|
||||
1A817CFD106D232100AA2F97 /* OOPlasmaShotEntity.m in Sources */,
|
||||
@ -4680,6 +4720,7 @@
|
||||
1A3D034B11736EDA005BF5E6 /* OOMaterialConvenienceCreators.m in Sources */,
|
||||
1AECE9EF11779910003986A8 /* OOPixMap.m in Sources */,
|
||||
1A8C981D117A380800D8AB7E /* OOCombinedEmissionMapGenerator.m in Sources */,
|
||||
1AA08605182578AF007CCAEB /* OOALSound.m in Sources */,
|
||||
1A1F7DB6117B5D8100332757 /* OOMaterialSpecifier.m in Sources */,
|
||||
1A19783F117F81B10060DB56 /* OOPixMapChannelOperations.m in Sources */,
|
||||
1A95C041118A450E002EE302 /* OOConvertCubeMapToLatLong.m in Sources */,
|
||||
@ -4699,6 +4740,7 @@
|
||||
1A1280F912ECA4ED00B65D9F /* OOJSFont.m in Sources */,
|
||||
1AE7325112F75D470045513D /* OOLaserShotEntity.m in Sources */,
|
||||
1A97D77F12FDBB9B0009D74A /* OOQuiriumCascadeEntity.m in Sources */,
|
||||
1AA08607182578AF007CCAEB /* OOALSoundChannel.m in Sources */,
|
||||
1A4DF25D12FDC4880027F43D /* OORingEffectEntity.m in Sources */,
|
||||
1A4DF35412FDF0410027F43D /* OOParticleSystem.m in Sources */,
|
||||
1A033FB913268ABB006F9DB7 /* OOPDFView.m in Sources */,
|
||||
|
||||
@ -28,8 +28,7 @@ SOFTWARE.
|
||||
|
||||
*/
|
||||
|
||||
//#import "OOCASoundInternal.h"
|
||||
#import "OOCocoa.h"
|
||||
#import "OOSound.h"
|
||||
|
||||
#ifndef NDEBUG
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ _QuaternionDescription
|
||||
_VectorDescription
|
||||
_OOStringFromBehaviour
|
||||
_OOStringFromShaderSetting
|
||||
_OOSoundRegisterDebugMonitor
|
||||
# _OOSoundRegisterDebugMonitor # Not implemented in OpenAL builds
|
||||
_OOJSProfileEnter
|
||||
_OOJSProfileExit
|
||||
_OOJSUnreachable
|
||||
|
||||
@ -62,7 +62,7 @@ _QuaternionDescription
|
||||
_VectorDescription
|
||||
_OOStringFromBehaviour
|
||||
_OOStringFromShaderSetting
|
||||
_OOSoundRegisterDebugMonitor
|
||||
# _OOSoundRegisterDebugMonitor # Not implemented in OpenAL builds
|
||||
_OOJSProfileEnter
|
||||
_OOJSProfileExit
|
||||
_OOJSUnreachable
|
||||
|
||||
@ -43,8 +43,7 @@ MA 02110-1301, USA.
|
||||
|
||||
#import "OOCocoa.h"
|
||||
|
||||
// currently on SDL platforms only as I can't test Mac OS X
|
||||
#define OOLITE_OPENAL OOLITE_SDL
|
||||
#define OOLITE_OPENAL 1
|
||||
|
||||
#if OOLITE_OPENAL
|
||||
#import "OOALSound.h"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user