From acd3fdfa235cc7327cd31f4f7293f2a30f0ff1d2 Mon Sep 17 00:00:00 2001 From: tpoole Date: Tue, 14 Feb 2017 18:19:36 +0000 Subject: [PATCH] Add the standalone BLOCKS SDK static library as a dependency in the example app projects --- .../BlockFinder.xcodeproj/project.pbxproj | 52 +++++++++++++++++++ .../BlockFinder/Windows/BlockFinder.sln | 13 +++++ .../BlockFinder/Windows/BlockFinder.vcxproj | 10 +++- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj index 6015f21343..f004d06429 100644 --- a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj @@ -17,6 +17,23 @@ E2ECDFCF1DB6864E006D016F /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC61DB6864E006D016F /* CoreMIDI.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + E25109931E5376C000596664 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E251098F1E5376C000596664 /* BLOCKS-SDK.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = E2BD1B8A1DB62B4000C4F301; + remoteInfo = "BLOCKS-SDK"; + }; + E25109961E53775E00596664 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E251098F1E5376C000596664 /* BLOCKS-SDK.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = E2BD1B891DB62B4000C4F301; + remoteInfo = "BLOCKS-SDK"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ E2ECDFB01DB684F9006D016F /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -33,6 +50,7 @@ E232CCAF1DB8CCEA00276BB3 /* BlockFinder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlockFinder.cpp; path = ../BlockFinder.cpp; sourceTree = ""; }; E232CCB01DB8CCEA00276BB3 /* BlockFinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlockFinder.h; path = ../BlockFinder.h; sourceTree = ""; }; E242E7651DB77E9D0022D78D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; + E251098F1E5376C000596664 /* BLOCKS-SDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "BLOCKS-SDK.xcodeproj"; path = "../../../SDK/Build/MacOS/BLOCKS-SDK.xcodeproj"; sourceTree = ""; }; E2ECDFB21DB684F9006D016F /* BlockFinder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BlockFinder; sourceTree = BUILT_PRODUCTS_DIR; }; E2ECDFBF1DB685D2006D016F /* libBLOCKS-SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libBLOCKS-SDK.a"; path = "../../../../SDK/Build/MacOS/Debug/libBLOCKS-SDK.a"; sourceTree = ""; }; E2ECDFC11DB6864E006D016F /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; @@ -63,9 +81,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + E25109901E5376C000596664 /* Products */ = { + isa = PBXGroup; + children = ( + E25109941E5376C000596664 /* libBLOCKS-SDK.a */, + ); + name = Products; + sourceTree = ""; + }; E2ECDFA91DB684F9006D016F = { isa = PBXGroup; children = ( + E251098F1E5376C000596664 /* BLOCKS-SDK.xcodeproj */, E232CCAF1DB8CCEA00276BB3 /* BlockFinder.cpp */, E232CCB01DB8CCEA00276BB3 /* BlockFinder.h */, E242E7651DB77E9D0022D78D /* main.mm */, @@ -114,6 +141,7 @@ buildRules = ( ); dependencies = ( + E25109971E53775E00596664 /* PBXTargetDependency */, ); name = BlockFinder; productName = BlocksMonitor; @@ -145,6 +173,12 @@ mainGroup = E2ECDFA91DB684F9006D016F; productRefGroup = E2ECDFB31DB684F9006D016F /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = E25109901E5376C000596664 /* Products */; + ProjectRef = E251098F1E5376C000596664 /* BLOCKS-SDK.xcodeproj */; + }, + ); projectRoot = ""; targets = ( E2ECDFB11DB684F9006D016F /* BlockFinder */, @@ -152,6 +186,16 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + E25109941E5376C000596664 /* libBLOCKS-SDK.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libBLOCKS-SDK.a"; + remoteRef = E25109931E5376C000596664 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXShellScriptBuildPhase section */ E2ECDFD31DB6872A006D016F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -180,6 +224,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + E25109971E53775E00596664 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "BLOCKS-SDK"; + targetProxy = E25109961E53775E00596664 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ E2ECDFB71DB684F9006D016F /* Debug */ = { isa = XCBuildConfiguration; diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln index 489f446549..878054b9aa 100644 --- a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln @@ -4,6 +4,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlockFinder", "BlockFinder.vcxproj", "{881F9AC3-2B1A-4867-92AF-125332B5A87A}" + ProjectSection(ProjectDependencies) = postProject + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B} = {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLOCKS-SDK", "..\..\..\SDK\Build\Windows\BLOCKS-SDK.vcxproj", "{6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,6 +26,14 @@ Global {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x64.Build.0 = Release|x64 {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x86.ActiveCfg = Release|Win32 {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x86.Build.0 = Release|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x64.ActiveCfg = Debug|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x64.Build.0 = Debug|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x86.ActiveCfg = Debug|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x86.Build.0 = Debug|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x64.ActiveCfg = Release|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x64.Build.0 = Release|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x86.ActiveCfg = Release|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj index 52023e294b..4e28ce6443 100644 --- a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj @@ -71,15 +71,21 @@ true + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true + $(SolutionDir)\$(Platform)\$(Configuration)\ false + $(SolutionDir)\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false + $(SolutionDir)\$(Platform)\$(Configuration)\ @@ -94,7 +100,7 @@ Windows true BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\..\SDK\Build\Windows\$(Configuration) + $(IntDir) @@ -110,7 +116,7 @@ Windows true BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\..\SDK\Build\Windows\x64\$(Configuration) + $(IntDir)