Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Apple Silicon #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>16C68</string>
<string>20F71</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -27,17 +27,21 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8C1002</string>
<string>13A233</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<string>11.3</string>
<key>DTSDKBuild</key>
<string>16C58</string>
<string>20E214</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx11.3</string>
<key>DTXcode</key>
<string>0821</string>
<string>1300</string>
<key>DTXcodeBuild</key>
<string>8C1002</string>
<string>13A233</string>
<key>LSMinimumSystemVersion</key>
<string>11.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019年 TyounanMOTI. All rights reserved.</string>
</dict>
Expand Down
Binary file not shown.
Binary file modified Plugin/libopus/lib/Release/libopus.a
Binary file not shown.
112 changes: 108 additions & 4 deletions Plugin/mac/UnityOpus/UnityOpus.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,31 @@
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
FDA8BD2E273508CF00FC2D95 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8BD2D273508CF00FC2D95 /* libopus.a */; };
FDA8BD3427350DA200FC2D95 /* runtime_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA8BD3327350DA200FC2D95 /* runtime_error.cpp */; };
FDA8BD3A27350DAE00FC2D95 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA8BD3727350DAE00FC2D95 /* debug.cpp */; };
FDA8BD3B27350DAE00FC2D95 /* entrypoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA8BD3927350DAE00FC2D95 /* entrypoint.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
9D480E4922CED51100AD72FB /* UnityOpus.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnityOpus.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
9D480E4C22CED51100AD72FB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FDA8BD2D273508CF00FC2D95 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = ../../libopus/lib/Release/libopus.a; sourceTree = "<group>"; };
FDA8BD3327350DA200FC2D95 /* runtime_error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_error.cpp; path = ../../../runtime_error.cpp; sourceTree = "<group>"; };
FDA8BD3527350DAE00FC2D95 /* IUnityInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IUnityInterface.h; path = ../../../IUnityInterface.h; sourceTree = "<group>"; };
FDA8BD3627350DAE00FC2D95 /* runtime_error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_error.h; path = ../../../runtime_error.h; sourceTree = "<group>"; };
FDA8BD3727350DAE00FC2D95 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = debug.cpp; path = ../../../debug.cpp; sourceTree = "<group>"; };
FDA8BD3827350DAE00FC2D95 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../../../debug.h; sourceTree = "<group>"; };
FDA8BD3927350DAE00FC2D95 /* entrypoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entrypoint.cpp; path = ../../../entrypoint.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
9D480E4622CED51000AD72FB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FDA8BD2E273508CF00FC2D95 /* libopus.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -27,6 +42,7 @@
children = (
9D480E4B22CED51100AD72FB /* UnityOpus */,
9D480E4A22CED51100AD72FB /* Products */,
FDA8BD2C273508CF00FC2D95 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -41,11 +57,25 @@
9D480E4B22CED51100AD72FB /* UnityOpus */ = {
isa = PBXGroup;
children = (
FDA8BD3327350DA200FC2D95 /* runtime_error.cpp */,
FDA8BD3727350DAE00FC2D95 /* debug.cpp */,
FDA8BD3827350DAE00FC2D95 /* debug.h */,
FDA8BD3927350DAE00FC2D95 /* entrypoint.cpp */,
FDA8BD3527350DAE00FC2D95 /* IUnityInterface.h */,
FDA8BD3627350DAE00FC2D95 /* runtime_error.h */,
9D480E4C22CED51100AD72FB /* Info.plist */,
);
path = UnityOpus;
sourceTree = "<group>";
};
FDA8BD2C273508CF00FC2D95 /* Frameworks */ = {
isa = PBXGroup;
children = (
FDA8BD2D273508CF00FC2D95 /* libopus.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -56,6 +86,7 @@
9D480E4522CED51000AD72FB /* Sources */,
9D480E4622CED51000AD72FB /* Frameworks */,
9D480E4722CED51000AD72FB /* Resources */,
FDA8BD3227350CC800FC2D95 /* ShellScript */,
);
buildRules = (
);
Expand All @@ -72,7 +103,7 @@
9D480E4122CED51000AD72FB /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0820;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = TyounanMOTI;
TargetAttributes = {
9D480E4822CED51000AD72FB = {
Expand All @@ -83,10 +114,11 @@
};
buildConfigurationList = 9D480E4422CED51000AD72FB /* Build configuration list for PBXProject "UnityOpus" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 9D480E4022CED51000AD72FB;
productRefGroup = 9D480E4A22CED51100AD72FB /* Products */;
Expand All @@ -108,11 +140,34 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
FDA8BD3227350CC800FC2D95 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cp -f -R ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_NAME}.bundle ../../../Assets/Plugins/UnityOpus/Plugins/Mac/\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
9D480E4522CED51000AD72FB /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FDA8BD3427350DA200FC2D95 /* runtime_error.cpp in Sources */,
FDA8BD3A27350DAE00FC2D95 /* debug.cpp in Sources */,
FDA8BD3B27350DAE00FC2D95 /* entrypoint.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -128,15 +183,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -159,7 +223,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand All @@ -175,15 +239,24 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -200,7 +273,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MACOSX_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
Expand All @@ -209,9 +282,24 @@
9D480E5022CED51100AD72FB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = ../../libopus/include/;
INFOPLIST_FILE = UnityOpus/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LIBRARY_SEARCH_PATHS = ../../libopus/lib/Release;
PRODUCT_BUNDLE_IDENTIFIER = com.tyounanmoti.UnityOpus;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -222,9 +310,24 @@
9D480E5122CED51100AD72FB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
HEADER_SEARCH_PATHS = ../../libopus/include/;
INFOPLIST_FILE = UnityOpus/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
LIBRARY_SEARCH_PATHS = ../../libopus/lib/Release;
PRODUCT_BUNDLE_IDENTIFIER = com.tyounanmoti.UnityOpus;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -251,6 +354,7 @@
9D480E5122CED51100AD72FB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9D480E4822CED51000AD72FB"
BuildableName = "UnityOpus.bundle"
BlueprintName = "UnityOpus"
ReferencedContainer = "container:UnityOpus.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9D480E4822CED51000AD72FB"
BuildableName = "UnityOpus.bundle"
BlueprintName = "UnityOpus"
ReferencedContainer = "container:UnityOpus.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ libopus bridge for Unity.
# Requirements
UnityOpus is tested on following environments:
- Windows 10
- Mac OS X
- macOS 11.0 or newer
- Android (Oculus Quest)

TBD for other environments.
Expand Down