Skip to content

Updated project to build also for arm64 as universal binary. #3

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.

Sign up for GitHub

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

Open
achimb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated project to build also for arm64 as universal binary. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Shared
Open in desktop
Submodule Shared updated 1 files
+1 −1 SyphonNameboundClient.m
2 changes: 1 addition & 1 deletion Syphon-Framework
Open in desktop
Submodule Syphon-Framework updated 77 files
+5 −0 Building Syphon.md
+0 −11 Building Syphon.rtf
+17 −8 DoxygenLayout.xml
+5 −0 Exported_Symbols.exp
+2 −2 Info.plist
+74 −36 Syphon SDK Read Me.rtf
+30 −11 Syphon.h
+217 −62 Syphon.xcodeproj/project.pbxproj
+2 −6 SyphonCFMessageReceiver.h
+40 −7 SyphonCFMessageReceiver.m
+2 −7 SyphonCFMessageSender.h
+7 −0 SyphonCFMessageSender.m
+58 −0 SyphonCGL.c
+43 −0 SyphonCGL.h
+11 −81 SyphonClient.h
+38 −212 SyphonClient.m
+73 −0 SyphonClientBase.h
+205 −0 SyphonClientBase.m
+2 −22 SyphonClientConnectionManager.h
+27 −9 SyphonClientConnectionManager.m
+0 −100 SyphonIOSurfaceImage.m
+34 −0 SyphonIOSurfaceImageCore.h
+112 −0 SyphonIOSurfaceImageCore.m
+34 −0 SyphonIOSurfaceImageLegacy.h
+91 −0 SyphonIOSurfaceImageLegacy.m
+34 −45 SyphonImage.h
+9 −6 SyphonImage.m
+49 −0 SyphonImageBase.h
+36 −15 SyphonImageBase.m
+3 −6 SyphonMachMessageReceiver.h
+5 −0 SyphonMachMessageReceiver.m
+3 −6 SyphonMachMessageSender.h
+5 −0 SyphonMachMessageSender.m
+2 −9 SyphonMessageQueue.h
+9 −0 SyphonMessageQueue.m
+2 −6 SyphonMessageReceiver.h
+6 −0 SyphonMessageReceiver.m
+2 −6 SyphonMessageSender.h
+6 −0 SyphonMessageSender.m
+2 −2 SyphonMessaging.h
+104 −0 SyphonOpenGLClient.h
+157 −0 SyphonOpenGLClient.m
+59 −0 SyphonOpenGLImage.h
+49 −0 SyphonOpenGLImage.m
+177 −0 SyphonOpenGLServer.h
+304 −0 SyphonOpenGLServer.m
+1 −2 SyphonPrivate.h
+1 −0 SyphonPrivate.m
+33 −197 SyphonServer.h
+7 −856 SyphonServer.m
+80 −0 SyphonServerBase.h
+391 −0 SyphonServerBase.m
+4 −15 SyphonServerConnectionManager.h
+12 −1 SyphonServerConnectionManager.m
+10 −23 SyphonServerDirectory.h
+9 −1 SyphonServerDirectory.m
+52 −0 SyphonServerRenderer.h
+167 −0 SyphonServerRenderer.m
+36 −0 SyphonServerRendererCore.h
+442 −0 SyphonServerRendererCore.m
+34 −0 SyphonServerRendererLegacy.h
+447 −0 SyphonServerRendererLegacy.m
+37 −0 SyphonServerShader.h
+105 −0 SyphonServerShader.m
+35 −0 SyphonServerVertices.h
+58 −0 SyphonServerVertices.m
+38 −0 SyphonShader.h
+137 −0 SyphonShader.m
+74 −0 SyphonSubclassing.h
+38 −0 SyphonVertices.h
+114 −0 SyphonVertices.m
+13 −0 customdoxygen.css
+1,617 −894 doxygen.config
+0 −835 doxygen.css
+0 −0 en.lproj/InfoPlist.strings
+7 −2 footer.html
+0 −14 header.html
108 changes: 12 additions & 96 deletions SyphonQC/SyphonQC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,29 @@
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
BD48019F12399DF900DFB19E /* Build Custom Framework */ = {
isa = PBXAggregateTarget;
buildConfigurationList = BD4801A212399E2300DFB19E /* Build configuration list for PBXAggregateTarget "Build Custom Framework" */;
buildPhases = (
BD48019E12399DF900DFB19E /* ShellScript */,
);
dependencies = (
);
name = "Build Custom Framework";
productName = "Build Custom Framework";
};
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
16BA95420A7EB2EB001E4983 /* SyphonServerQCPlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 16BA95410A7EB2EB001E4983 /* SyphonServerQCPlugIn.m */; };
16BA96310A7EB9AC001E4983 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16BA96300A7EB9AC001E4983 /* Quartz.framework */; };
1B8F521911CF4301009968B9 /* SyphonClientQCPlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B8F521811CF4301009968B9 /* SyphonClientQCPlugIn.m */; };
1BF2B3E811D3BCDE00D4ED6D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BF2B3E111D3BCAA00D4ED6D /* OpenGL.framework */; };
1BF2BC5B11D81DD200D4ED6D /* SyphonServerListQCPlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BF2BC5A11D81DD200D4ED6D /* SyphonServerListQCPlugIn.m */; };
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
9804C3DF26A989B400F14E26 /* Syphon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9804C3DE26A989B400F14E26 /* Syphon.framework */; };
9804C3E026A989B400F14E26 /* Syphon.framework in Copy Syphon Framework */ = {isa = PBXBuildFile; fileRef = 9804C3DE26A989B400F14E26 /* Syphon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BD06EB52124393FC00E7CE88 /* SyphonQCFBO.m in Sources */ = {isa = PBXBuildFile; fileRef = BD06EB51124393FC00E7CE88 /* SyphonQCFBO.m */; };
BD4801B21239A0E700DFB19E /* Syphon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BD4801B11239A0E700DFB19E /* Syphon.framework */; };
BD4801BB1239A10700DFB19E /* Syphon.framework in Copy Syphon Framework */ = {isa = PBXBuildFile; fileRef = BD4801B11239A0E700DFB19E /* Syphon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
BDD6BE5C11F74A9E007DF9F0 /* SyphonNameboundClient.m in Sources */ = {isa = PBXBuildFile; fileRef = BDD6BE5B11F74A9E007DF9F0 /* SyphonNameboundClient.m */; };
E28BFF151844FFD100A6A285 /* Syphon Server.qtz in CopyFiles */ = {isa = PBXBuildFile; fileRef = E28BFF121844FF9600A6A285 /* Syphon Server.qtz */; };
E28BFF1618450A7100A6A285 /* Syphon Client.qtz in CopyFiles */ = {isa = PBXBuildFile; fileRef = E28BFF111844FF9600A6A285 /* Syphon Client.qtz */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
BD4801AD1239A06D00DFB19E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
proxyType = 1;
remoteGlobalIDString = BD48019F12399DF900DFB19E;
remoteInfo = "Build Custom Framework";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
1BB5769D11CF1C8F008A305F /* Copy Syphon Framework */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
BD4801BB1239A10700DFB19E /* Syphon.framework in Copy Syphon Framework */,
9804C3E026A989B400F14E26 /* Syphon.framework in Copy Syphon Framework */,
);
name = "Copy Syphon Framework";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -83,9 +59,9 @@
1BF2BC5911D81DD200D4ED6D /* SyphonServerListQCPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonServerListQCPlugIn.h; sourceTree = "<group>"; };
1BF2BC5A11D81DD200D4ED6D /* SyphonServerListQCPlugIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyphonServerListQCPlugIn.m; sourceTree = "<group>"; };
8D5B49B6048680CD000E48DA /* Syphon.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Syphon.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
9804C3DE26A989B400F14E26 /* Syphon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Syphon.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BD06EB50124393FC00E7CE88 /* SyphonQCFBO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyphonQCFBO.h; sourceTree = "<group>"; };
BD06EB51124393FC00E7CE88 /* SyphonQCFBO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyphonQCFBO.m; sourceTree = "<group>"; };
BD4801B11239A0E700DFB19E /* Syphon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Syphon.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDD6BE5A11F74A9E007DF9F0 /* SyphonNameboundClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SyphonNameboundClient.h; path = ../Shared/SyphonNameboundClient.h; sourceTree = SOURCE_ROOT; };
BDD6BE5B11F74A9E007DF9F0 /* SyphonNameboundClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SyphonNameboundClient.m; path = ../Shared/SyphonNameboundClient.m; sourceTree = SOURCE_ROOT; };
E28BFF111844FF9600A6A285 /* Syphon Client.qtz */ = {isa = PBXFileReference; lastKnownFileType = "video.quartz-composer"; name = "Syphon Client.qtz"; path = "Examples/Syphon Client.qtz"; sourceTree = "<group>"; };
Expand All @@ -102,9 +78,9 @@
buildActionMask = 2147483647;
files = (
1BF2B3E811D3BCDE00D4ED6D /* OpenGL.framework in Frameworks */,
9804C3DF26A989B400F14E26 /* Syphon.framework in Frameworks */,
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
16BA96310A7EB9AC001E4983 /* Quartz.framework in Frameworks */,
BD4801B21239A0E700DFB19E /* Syphon.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -128,7 +104,7 @@
089C1671FE841209C02AAC07 /* Frameworks */ = {
isa = PBXGroup;
children = (
BD4801B11239A0E700DFB19E /* Syphon.framework */,
9804C3DE26A989B400F14E26 /* Syphon.framework */,
16BA96300A7EB9AC001E4983 /* Quartz.framework */,
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
1BF2B3E111D3BCAA00D4ED6D /* OpenGL.framework */,
Expand Down Expand Up @@ -249,7 +225,6 @@
buildRules = (
);
dependencies = (
BD4801AE1239A06D00DFB19E /* PBXTargetDependency */,
);
name = SyphonQC;
productInstallPath = "$(HOME)/Library/Bundles";
Expand Down Expand Up @@ -279,7 +254,6 @@
projectDirPath = "";
projectRoot = "";
targets = (
BD48019F12399DF900DFB19E /* Build Custom Framework */,
8D5B49AC048680CD000E48DA /* SyphonQC */,
);
};
Expand All @@ -296,19 +270,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
BD48019E12399DF900DFB19E /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$PROJECT_DIR/../Syphon-Framework/\"\nxcodebuild -configuration \"$CONFIGURATION\" ARCHS=\"$ARCHS\" VALID_ARCHS=\"$VALID_ARCHS\" OBJROOT=\"$OBJROOT\" SYMROOT=\"$SYMROOT\" CODE_SIGN_IDENTITY=\"$CODE_SIGN_IDENTITY\" GCC_PREPROCESSOR_DEFINITIONS=SYPHON_UNIQUE_CLASS_NAME_PREFIX=SyphonQCPlugIn";
};
E28BFF171846965F00A6A285 /* Create Installer (Archive Only) */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
Expand Down Expand Up @@ -340,14 +301,6 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
BD4801AE1239A06D00DFB19E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BD48019F12399DF900DFB19E /* Build Custom Framework */;
targetProxy = BD4801AD1239A06D00DFB19E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
1DEB913B08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
Expand All @@ -365,7 +318,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "info.v002.syphon.syphon-qc";
PRODUCT_NAME = Syphon;
SYPHONQC_INSTALLER_NAME = "Install Syphon for Quartz Composer.pkg";
SYPHONQC_PRODUCT_VERSION = 4;
SYPHONQC_PRODUCT_VERSION = 4.1;
WRAPPER_EXTENSION = plugin;
};
name = Debug;
Expand All @@ -384,15 +337,15 @@
PRODUCT_BUNDLE_IDENTIFIER = "info.v002.syphon.syphon-qc";
PRODUCT_NAME = Syphon;
SYPHONQC_INSTALLER_NAME = "Install Syphon for Quartz Composer.pkg";
SYPHONQC_PRODUCT_VERSION = 4;
SYPHONQC_PRODUCT_VERSION = 4.1;
WRAPPER_EXTENSION = plugin;
};
name = Release;
};
1DEB913F08733D840010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -414,24 +367,22 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
MACOSX_DEPLOYMENT_TARGET = 10.14;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SYPHONQC_PRODUCT_VERSION = "";
VALID_ARCHS = "i386 x86_64";
};
name = Debug;
};
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand All @@ -452,40 +403,14 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
MACOSX_DEPLOYMENT_TARGET = 10.14;
SDKROOT = macosx;
SYPHONQC_PRODUCT_VERSION = "";
VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
BD4801A012399DF900DFB19E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "Build Custom Framework";
};
name = Debug;
};
BD4801A112399DF900DFB19E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "Build Custom Framework";
ZERO_LINK = NO;
};
name = Release;
};
Expand All @@ -510,15 +435,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
BD4801A212399E2300DFB19E /* Build configuration list for PBXAggregateTarget "Build Custom Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BD4801A012399DF900DFB19E /* Debug */,
BD4801A112399DF900DFB19E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 089C1669FE841209C02AAC07 /* Project object */;
Expand Down
73 changes: 0 additions & 73 deletions SyphonQC/SyphonQC.xcodeproj/xcshareddata/xcschemes/Build Custom Framework.xcscheme
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions SyphonQCPlugin.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions SyphonQCPlugin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
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>