From a9786b80e68caf99c9b424af57b2ec4019ce21b5 Mon Sep 17 00:00:00 2001 From: kearwood Date: Thu, 15 Mar 2012 22:34:08 +0000 Subject: [PATCH] Created target for KREngine to compile as a framework for OSX. --HG-- extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4014 --- KREngine/KREngine.xcodeproj/project.pbxproj | 214 +++++++++++++++++- .../krengine_osx/en.lproj/InfoPlist.strings | 2 + KREngine/krengine_osx/krengine_osx-Info.plist | 30 +++ KREngine/krengine_osx/krengine_osx-Prefix.pch | 7 + KREngine/krengine_osx/krengine_osx.h | 13 ++ KREngine/krengine_osx/krengine_osx.m | 13 ++ objpack/objpack.xcodeproj/project.pbxproj | 28 +-- objpack/objpack/KRVector3.cpp | 99 -------- objpack/objpack/KRVector3.h | 72 ------ objview/KRObjView.xcodeproj/project.pbxproj | 10 +- 10 files changed, 299 insertions(+), 189 deletions(-) create mode 100644 KREngine/krengine_osx/en.lproj/InfoPlist.strings create mode 100644 KREngine/krengine_osx/krengine_osx-Info.plist create mode 100644 KREngine/krengine_osx/krengine_osx-Prefix.pch create mode 100644 KREngine/krengine_osx/krengine_osx.h create mode 100644 KREngine/krengine_osx/krengine_osx.m delete mode 100644 objpack/objpack/KRVector3.cpp delete mode 100644 objpack/objpack/KRVector3.h diff --git a/KREngine/KREngine.xcodeproj/project.pbxproj b/KREngine/KREngine.xcodeproj/project.pbxproj index 53a6ffa..eb09fd3 100644 --- a/KREngine/KREngine.xcodeproj/project.pbxproj +++ b/KREngine/KREngine.xcodeproj/project.pbxproj @@ -40,6 +40,18 @@ E491019E13C99BDC0098455B /* KRTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = E491018613C99BDC0098455B /* KRTexture.h */; settings = {ATTRIBUTES = (Private, ); }; }; E49101A013C99BF50098455B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E491019F13C99BF50098455B /* OpenGLES.framework */; }; E49E79FF1512615F009CF99C /* KRMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49E79FE1512615F009CF99C /* KRMesh.cpp */; }; + E4BBBB8A1512A40300F43B5B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4BBBB881512A40300F43B5B /* InfoPlist.strings */; }; + E4BBBB8E1512A40300F43B5B /* krengine_osx.m in Sources */ = {isa = PBXBuildFile; fileRef = E4BBBB8D1512A40300F43B5B /* krengine_osx.m */; }; + E4BBBB951512A45500F43B5B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB941512A45500F43B5B /* Cocoa.framework */; }; + E4BBBB971512A46700F43B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB961512A46700F43B5B /* AppKit.framework */; }; + E4BBBB991512A47500F43B5B /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB981512A47500F43B5B /* CoreData.framework */; }; + E4BBBB9B1512A48200F43B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB9A1512A48200F43B5B /* Foundation.framework */; }; + E4BBBB9C1512A4A900F43B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB9A1512A48200F43B5B /* Foundation.framework */; }; + E4BBBB9D1512A4AC00F43B5B /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB981512A47500F43B5B /* CoreData.framework */; }; + E4BBBB9E1512A4AE00F43B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB961512A46700F43B5B /* AppKit.framework */; }; + E4BBBB9F1512A4B100F43B5B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBB941512A45500F43B5B /* Cocoa.framework */; }; + E4BBBBA61512A6DC00F43B5B /* KRVector3.h in Sources */ = {isa = PBXBuildFile; fileRef = E491017E13C99BDC0098455B /* KRVector3.h */; }; + E4BBBBA71512A6DC00F43B5B /* KRVector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E491017F13C99BDC0098455B /* KRVector3.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -97,6 +109,16 @@ E491019F13C99BF50098455B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; E49E79FC15126146009CF99C /* KRMesh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRMesh.h; path = Classes/KRMesh.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; E49E79FE1512615F009CF99C /* KRMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = KRMesh.cpp; path = Classes/KRMesh.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + E4BBBB7E1512A40300F43B5B /* krengine_osx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = krengine_osx.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E4BBBB871512A40300F43B5B /* krengine_osx-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "krengine_osx-Info.plist"; sourceTree = ""; }; + E4BBBB891512A40300F43B5B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + E4BBBB8B1512A40300F43B5B /* krengine_osx-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "krengine_osx-Prefix.pch"; sourceTree = ""; }; + E4BBBB8C1512A40300F43B5B /* krengine_osx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = krengine_osx.h; sourceTree = ""; }; + E4BBBB8D1512A40300F43B5B /* krengine_osx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = krengine_osx.m; sourceTree = ""; }; + E4BBBB941512A45500F43B5B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + E4BBBB961512A46700F43B5B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; + E4BBBB981512A47500F43B5B /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; }; + E4BBBB9A1512A48200F43B5B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -106,6 +128,21 @@ files = ( E49101A013C99BF50098455B /* OpenGLES.framework in Frameworks */, E491016513C99B9E0098455B /* Foundation.framework in Frameworks */, + E4BBBB951512A45500F43B5B /* Cocoa.framework in Frameworks */, + E4BBBB971512A46700F43B5B /* AppKit.framework in Frameworks */, + E4BBBB991512A47500F43B5B /* CoreData.framework in Frameworks */, + E4BBBB9B1512A48200F43B5B /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + E4BBBB7A1512A40300F43B5B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + E4BBBB9C1512A4A900F43B5B /* Foundation.framework in Frameworks */, + E4BBBB9D1512A4AC00F43B5B /* CoreData.framework in Frameworks */, + E4BBBB9E1512A4AE00F43B5B /* AppKit.framework in Frameworks */, + E4BBBB9F1512A4B100F43B5B /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -129,7 +166,9 @@ isa = PBXGroup; children = ( E491016613C99B9E0098455B /* KREngine */, - E491016313C99B9E0098455B /* Frameworks */, + E4BBBB851512A40300F43B5B /* krengine_osx */, + E4BBBB931512A41500F43B5B /* OSX Frameworks */, + E491016313C99B9E0098455B /* iOS Frameworks */, E491016213C99B9E0098455B /* Products */, ); sourceTree = ""; @@ -138,17 +177,18 @@ isa = PBXGroup; children = ( E491016113C99B9E0098455B /* libKREngine.a */, + E4BBBB7E1512A40300F43B5B /* krengine_osx.framework */, ); name = Products; sourceTree = ""; }; - E491016313C99B9E0098455B /* Frameworks */ = { + E491016313C99B9E0098455B /* iOS Frameworks */ = { isa = PBXGroup; children = ( E491019F13C99BF50098455B /* OpenGLES.framework */, E491016413C99B9E0098455B /* Foundation.framework */, ); - name = Frameworks; + name = "iOS Frameworks"; sourceTree = ""; }; E491016613C99B9E0098455B /* KREngine */ = { @@ -208,6 +248,37 @@ name = Classes; sourceTree = ""; }; + E4BBBB851512A40300F43B5B /* krengine_osx */ = { + isa = PBXGroup; + children = ( + E4BBBB8C1512A40300F43B5B /* krengine_osx.h */, + E4BBBB8D1512A40300F43B5B /* krengine_osx.m */, + E4BBBB861512A40300F43B5B /* Supporting Files */, + ); + path = krengine_osx; + sourceTree = ""; + }; + E4BBBB861512A40300F43B5B /* Supporting Files */ = { + isa = PBXGroup; + children = ( + E4BBBB871512A40300F43B5B /* krengine_osx-Info.plist */, + E4BBBB881512A40300F43B5B /* InfoPlist.strings */, + E4BBBB8B1512A40300F43B5B /* krengine_osx-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + E4BBBB931512A41500F43B5B /* OSX Frameworks */ = { + isa = PBXGroup; + children = ( + E4BBBB9A1512A48200F43B5B /* Foundation.framework */, + E4BBBB981512A47500F43B5B /* CoreData.framework */, + E4BBBB961512A46700F43B5B /* AppKit.framework */, + E4BBBB941512A45500F43B5B /* Cocoa.framework */, + ); + name = "OSX Frameworks"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -233,6 +304,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + E4BBBB7B1512A40300F43B5B /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -254,6 +332,24 @@ productReference = E491016113C99B9E0098455B /* libKREngine.a */; productType = "com.apple.product-type.library.static"; }; + E4BBBB7D1512A40300F43B5B /* krengine_osx */ = { + isa = PBXNativeTarget; + buildConfigurationList = E4BBBB911512A40300F43B5B /* Build configuration list for PBXNativeTarget "krengine_osx" */; + buildPhases = ( + E4BBBB791512A40300F43B5B /* Sources */, + E4BBBB7A1512A40300F43B5B /* Frameworks */, + E4BBBB7B1512A40300F43B5B /* Headers */, + E4BBBB7C1512A40300F43B5B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = krengine_osx; + productName = krengine_osx; + productReference = E4BBBB7E1512A40300F43B5B /* krengine_osx.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -275,10 +371,22 @@ projectRoot = ""; targets = ( E491016013C99B9E0098455B /* KREngine */, + E4BBBB7D1512A40300F43B5B /* krengine_osx */, ); }; /* End PBXProject section */ +/* Begin PBXResourcesBuildPhase section */ + E4BBBB7C1512A40300F43B5B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E4BBBB8A1512A40300F43B5B /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ E491015D13C99B9E0098455B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -303,8 +411,29 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + E4BBBB791512A40300F43B5B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E4BBBBA61512A6DC00F43B5B /* KRVector3.h in Sources */, + E4BBBBA71512A6DC00F43B5B /* KRVector3.cpp in Sources */, + E4BBBB8E1512A40300F43B5B /* krengine_osx.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXVariantGroup section */ + E4BBBB881512A40300F43B5B /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + E4BBBB891512A40300F43B5B /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + /* Begin XCBuildConfiguration section */ E491016913C99B9E0098455B /* Debug */ = { isa = XCBuildConfiguration; @@ -340,6 +469,10 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; DSTROOT = /tmp/KREngine.dst; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks\"", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KREngine/KREngine-Prefix.pch"; OTHER_LDFLAGS = "-ObjC"; @@ -352,6 +485,10 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; DSTROOT = /tmp/KREngine.dst; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks\"", + ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KREngine/KREngine-Prefix.pch"; OTHER_LDFLAGS = "-ObjC"; @@ -359,6 +496,69 @@ }; name = Release; }; + E4BBBB8F1512A40300F43B5B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks\"", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks\"", + ); + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "krengine_osx/krengine_osx-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + INFOPLIST_FILE = "krengine_osx/krengine_osx-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + WRAPPER_EXTENSION = framework; + }; + name = Debug; + }; + E4BBBB901512A40300F43B5B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks\"", + "\"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks\"", + ); + FRAMEWORK_VERSION = A; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "krengine_osx/krengine_osx-Prefix.pch"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + INFOPLIST_FILE = "krengine_osx/krengine_osx-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + WRAPPER_EXTENSION = framework; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -380,6 +580,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + E4BBBB911512A40300F43B5B /* Build configuration list for PBXNativeTarget "krengine_osx" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E4BBBB8F1512A40300F43B5B /* Debug */, + E4BBBB901512A40300F43B5B /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = E491015813C99B9D0098455B /* Project object */; diff --git a/KREngine/krengine_osx/en.lproj/InfoPlist.strings b/KREngine/krengine_osx/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/KREngine/krengine_osx/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/KREngine/krengine_osx/krengine_osx-Info.plist b/KREngine/krengine_osx/krengine_osx-Info.plist new file mode 100644 index 0000000..5b043ac --- /dev/null +++ b/KREngine/krengine_osx/krengine_osx-Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + com.kearwood.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + NSHumanReadableCopyright + Copyright © 2012 Kearwood Software. All rights reserved. + NSPrincipalClass + + + diff --git a/KREngine/krengine_osx/krengine_osx-Prefix.pch b/KREngine/krengine_osx/krengine_osx-Prefix.pch new file mode 100644 index 0000000..706ac2e --- /dev/null +++ b/KREngine/krengine_osx/krengine_osx-Prefix.pch @@ -0,0 +1,7 @@ +// +// Prefix header for all source files of the 'krengine_osx' target in the 'krengine_osx' project +// + +#ifdef __OBJC__ + #import +#endif diff --git a/KREngine/krengine_osx/krengine_osx.h b/KREngine/krengine_osx/krengine_osx.h new file mode 100644 index 0000000..2b1ef80 --- /dev/null +++ b/KREngine/krengine_osx/krengine_osx.h @@ -0,0 +1,13 @@ +// +// krengine_osx.h +// krengine_osx +// +// Created by Kearwood Gilbert on 12-03-15. +// Copyright (c) 2012 Kearwood Software. All rights reserved. +// + +#import + +@interface krengine_osx : NSObject + +@end diff --git a/KREngine/krengine_osx/krengine_osx.m b/KREngine/krengine_osx/krengine_osx.m new file mode 100644 index 0000000..df2d1b8 --- /dev/null +++ b/KREngine/krengine_osx/krengine_osx.m @@ -0,0 +1,13 @@ +// +// krengine_osx.m +// krengine_osx +// +// Created by Kearwood Gilbert on 12-03-15. +// Copyright (c) 2012 Kearwood Software. All rights reserved. +// + +#import "krengine_osx.h" + +@implementation krengine_osx + +@end diff --git a/objpack/objpack.xcodeproj/project.pbxproj b/objpack/objpack.xcodeproj/project.pbxproj index a27497f..e21d4be 100644 --- a/objpack/objpack.xcodeproj/project.pbxproj +++ b/objpack/objpack.xcodeproj/project.pbxproj @@ -9,9 +9,7 @@ /* Begin PBXBuildFile section */ E404C89D136B8E2F00B6C99B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404C89C136B8E2F00B6C99B /* main.cpp */; }; E404C8A6136B901400B6C99B /* KROBJPacker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404C8A4136B901400B6C99B /* KROBJPacker.cpp */; }; - E404C8A9136B919F00B6C99B /* KRVector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E404C8A7136B919F00B6C99B /* KRVector3.cpp */; }; - E4082874150175FA0095DDCD /* libfbxsdk-2012.2-static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4082873150175FA0095DDCD /* libfbxsdk-2012.2-static.a */; }; - E4082877150176300095DDCD /* libPVRTexLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4082876150176300095DDCD /* libPVRTexLib.a */; }; + E4BBBBA11512A51200F43B5B /* krengine_osx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BBBBA01512A51200F43B5B /* krengine_osx.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,10 +30,7 @@ E404C89E136B8E2F00B6C99B /* objpack.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = objpack.1; sourceTree = ""; }; E404C8A4136B901400B6C99B /* KROBJPacker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = KROBJPacker.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; E404C8A5136B901400B6C99B /* KROBJPacker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KROBJPacker.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - E404C8A7136B919F00B6C99B /* KRVector3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = KRVector3.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - E404C8A8136B919F00B6C99B /* KRVector3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KRVector3.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - E4082873150175FA0095DDCD /* libfbxsdk-2012.2-static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfbxsdk-2012.2-static.a"; path = "../../../../../../../../Applications/Autodesk/FBXSDK20122/lib/gcc4/ub/libfbxsdk-2012.2-static.a"; sourceTree = ""; }; - E4082876150176300095DDCD /* libPVRTexLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPVRTexLib.a; path = "../../../../../../../../Applications/PVR SDK Package/Utilities/PVRTexLib/MacOS/libPVRTexLib.a"; sourceTree = ""; }; + E4BBBBA01512A51200F43B5B /* krengine_osx.framework */ = {isa = PBXFileReference; lastKnownFileType = file; name = krengine_osx.framework; path = ../KREngine/build/Release/krengine_osx.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,8 +38,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E4082877150176300095DDCD /* libPVRTexLib.a in Frameworks */, - E4082874150175FA0095DDCD /* libfbxsdk-2012.2-static.a in Frameworks */, + E4BBBBA11512A51200F43B5B /* krengine_osx.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -54,9 +48,8 @@ E404C88D136B8E2F00B6C99B = { isa = PBXGroup; children = ( - E4082876150176300095DDCD /* libPVRTexLib.a */, - E4082873150175FA0095DDCD /* libfbxsdk-2012.2-static.a */, E404C89B136B8E2F00B6C99B /* objpack */, + E4BBBBA51512A59E00F43B5B /* Frameworks */, E404C899136B8E2F00B6C99B /* Products */, ); sourceTree = ""; @@ -76,12 +69,18 @@ E404C89E136B8E2F00B6C99B /* objpack.1 */, E404C8A4136B901400B6C99B /* KROBJPacker.cpp */, E404C8A5136B901400B6C99B /* KROBJPacker.h */, - E404C8A7136B919F00B6C99B /* KRVector3.cpp */, - E404C8A8136B919F00B6C99B /* KRVector3.h */, ); path = objpack; sourceTree = ""; }; + E4BBBBA51512A59E00F43B5B /* Frameworks */ = { + isa = PBXGroup; + children = ( + E4BBBBA01512A51200F43B5B /* krengine_osx.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -135,7 +134,6 @@ files = ( E404C89D136B8E2F00B6C99B /* main.cpp in Sources */, E404C8A6136B901400B6C99B /* KROBJPacker.cpp in Sources */, - E404C8A9136B919F00B6C99B /* KRVector3.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -154,6 +152,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Users/kearwood/Documents/dev/svn/sarofax/tools/krengine/trunk/KREngine/KREngine/Classes; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -169,6 +168,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Users/kearwood/Documents/dev/svn/sarofax/tools/krengine/trunk/KREngine/KREngine/Classes; MACOSX_DEPLOYMENT_TARGET = 10.6; SDKROOT = macosx; }; diff --git a/objpack/objpack/KRVector3.cpp b/objpack/objpack/KRVector3.cpp deleted file mode 100644 index 471f4b4..0000000 --- a/objpack/objpack/KRVector3.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// -// KRVector3.cpp -// KREngine -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#include "KRVector3.h" - -//default constructor -Vector3::Vector3(float X = 0, float Y = 0, float Z = 0) -{ - x = X; - y = Y; - z = Z; -} - -Vector3::~Vector3() -{ -} - -//calculate and return the magnitude of this vector -float Vector3::GetMagnitude() -{ - return sqrtf(x * x + y * y + z * z); -} - -//multiply this vector by a scalar -Vector3 Vector3::operator*(float num) const -{ - return Vector3(x * num, y * num, z * num); -} - -//pass in a vector, pass in a scalar, return the product -/* - Vector3 Vector3::operator*(float num, Vector3 const &vec) - { - return Vector3(vec.x * num, vec.y * num, vec.z * num); - } - */ - -//add two vectors -Vector3 Vector3::operator+(const Vector3 &vec) const -{ - return Vector3(x + vec.x, y + vec.y, z + vec.z); -} - -//subtract two vectors -Vector3 Vector3::operator-(const Vector3 &vec) const -{ - return Vector3(x - vec.x, y - vec.y, z - vec.z); -} - -//normalize this vector -void Vector3::normalize() -{ - float magnitude = sqrtf(x * x + y * y + z * z); - x /= magnitude; - y /= magnitude; - z /= magnitude; -} - -//calculate and return dot product -float Vector3::dot(const Vector3 &vec) const -{ - return x * vec.x + y * vec.y + z * vec.z; -} - -//calculate and return cross product -Vector3 Vector3::cross(const Vector3 &vec) const -{ - return Vector3(y * vec.z - z * vec.y, - z * vec.x - x * vec.z, - x * vec.y - y * vec.x); -} diff --git a/objpack/objpack/KRVector3.h b/objpack/objpack/KRVector3.h deleted file mode 100644 index ad37b06..0000000 --- a/objpack/objpack/KRVector3.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// KRVector3.h -// KREngine -// -// Copyright 2012 Kearwood Gilbert. All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other materials -// provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// The views and conclusions contained in the software and documentation are those of the -// authors and should not be interpreted as representing official policies, either expressed -// or implied, of Kearwood Gilbert. -// - -#ifndef KRVECTOR3 -#define KRVECTOR3 -#include - -class Vector3 -{ - -public: - float x, y, z; - - //default constructor - - Vector3(float X, float Y, float Z); - ~Vector3(); - - //calculate and return the magnitude of this vector - float GetMagnitude(); - - //multiply this vector by a scalar - Vector3 operator*(float num) const; - - //pass in a vector, pass in a scalar, return the product - //friend Vector3 operator*(float num, Vector3 const &vec); - - //add two vectors - Vector3 operator+(const Vector3 &vec) const; - - //subtract two vectors - Vector3 operator-(const Vector3 &vec) const; - - //normalize this vector - void normalize(); - - //calculate and return dot product - float dot(const Vector3 &vec) const; - - //calculate and return cross product - Vector3 cross(const Vector3 &vec) const; -}; - -#endif diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj index 52f157e..d4d1dac 100644 --- a/objview/KRObjView.xcodeproj/project.pbxproj +++ b/objview/KRObjView.xcodeproj/project.pbxproj @@ -109,8 +109,8 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + E4BBBBA31512A57800F43B5B /* libraries */, E40611D114E4E98B0065996A /* testflight */, - E43A7A6D13CA2BA2000A565E /* libKREngine.a */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, @@ -194,6 +194,14 @@ name = iPad; sourceTree = ""; }; + E4BBBBA31512A57800F43B5B /* libraries */ = { + isa = PBXGroup; + children = ( + E43A7A6D13CA2BA2000A565E /* libKREngine.a */, + ); + name = libraries; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */