Skip to content

Commit

Permalink
Compile in OpenAL driver on macos/ios/tvos
Browse files Browse the repository at this point in the history
  • Loading branch information
warmenhoven committed Jun 30, 2023
1 parent 4d8f021 commit ace3d3e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/apple/BaseConfig.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ OTHER_CFLAGS = $(inherited) -DFLAC__HAS_OGG=0
OTHER_CFLAGS = $(inherited) -DGLSLANG_OSINCLUDE_UNIX
OTHER_CFLAGS = $(inherited) -DHAVE_7ZIP
OTHER_CFLAGS = $(inherited) -DHAVE_ACCESSIBILITY
OTHER_CFLAGS = $(inherited) -DHAVE_AL
OTHER_CFLAGS = $(inherited) -DHAVE_AUDIOMIXER
OTHER_CFLAGS = $(inherited) -DHAVE_BSV_MOVIE
OTHER_CFLAGS = $(inherited) -DHAVE_BUILTINGLSLANG
Expand Down
6 changes: 6 additions & 0 deletions pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
05A8E23C20A63CF50084ABDA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A8E23B20A63CF50084ABDA /* QuartzCore.framework */; };
05D7753520A567A400646447 /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05D7753320A5678300646447 /* griffin_cpp.cpp */; };
05D7753720A567A700646447 /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05D7753420A5678400646447 /* griffin_glslang.cpp */; };
070A88402A4E7A1B003161C0 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070A883F2A4E7A1B003161C0 /* OpenAL.framework */; };
070A88412A4E7A24003161C0 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070A883F2A4E7A1B003161C0 /* OpenAL.framework */; };
0720993E29B1258C001642BB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
0720993F29B1258C001642BB /* retroarch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 84DD5EB71A89F1C7007336C1 /* retroarch.icns */; };
0720994029B1258C001642BB /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9254B33025FA0BA300A1E0DA /* assets.zip */; };
Expand Down Expand Up @@ -517,6 +519,7 @@
05F2873F20F2BEEA00632D47 /* task_content.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_content.c; sourceTree = "<group>"; };
05F2874020F2BEEA00632D47 /* task_http.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_http.c; sourceTree = "<group>"; };
05F2874120F2BEEA00632D47 /* task_patch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_patch.c; sourceTree = "<group>"; };
070A883F2A4E7A1B003161C0 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
0720996029B1258C001642BB /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
072976DC296284F600D6E00C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
074695362995C03900CCB7BD /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -597,6 +600,7 @@
0720995329B1258C001642BB /* Metal.framework in Frameworks */,
0720995429B1258C001642BB /* MetalKit.framework in Frameworks */,
0720995529B1258C001642BB /* libz.dylib in Frameworks */,
070A88412A4E7A24003161C0 /* OpenAL.framework in Frameworks */,
0720995629B1258C001642BB /* CoreAudio.framework in Frameworks */,
0720995729B1258C001642BB /* AudioUnit.framework in Frameworks */,
0720995829B1258C001642BB /* AppKit.framework in Frameworks */,
Expand All @@ -619,6 +623,7 @@
05A8E23820A63CB40084ABDA /* Metal.framework in Frameworks */,
05269A6220ABF20500C29F1E /* MetalKit.framework in Frameworks */,
5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */,
070A88402A4E7A1B003161C0 /* OpenAL.framework in Frameworks */,
84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */,
84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */,
84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */,
Expand Down Expand Up @@ -1424,6 +1429,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
070A883F2A4E7A1B003161C0 /* OpenAL.framework */,
0795A8C6299A095300D5035D /* CoreHaptics.framework */,
074695362995C03900CCB7BD /* GameController.framework */,
D27C50892228360D00113BC0 /* AudioToolbox.framework */,
Expand Down
8 changes: 8 additions & 0 deletions pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
070A88432A4E7AA9003161C0 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070A88422A4E7AA9003161C0 /* OpenAL.framework */; };
0714E7142983A5AC00E6B45B /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */; };
0714E7152983A5E500E6B45B /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
073734A42A093A5700BF7397 /* JITSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A1F81727006CAE00DEAD2A /* JITSupport.m */; };
Expand Down Expand Up @@ -160,6 +161,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
070A88422A4E7AA9003161C0 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = tvOS/modules/libMoltenVK.dylib; sourceTree = "<group>"; };
0789FC2E2A07845300D042B7 /* AltKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = AltKit; path = Frameworks/AltKit; sourceTree = "<group>"; };
07B7872C29E8FE8F0088B74F /* filters */ = {isa = PBXFileReference; lastKnownFileType = folder; path = filters; sourceTree = "<group>"; };
Expand Down Expand Up @@ -467,6 +469,7 @@
9204BE171D319EF300BD49DB /* CoreMedia.framework in Frameworks */,
9204BE181D319EF300BD49DB /* AVFoundation.framework in Frameworks */,
9204BE191D319EF300BD49DB /* CoreVideo.framework in Frameworks */,
070A88432A4E7AA9003161C0 /* OpenAL.framework in Frameworks */,
9204BE1A1D319EF300BD49DB /* AudioToolbox.framework in Frameworks */,
9204BE1B1D319EF300BD49DB /* CoreAudio.framework in Frameworks */,
9204BE1C1D319EF300BD49DB /* UIKit.framework in Frameworks */,
Expand Down Expand Up @@ -1180,6 +1183,7 @@
96AFAE2816C1D4EA009DE44C /* Frameworks */ = {
isa = PBXGroup;
children = (
070A88422A4E7AA9003161C0 /* OpenAL.framework */,
92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */,
0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */,
9210C2F124B3A19100E6FE7C /* Metal.framework */,
Expand Down Expand Up @@ -1582,6 +1586,7 @@
"-DGLES_SILENCE_DEPRECATION",
"-DGLSLANG_OSINCLUDE_UNIX",
"-DHAVE_7ZIP",
"-DHAVE_AL",
"-DHAVE_ALTKIT",
"-DHAVE_AUDIOMIXER",
"-DHAVE_BTSTACK",
Expand Down Expand Up @@ -1727,6 +1732,7 @@
"-DGLES_SILENCE_DEPRECATION",
"-DGLSLANG_OSINCLUDE_UNIX",
"-DHAVE_7ZIP",
"-DHAVE_AL",
"-DHAVE_ALTKIT",
"-DHAVE_AUDIOMIXER",
"-DHAVE_BTSTACK",
Expand Down Expand Up @@ -1900,6 +1906,7 @@
"-DGLES_SILENCE_DEPRECATION",
"-DGLSLANG_OSINCLUDE_UNIX",
"-DHAVE_7ZIP",
"-DHAVE_AL",
"-DHAVE_ALTKIT",
"-DHAVE_AUDIOMIXER",
"-DHAVE_BTSTACK",
Expand Down Expand Up @@ -2062,6 +2069,7 @@
"-DGLES_SILENCE_DEPRECATION",
"-DGLSLANG_OSINCLUDE_UNIX",
"-DHAVE_7ZIP",
"-DHAVE_AL",
"-DHAVE_ALTKIT",
"-DHAVE_AUDIOMIXER",
"-DHAVE_BTSTACK",
Expand Down

0 comments on commit ace3d3e

Please sign in to comment.