From c9f24e095b4998c3c354cf470d22f2d26de33346 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Fri, 13 Nov 2015 22:45:14 -0800 Subject: [PATCH] [Renderer] Delete and rebuild the Renderer project It's just easier this way... --- Renderer/OpenGL/OpenGLRenderer.h | 19 -- Renderer/{OpenGL => }/OpenGLView.swift | 0 Renderer/Renderer.xcodeproj/project.pbxproj | 209 +++++++++--------- Renderer/{OpenGL => Renderer}/Info.plist | 0 Renderer/Renderer/Renderer.h | 19 ++ .../Info.plist | 0 .../RendererTests.swift} | 10 +- ThreeDee.xcworkspace/contents.xcworkspacedata | 2 +- 8 files changed, 130 insertions(+), 129 deletions(-) delete mode 100644 Renderer/OpenGL/OpenGLRenderer.h rename Renderer/{OpenGL => }/OpenGLView.swift (100%) rename Renderer/{OpenGL => Renderer}/Info.plist (100%) create mode 100644 Renderer/Renderer/Renderer.h rename Renderer/{OpenGLRendererTests => RendererTests}/Info.plist (100%) rename Renderer/{OpenGLRendererTests/OpenGLRendererTests.swift => RendererTests/RendererTests.swift} (83%) diff --git a/Renderer/OpenGL/OpenGLRenderer.h b/Renderer/OpenGL/OpenGLRenderer.h deleted file mode 100644 index 0e60173..0000000 --- a/Renderer/OpenGL/OpenGLRenderer.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// OpenGLRenderer.h -// OpenGLRenderer -// -// Created by Eryn Wells on 11/12/15. -// Copyright © 2015 Eryn Wells. All rights reserved. -// - -#import - -//! Project version number for OpenGLRenderer. -FOUNDATION_EXPORT double OpenGLRendererVersionNumber; - -//! Project version string for OpenGLRenderer. -FOUNDATION_EXPORT const unsigned char OpenGLRendererVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Renderer/OpenGL/OpenGLView.swift b/Renderer/OpenGLView.swift similarity index 100% rename from Renderer/OpenGL/OpenGLView.swift rename to Renderer/OpenGLView.swift diff --git a/Renderer/Renderer.xcodeproj/project.pbxproj b/Renderer/Renderer.xcodeproj/project.pbxproj index 7e02566..35a09a2 100644 --- a/Renderer/Renderer.xcodeproj/project.pbxproj +++ b/Renderer/Renderer.xcodeproj/project.pbxproj @@ -7,188 +7,191 @@ objects = { /* Begin PBXBuildFile section */ - C0211EFF1BF5CBF0006936E7 /* OpenGLRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = C0211EFE1BF5CBF0006936E7 /* OpenGLRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C0211F061BF5CBF0006936E7 /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0211EFB1BF5CBF0006936E7 /* Renderer.framework */; }; - C0211F0B1BF5CBF0006936E7 /* OpenGLRendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0211F0A1BF5CBF0006936E7 /* OpenGLRendererTests.swift */; }; - C0211F161BF5CBFD006936E7 /* OpenGLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0211F151BF5CBFD006936E7 /* OpenGLView.swift */; }; - C0211F181BF5CD05006936E7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0211F171BF5CD05006936E7 /* OpenGL.framework */; }; + C0B61B971BF70FD200B91C36 /* Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B61B961BF70FD200B91C36 /* Renderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C0B61B9E1BF70FD200B91C36 /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B61B931BF70FD200B91C36 /* Renderer.framework */; }; + C0B61BA31BF70FD200B91C36 /* RendererTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0B61BA21BF70FD200B91C36 /* RendererTests.swift */; }; + C0B61BAF1BF70FE800B91C36 /* OpenGLView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0B61BAE1BF70FE800B91C36 /* OpenGLView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - C0211F071BF5CBF0006936E7 /* PBXContainerItemProxy */ = { + C0B61B9F1BF70FD200B91C36 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = C0211EF21BF5CBF0006936E7 /* Project object */; + containerPortal = C0B61B8A1BF70FD200B91C36 /* Project object */; proxyType = 1; - remoteGlobalIDString = C0211EFA1BF5CBF0006936E7; - remoteInfo = OpenGLRenderer; + remoteGlobalIDString = C0B61B921BF70FD200B91C36; + remoteInfo = Renderer; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - C0211EFB1BF5CBF0006936E7 /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C0211EFE1BF5CBF0006936E7 /* OpenGLRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGLRenderer.h; sourceTree = ""; }; - C0211F001BF5CBF0006936E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C0211F051BF5CBF0006936E7 /* Renderer.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Renderer.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C0211F0A1BF5CBF0006936E7 /* OpenGLRendererTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGLRendererTests.swift; sourceTree = ""; }; - C0211F0C1BF5CBF0006936E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C0211F151BF5CBFD006936E7 /* OpenGLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGLView.swift; sourceTree = ""; }; - C0211F171BF5CD05006936E7 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + C0B61B931BF70FD200B91C36 /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C0B61B961BF70FD200B91C36 /* Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Renderer.h; sourceTree = ""; }; + C0B61B981BF70FD200B91C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C0B61B9D1BF70FD200B91C36 /* RendererTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RendererTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C0B61BA21BF70FD200B91C36 /* RendererTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RendererTests.swift; sourceTree = ""; }; + C0B61BA41BF70FD200B91C36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C0B61BAE1BF70FE800B91C36 /* OpenGLView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenGLView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - C0211EF71BF5CBF0006936E7 /* Frameworks */ = { + C0B61B8F1BF70FD200B91C36 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C0211F181BF5CD05006936E7 /* OpenGL.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - C0211F021BF5CBF0006936E7 /* Frameworks */ = { + C0B61B9A1BF70FD200B91C36 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C0211F061BF5CBF0006936E7 /* Renderer.framework in Frameworks */, + C0B61B9E1BF70FD200B91C36 /* Renderer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - C0211EF11BF5CBF0006936E7 = { + C0B61B891BF70FD200B91C36 = { isa = PBXGroup; children = ( - C0211F171BF5CD05006936E7 /* OpenGL.framework */, - C0211EFD1BF5CBF0006936E7 /* OpenGL */, - C0211F091BF5CBF0006936E7 /* OpenGLRendererTests */, - C0211EFC1BF5CBF0006936E7 /* Products */, + C0B61BAD1BF70FDC00B91C36 /* OpenGL */, + C0B61B951BF70FD200B91C36 /* Renderer */, + C0B61BA11BF70FD200B91C36 /* RendererTests */, + C0B61B941BF70FD200B91C36 /* Products */, ); sourceTree = ""; }; - C0211EFC1BF5CBF0006936E7 /* Products */ = { + C0B61B941BF70FD200B91C36 /* Products */ = { isa = PBXGroup; children = ( - C0211EFB1BF5CBF0006936E7 /* Renderer.framework */, - C0211F051BF5CBF0006936E7 /* Renderer.xctest */, + C0B61B931BF70FD200B91C36 /* Renderer.framework */, + C0B61B9D1BF70FD200B91C36 /* RendererTests.xctest */, ); name = Products; sourceTree = ""; }; - C0211EFD1BF5CBF0006936E7 /* OpenGL */ = { + C0B61B951BF70FD200B91C36 /* Renderer */ = { isa = PBXGroup; children = ( - C0211EFE1BF5CBF0006936E7 /* OpenGLRenderer.h */, - C0211F001BF5CBF0006936E7 /* Info.plist */, - C0211F151BF5CBFD006936E7 /* OpenGLView.swift */, + C0B61B961BF70FD200B91C36 /* Renderer.h */, + C0B61B981BF70FD200B91C36 /* Info.plist */, ); - name = OpenGL; - path = OpenGLRenderer; + path = Renderer; sourceTree = ""; }; - C0211F091BF5CBF0006936E7 /* OpenGLRendererTests */ = { + C0B61BA11BF70FD200B91C36 /* RendererTests */ = { isa = PBXGroup; children = ( - C0211F0A1BF5CBF0006936E7 /* OpenGLRendererTests.swift */, - C0211F0C1BF5CBF0006936E7 /* Info.plist */, + C0B61BA21BF70FD200B91C36 /* RendererTests.swift */, + C0B61BA41BF70FD200B91C36 /* Info.plist */, ); - path = OpenGLRendererTests; + path = RendererTests; + sourceTree = ""; + }; + C0B61BAD1BF70FDC00B91C36 /* OpenGL */ = { + isa = PBXGroup; + children = ( + C0B61BAE1BF70FE800B91C36 /* OpenGLView.swift */, + ); + name = OpenGL; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - C0211EF81BF5CBF0006936E7 /* Headers */ = { + C0B61B901BF70FD200B91C36 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - C0211EFF1BF5CBF0006936E7 /* OpenGLRenderer.h in Headers */, + C0B61B971BF70FD200B91C36 /* Renderer.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - C0211EFA1BF5CBF0006936E7 /* Renderer */ = { + C0B61B921BF70FD200B91C36 /* Renderer */ = { isa = PBXNativeTarget; - buildConfigurationList = C0211F0F1BF5CBF0006936E7 /* Build configuration list for PBXNativeTarget "Renderer" */; + buildConfigurationList = C0B61BA71BF70FD200B91C36 /* Build configuration list for PBXNativeTarget "Renderer" */; buildPhases = ( - C0211EF61BF5CBF0006936E7 /* Sources */, - C0211EF71BF5CBF0006936E7 /* Frameworks */, - C0211EF81BF5CBF0006936E7 /* Headers */, - C0211EF91BF5CBF0006936E7 /* Resources */, + C0B61B8E1BF70FD200B91C36 /* Sources */, + C0B61B8F1BF70FD200B91C36 /* Frameworks */, + C0B61B901BF70FD200B91C36 /* Headers */, + C0B61B911BF70FD200B91C36 /* Resources */, ); buildRules = ( ); dependencies = ( ); name = Renderer; - productName = OpenGLRenderer; - productReference = C0211EFB1BF5CBF0006936E7 /* Renderer.framework */; + productName = Renderer; + productReference = C0B61B931BF70FD200B91C36 /* Renderer.framework */; productType = "com.apple.product-type.framework"; }; - C0211F041BF5CBF0006936E7 /* RendererTests */ = { + C0B61B9C1BF70FD200B91C36 /* RendererTests */ = { isa = PBXNativeTarget; - buildConfigurationList = C0211F121BF5CBF0006936E7 /* Build configuration list for PBXNativeTarget "RendererTests" */; + buildConfigurationList = C0B61BAA1BF70FD200B91C36 /* Build configuration list for PBXNativeTarget "RendererTests" */; buildPhases = ( - C0211F011BF5CBF0006936E7 /* Sources */, - C0211F021BF5CBF0006936E7 /* Frameworks */, - C0211F031BF5CBF0006936E7 /* Resources */, + C0B61B991BF70FD200B91C36 /* Sources */, + C0B61B9A1BF70FD200B91C36 /* Frameworks */, + C0B61B9B1BF70FD200B91C36 /* Resources */, ); buildRules = ( ); dependencies = ( - C0211F081BF5CBF0006936E7 /* PBXTargetDependency */, + C0B61BA01BF70FD200B91C36 /* PBXTargetDependency */, ); name = RendererTests; - productName = OpenGLRendererTests; - productReference = C0211F051BF5CBF0006936E7 /* Renderer.xctest */; + productName = RendererTests; + productReference = C0B61B9D1BF70FD200B91C36 /* RendererTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - C0211EF21BF5CBF0006936E7 /* Project object */ = { + C0B61B8A1BF70FD200B91C36 /* Project object */ = { isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0710; LastUpgradeCheck = 0710; ORGANIZATIONNAME = "Eryn Wells"; TargetAttributes = { - C0211EFA1BF5CBF0006936E7 = { + C0B61B921BF70FD200B91C36 = { CreatedOnToolsVersion = 7.1.1; }; - C0211F041BF5CBF0006936E7 = { + C0B61B9C1BF70FD200B91C36 = { CreatedOnToolsVersion = 7.1.1; }; }; }; - buildConfigurationList = C0211EF51BF5CBF0006936E7 /* Build configuration list for PBXProject "Renderer" */; + buildConfigurationList = C0B61B8D1BF70FD200B91C36 /* Build configuration list for PBXProject "Renderer" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = C0211EF11BF5CBF0006936E7; - productRefGroup = C0211EFC1BF5CBF0006936E7 /* Products */; + mainGroup = C0B61B891BF70FD200B91C36; + productRefGroup = C0B61B941BF70FD200B91C36 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - C0211EFA1BF5CBF0006936E7 /* Renderer */, - C0211F041BF5CBF0006936E7 /* RendererTests */, + C0B61B921BF70FD200B91C36 /* Renderer */, + C0B61B9C1BF70FD200B91C36 /* RendererTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - C0211EF91BF5CBF0006936E7 /* Resources */ = { + C0B61B911BF70FD200B91C36 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - C0211F031BF5CBF0006936E7 /* Resources */ = { + C0B61B9B1BF70FD200B91C36 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -198,34 +201,34 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - C0211EF61BF5CBF0006936E7 /* Sources */ = { + C0B61B8E1BF70FD200B91C36 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C0211F161BF5CBFD006936E7 /* OpenGLView.swift in Sources */, + C0B61BAF1BF70FE800B91C36 /* OpenGLView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - C0211F011BF5CBF0006936E7 /* Sources */ = { + C0B61B991BF70FD200B91C36 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C0211F0B1BF5CBF0006936E7 /* OpenGLRendererTests.swift in Sources */, + C0B61BA31BF70FD200B91C36 /* RendererTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C0211F081BF5CBF0006936E7 /* PBXTargetDependency */ = { + C0B61BA01BF70FD200B91C36 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C0211EFA1BF5CBF0006936E7 /* Renderer */; - targetProxy = C0211F071BF5CBF0006936E7 /* PBXContainerItemProxy */; + target = C0B61B921BF70FD200B91C36 /* Renderer */; + targetProxy = C0B61B9F1BF70FD200B91C36 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - C0211F0D1BF5CBF0006936E7 /* Debug */ = { + C0B61BA51BF70FD200B91C36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -272,7 +275,7 @@ }; name = Debug; }; - C0211F0E1BF5CBF0006936E7 /* Release */ = { + C0B61BA61BF70FD200B91C36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -311,7 +314,7 @@ }; name = Release; }; - C0211F101BF5CBF0006936E7 /* Debug */ = { + C0B61BA81BF70FD200B91C36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; @@ -321,17 +324,17 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = OpenGLRenderer/Info.plist; + INFOPLIST_FILE = Renderer/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.OpenGLRenderer; - PRODUCT_NAME = Renderer; + PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.Renderer; + PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; - C0211F111BF5CBF0006936E7 /* Release */ = { + C0B61BA91BF70FD200B91C36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; @@ -341,68 +344,66 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = OpenGLRenderer/Info.plist; + INFOPLIST_FILE = Renderer/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.OpenGLRenderer; - PRODUCT_NAME = Renderer; + PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.Renderer; + PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; name = Release; }; - C0211F131BF5CBF0006936E7 /* Debug */ = { + C0B61BAB1BF70FD200B91C36 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = OpenGLRendererTests/Info.plist; + INFOPLIST_FILE = RendererTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.OpenGLRendererTests; - PRODUCT_NAME = Renderer; + PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.RendererTests; + PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; - C0211F141BF5CBF0006936E7 /* Release */ = { + C0B61BAC1BF70FD200B91C36 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = OpenGLRendererTests/Info.plist; + INFOPLIST_FILE = RendererTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.OpenGLRendererTests; - PRODUCT_NAME = Renderer; + PRODUCT_BUNDLE_IDENTIFIER = me.erynwells.graphics.RendererTests; + PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - C0211EF51BF5CBF0006936E7 /* Build configuration list for PBXProject "Renderer" */ = { + C0B61B8D1BF70FD200B91C36 /* Build configuration list for PBXProject "Renderer" */ = { isa = XCConfigurationList; buildConfigurations = ( - C0211F0D1BF5CBF0006936E7 /* Debug */, - C0211F0E1BF5CBF0006936E7 /* Release */, + C0B61BA51BF70FD200B91C36 /* Debug */, + C0B61BA61BF70FD200B91C36 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C0211F0F1BF5CBF0006936E7 /* Build configuration list for PBXNativeTarget "Renderer" */ = { + C0B61BA71BF70FD200B91C36 /* Build configuration list for PBXNativeTarget "Renderer" */ = { isa = XCConfigurationList; buildConfigurations = ( - C0211F101BF5CBF0006936E7 /* Debug */, - C0211F111BF5CBF0006936E7 /* Release */, + C0B61BA81BF70FD200B91C36 /* Debug */, + C0B61BA91BF70FD200B91C36 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; - C0211F121BF5CBF0006936E7 /* Build configuration list for PBXNativeTarget "RendererTests" */ = { + C0B61BAA1BF70FD200B91C36 /* Build configuration list for PBXNativeTarget "RendererTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - C0211F131BF5CBF0006936E7 /* Debug */, - C0211F141BF5CBF0006936E7 /* Release */, + C0B61BAB1BF70FD200B91C36 /* Debug */, + C0B61BAC1BF70FD200B91C36 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = C0211EF21BF5CBF0006936E7 /* Project object */; + rootObject = C0B61B8A1BF70FD200B91C36 /* Project object */; } diff --git a/Renderer/OpenGL/Info.plist b/Renderer/Renderer/Info.plist similarity index 100% rename from Renderer/OpenGL/Info.plist rename to Renderer/Renderer/Info.plist diff --git a/Renderer/Renderer/Renderer.h b/Renderer/Renderer/Renderer.h new file mode 100644 index 0000000..8780af6 --- /dev/null +++ b/Renderer/Renderer/Renderer.h @@ -0,0 +1,19 @@ +// +// Renderer.h +// Renderer +// +// Created by Eryn Wells on 11/13/15. +// Copyright © 2015 Eryn Wells. All rights reserved. +// + +#import + +//! Project version number for Renderer. +FOUNDATION_EXPORT double RendererVersionNumber; + +//! Project version string for Renderer. +FOUNDATION_EXPORT const unsigned char RendererVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Renderer/OpenGLRendererTests/Info.plist b/Renderer/RendererTests/Info.plist similarity index 100% rename from Renderer/OpenGLRendererTests/Info.plist rename to Renderer/RendererTests/Info.plist diff --git a/Renderer/OpenGLRendererTests/OpenGLRendererTests.swift b/Renderer/RendererTests/RendererTests.swift similarity index 83% rename from Renderer/OpenGLRendererTests/OpenGLRendererTests.swift rename to Renderer/RendererTests/RendererTests.swift index b3b2277..f213efc 100644 --- a/Renderer/OpenGLRendererTests/OpenGLRendererTests.swift +++ b/Renderer/RendererTests/RendererTests.swift @@ -1,15 +1,15 @@ // -// OpenGLRendererTests.swift -// OpenGLRendererTests +// RendererTests.swift +// RendererTests // -// Created by Eryn Wells on 11/12/15. +// Created by Eryn Wells on 11/13/15. // Copyright © 2015 Eryn Wells. All rights reserved. // import XCTest -@testable import OpenGLRenderer +@testable import Renderer -class OpenGLRendererTests: XCTestCase { +class RendererTests: XCTestCase { override func setUp() { super.setUp() diff --git a/ThreeDee.xcworkspace/contents.xcworkspacedata b/ThreeDee.xcworkspace/contents.xcworkspacedata index f620ec1..bbbf09d 100644 --- a/ThreeDee.xcworkspace/contents.xcworkspacedata +++ b/ThreeDee.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:Renderer/Renderer.xcodeproj">