From d43989cd886d1c83a52981c30230f2818d2b8128 Mon Sep 17 00:00:00 2001 From: kearwood Date: Thu, 15 Mar 2012 23:58:37 +0000 Subject: [PATCH] Resolved linker errors, now able to cross-compile the OSX framework and iOS library from the same source --HG-- extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%4016 --- KREngine/KREngine.xcodeproj/project.pbxproj | 38 ++++++++++--------- KREngine/KREngine/Classes/KRBoundingVolume.h | 1 + KREngine/KREngine/Classes/KRCamera.h | 2 + KREngine/KREngine/Classes/KREngine-common.h | 35 +++++++++++++++++ KREngine/KREngine/Classes/KREngine.h | 5 +-- KREngine/KREngine/Classes/KRInstance.h | 3 +- KREngine/KREngine/Classes/KRMat4.h | 4 +- KREngine/KREngine/Classes/KRMaterial.h | 4 +- KREngine/KREngine/Classes/KRMaterialManager.h | 3 ++ KREngine/KREngine/Classes/KRMesh.h | 9 +---- KREngine/KREngine/Classes/KRModel.h | 5 +-- KREngine/KREngine/Classes/KRModelManager.h | 2 + KREngine/KREngine/Classes/KRScene.h | 2 + KREngine/KREngine/Classes/KRShader.cpp | 2 +- KREngine/KREngine/Classes/KRShader.h | 4 +- KREngine/KREngine/Classes/KRShaderManager.h | 2 - KREngine/KREngine/Classes/KRTexture.h | 4 +- KREngine/KREngine/Classes/KRVector3.h | 4 +- objview/Classes/KRObjViewGLView.h | 4 -- objview/Classes/KRObjViewGLView.mm | 2 +- objview/KRObjView.xcodeproj/project.pbxproj | 18 +++++---- 21 files changed, 95 insertions(+), 58 deletions(-) create mode 100644 KREngine/KREngine/Classes/KREngine-common.h diff --git a/KREngine/KREngine.xcodeproj/project.pbxproj b/KREngine/KREngine.xcodeproj/project.pbxproj index df6f838..5324e14 100644 --- a/KREngine/KREngine.xcodeproj/project.pbxproj +++ b/KREngine/KREngine.xcodeproj/project.pbxproj @@ -13,13 +13,17 @@ E414BAE91435585A00A668C4 /* KRScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E414BAE81435585A00A668C4 /* KRScene.cpp */; }; E414BAEB14355E5500A668C4 /* KRBoundingVolume.h in Headers */ = {isa = PBXBuildFile; fileRef = E414BAEA14355E5500A668C4 /* KRBoundingVolume.h */; }; E414BAED14355EFF00A668C4 /* KRBoundingVolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E414BAEC14355EFF00A668C4 /* KRBoundingVolume.cpp */; }; + E46DBE7B1512ACE600D59F86 /* KRMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49E79FE1512615F009CF99C /* KRMesh.cpp */; }; + E46DBE7F1512AF0200D59F86 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E46DBE7D1512AD4900D59F86 /* OpenGL.framework */; }; + E46DBE801512AF4600D59F86 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E491016413C99B9E0098455B /* Foundation.framework */; }; + E46DBE811512AFE600D59F86 /* KRMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = E49E79FC15126146009CF99C /* KRMesh.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E46DBE851512B9FA00D59F86 /* KREngine-common.h in Headers */ = {isa = PBXBuildFile; fileRef = E46DBE841512B9E200D59F86 /* KREngine-common.h */; settings = {ATTRIBUTES = (Public, ); }; }; E47C25A213F4F65A00FF4370 /* KRShaderManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E47C25A113F4F65A00FF4370 /* KRShaderManager.h */; }; E47C25A513F4F66F00FF4370 /* KRShader.h in Headers */ = {isa = PBXBuildFile; fileRef = E47C25A413F4F66F00FF4370 /* KRShader.h */; }; E47C25A713F4F6AB00FF4370 /* KRShaderManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47C25A613F4F6AB00FF4370 /* KRShaderManager.cpp */; }; E47C25A913F4F6DD00FF4370 /* KRShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47C25A813F4F6DD00FF4370 /* KRShader.cpp */; }; E48B3CBD14393DF5000C50E2 /* KRCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = E48B3CBC14393DF5000C50E2 /* KRCamera.h */; }; E48B3CC014393E30000C50E2 /* KRCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E48B3CBF14393E2F000C50E2 /* KRCamera.cpp */; }; - E491016513C99B9E0098455B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E491016413C99B9E0098455B /* Foundation.framework */; }; E491018713C99BDC0098455B /* KREngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = E491016F13C99BDC0098455B /* KREngine.mm */; }; E491018A13C99BDC0098455B /* KREngine.h in Headers */ = {isa = PBXBuildFile; fileRef = E491017213C99BDC0098455B /* KREngine.h */; settings = {ATTRIBUTES = (Public, ); }; }; E491018E13C99BDC0098455B /* KRMat4.h in Headers */ = {isa = PBXBuildFile; fileRef = E491017613C99BDC0098455B /* KRMat4.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -42,10 +46,6 @@ 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 */; }; @@ -79,6 +79,8 @@ E45772F413C9A13C0037BEEA /* ObjectShader.fsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = ObjectShader.fsh; path = Shaders/ObjectShader.fsh; sourceTree = ""; }; E45772F513C9A13C0037BEEA /* ObjectShader.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; lineEnding = 0; name = ObjectShader.vsh; path = Shaders/ObjectShader.vsh; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.glsl; }; E45772F613C9A13C0037BEEA /* PostShader.vsh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = PostShader.vsh; path = Shaders/PostShader.vsh; sourceTree = ""; }; + E46DBE7D1512AD4900D59F86 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; + E46DBE841512B9E200D59F86 /* KREngine-common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "KREngine-common.h"; path = "Classes/KREngine-common.h"; sourceTree = ""; }; E47C25A113F4F65A00FF4370 /* KRShaderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KRShaderManager.h; path = Classes/KRShaderManager.h; sourceTree = ""; }; E47C25A413F4F66F00FF4370 /* KRShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = KRShader.h; path = Classes/KRShader.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; E47C25A613F4F6AB00FF4370 /* KRShaderManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KRShaderManager.cpp; path = Classes/KRShaderManager.cpp; sourceTree = ""; }; @@ -127,11 +129,7 @@ buildActionMask = 2147483647; 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 */, + E46DBE801512AF4600D59F86 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,6 +139,7 @@ files = ( E4BBBB9C1512A4A900F43B5B /* Foundation.framework in Frameworks */, E4BBBB9D1512A4AC00F43B5B /* CoreData.framework in Frameworks */, + E46DBE7F1512AF0200D59F86 /* OpenGL.framework in Frameworks */, E4BBBB9E1512A4AE00F43B5B /* AppKit.framework in Frameworks */, E4BBBB9F1512A4B100F43B5B /* Cocoa.framework in Frameworks */, ); @@ -244,6 +243,7 @@ E48B3CBF14393E2F000C50E2 /* KRCamera.cpp */, E49E79FC15126146009CF99C /* KRMesh.h */, E49E79FE1512615F009CF99C /* KRMesh.cpp */, + E46DBE841512B9E200D59F86 /* KREngine-common.h */, ); name = Classes; sourceTree = ""; @@ -271,6 +271,7 @@ E4BBBB931512A41500F43B5B /* OSX Frameworks */ = { isa = PBXGroup; children = ( + E46DBE7D1512AD4900D59F86 /* OpenGL.framework */, E4BBBB9A1512A48200F43B5B /* Foundation.framework */, E4BBBB981512A47500F43B5B /* CoreData.framework */, E4BBBB961512A46700F43B5B /* AppKit.framework */, @@ -309,6 +310,8 @@ buildActionMask = 2147483647; files = ( E4D0683F1512A790005FFBEB /* KRVector3.h in Headers */, + E46DBE811512AFE600D59F86 /* KRMesh.h in Headers */, + E46DBE851512B9FA00D59F86 /* KREngine-common.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -417,6 +420,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E46DBE7B1512ACE600D59F86 /* KRMesh.cpp in Sources */, E4BBBBA71512A6DC00F43B5B /* KRVector3.cpp in Sources */, E4BBBB8E1512A40300F43B5B /* krengine_osx.m in Sources */, ); @@ -470,15 +474,13 @@ 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\"", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KREngine/KREngine-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders"; }; name = Debug; }; @@ -487,15 +489,13 @@ 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\"", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "KREngine/KREngine-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders"; }; name = Release; }; @@ -529,6 +529,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders_osx"; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -558,6 +559,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SHARED_PRECOMPS_DIR = "$(CACHE_ROOT)/SharedPrecompiledHeaders_osx"; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/KREngine/KREngine/Classes/KRBoundingVolume.h b/KREngine/KREngine/Classes/KRBoundingVolume.h index 0ddd9fd..40204a3 100644 --- a/KREngine/KREngine/Classes/KRBoundingVolume.h +++ b/KREngine/KREngine/Classes/KRBoundingVolume.h @@ -33,6 +33,7 @@ #ifndef KRBOUNDINGVOLUME_H #define KRBOUNDINGVOLUME_H +#import "KREngine-common.h" #import "KRVector3.h" #import "KRMat4.h" diff --git a/KREngine/KREngine/Classes/KRCamera.h b/KREngine/KREngine/Classes/KRCamera.h index 4ab7674..fe3a79a 100644 --- a/KREngine/KREngine/Classes/KRCamera.h +++ b/KREngine/KREngine/Classes/KRCamera.h @@ -32,6 +32,8 @@ #ifndef KRCAMERA_H #define KRCAMERA_H +#import "KREngine-common.h" + #import "KRMat4.h" class KRCamera { diff --git a/KREngine/KREngine/Classes/KREngine-common.h b/KREngine/KREngine/Classes/KREngine-common.h new file mode 100644 index 0000000..968515c --- /dev/null +++ b/KREngine/KREngine/Classes/KREngine-common.h @@ -0,0 +1,35 @@ +// +// KREngine-common.h +// KREngine +// +// Created by Kearwood Gilbert on 12-03-15. +// Copyright (c) 2012 Kearwood Software. All rights reserved. +// + + + +#ifndef KREngine_KREngine_common_h +#define KREngine_KREngine_common_h + +#import +#import +#import + +#ifdef __APPLE__ +#include "TargetConditionals.h" +#endif + +#if TARGET_OS_IPHONE + +#import +#import + +#else + +#import +#import + +#endif + + +#endif diff --git a/KREngine/KREngine/Classes/KREngine.h b/KREngine/KREngine/Classes/KREngine.h index 33a1755..cb02ba9 100644 --- a/KREngine/KREngine/Classes/KREngine.h +++ b/KREngine/KREngine/Classes/KREngine.h @@ -29,9 +29,6 @@ // or implied, of Kearwood Gilbert. // -#import -#import - // #import "KRTextureManager.h" #import #import "KRMat4.h" @@ -44,6 +41,8 @@ #import "KRModelManager.h" #import "KRCamera.h" +#import "KREngine-common.h" + typedef enum KREngineParameterType {KRENGINE_PARAMETER_INT, KRENGINE_PARAMETER_FLOAT, KRENGINE_PARAMETER_BOOL} KREngineParameterType; #define KRENGINE_MAX_SHADOW_BUFFERS 3 diff --git a/KREngine/KREngine/Classes/KRInstance.h b/KREngine/KREngine/Classes/KRInstance.h index a579f8d..05a7c50 100644 --- a/KREngine/KREngine/Classes/KRInstance.h +++ b/KREngine/KREngine/Classes/KRInstance.h @@ -36,8 +36,7 @@ #import "KRInstance.h" #import "KRCamera.h" -#import -#import +#import "KREngine-common.h" #ifndef KRINSTANCE_H #define KRINSTANCE_H diff --git a/KREngine/KREngine/Classes/KRMat4.h b/KREngine/KREngine/Classes/KRMat4.h index c81a9c2..e2bd600 100644 --- a/KREngine/KREngine/Classes/KRMat4.h +++ b/KREngine/KREngine/Classes/KRMat4.h @@ -29,11 +29,11 @@ // or implied, of Kearwood Gilbert. // -#import -#import #import "KRVector3.h" +#import "KREngine-common.h" + #ifndef KRMAT4_I #define KRMAT4_I diff --git a/KREngine/KREngine/Classes/KRMaterial.h b/KREngine/KREngine/Classes/KRMaterial.h index cb7a476..26cd886 100644 --- a/KREngine/KREngine/Classes/KRMaterial.h +++ b/KREngine/KREngine/Classes/KRMaterial.h @@ -29,12 +29,12 @@ // or implied, of Kearwood Gilbert. // -#import -#import #import #import #import +#import "KREngine-common.h" + using std::list; #ifndef KRMATERIAL_H diff --git a/KREngine/KREngine/Classes/KRMaterialManager.h b/KREngine/KREngine/Classes/KRMaterialManager.h index 12019ae..28406f2 100644 --- a/KREngine/KREngine/Classes/KRMaterialManager.h +++ b/KREngine/KREngine/Classes/KRMaterialManager.h @@ -32,6 +32,9 @@ #ifndef KRMATERIALMANAGER_H #define KRMATERIALMANAGER_H + +#import "KREngine-common.h" + #include "KRMaterial.h" #include "KRTextureManager.h" diff --git a/KREngine/KREngine/Classes/KRMesh.h b/KREngine/KREngine/Classes/KRMesh.h index 0070de8..cb4d8da 100644 --- a/KREngine/KREngine/Classes/KRMesh.h +++ b/KREngine/KREngine/Classes/KRMesh.h @@ -29,11 +29,8 @@ // or implied, of Kearwood Gilbert. // -#import -#import -#import -#import -#import +#import "KREngine-common.h" + #define MAX_VBO_SIZE 65535 // MAX_VBO_SIZE must be divisible by 3 so triangles aren't split across VBO objects... @@ -43,8 +40,6 @@ #ifndef KREngine_KRMesh_h #define KREngine_KRMesh_h - - using std::vector; class KRMesh { diff --git a/KREngine/KREngine/Classes/KRModel.h b/KREngine/KREngine/Classes/KRModel.h index 8ee06ec..6ea6b0b 100644 --- a/KREngine/KREngine/Classes/KRModel.h +++ b/KREngine/KREngine/Classes/KRModel.h @@ -28,15 +28,14 @@ // authors and should not be interpreted as representing official policies, either expressed // or implied, of Kearwood Gilbert. // - -#import -#import #import #import #import #import #import "KRMesh.h" +#import "KREngine-common.h" + using std::vector; using std::set; diff --git a/KREngine/KREngine/Classes/KRModelManager.h b/KREngine/KREngine/Classes/KRModelManager.h index e2dc671..22a33c3 100644 --- a/KREngine/KREngine/Classes/KRModelManager.h +++ b/KREngine/KREngine/Classes/KRModelManager.h @@ -32,6 +32,8 @@ #ifndef KRMODELMANAGER_H #define KRMODELMANAGER_H +#import "KREngine-common.h" + #include "KRModel.h" #include diff --git a/KREngine/KREngine/Classes/KRScene.h b/KREngine/KREngine/Classes/KRScene.h index 2c74138..49b9cd3 100644 --- a/KREngine/KREngine/Classes/KRScene.h +++ b/KREngine/KREngine/Classes/KRScene.h @@ -32,6 +32,8 @@ #ifndef KRSCENE_H #define KRSCENE_H +#import "KREngine-common.h" + #import #import "KRInstance.h" #import "KRBoundingVolume.h" diff --git a/KREngine/KREngine/Classes/KRShader.cpp b/KREngine/KREngine/Classes/KRShader.cpp index 26e7132..66c05bc 100644 --- a/KREngine/KREngine/Classes/KRShader.cpp +++ b/KREngine/KREngine/Classes/KRShader.cpp @@ -168,7 +168,7 @@ void KRShader::bind(KRCamera *pCamera, KRMat4 &mvpMatrix, KRVector3 &cameraPosit glUniform1i(m_uniforms[KRENGINE_UNIFORM_SHADOWTEXTURE3], 5); #if defined(DEBUG) - GLint logLength, status; + GLint logLength; glValidateProgram(m_iProgram); glGetProgramiv(m_iProgram, GL_INFO_LOG_LENGTH, &logLength); diff --git a/KREngine/KREngine/Classes/KRShader.h b/KREngine/KREngine/Classes/KRShader.h index fba883a..7d28cba 100644 --- a/KREngine/KREngine/Classes/KRShader.h +++ b/KREngine/KREngine/Classes/KRShader.h @@ -29,12 +29,12 @@ // or implied, of Kearwood Gilbert. // -#import -#import #import #import #import +#import "KREngine-common.h" + using std::vector; #ifndef KRSHADER_H diff --git a/KREngine/KREngine/Classes/KRShaderManager.h b/KREngine/KREngine/Classes/KRShaderManager.h index b366d45..c22e51f 100644 --- a/KREngine/KREngine/Classes/KRShaderManager.h +++ b/KREngine/KREngine/Classes/KRShaderManager.h @@ -29,8 +29,6 @@ // or implied, of Kearwood Gilbert. // -#import -#import #import #import #import diff --git a/KREngine/KREngine/Classes/KRTexture.h b/KREngine/KREngine/Classes/KRTexture.h index 2e67dae..a08c6fb 100644 --- a/KREngine/KREngine/Classes/KRTexture.h +++ b/KREngine/KREngine/Classes/KRTexture.h @@ -29,12 +29,12 @@ // or implied, of Kearwood Gilbert. // -#import -#import #import #import #import +#import "KREngine-common.h" + using std::list; #ifndef KRTEXTURE_H diff --git a/KREngine/KREngine/Classes/KRVector3.h b/KREngine/KREngine/Classes/KRVector3.h index cb180cc..2c00d21 100644 --- a/KREngine/KREngine/Classes/KRVector3.h +++ b/KREngine/KREngine/Classes/KRVector3.h @@ -33,6 +33,8 @@ #define KRVECTOR3 #include +#import "KREngine-common.h" + class KRVector3 { @@ -41,7 +43,7 @@ public: //default constructor - KRVector3(float X = 0, float Y = 0, float Z = 0); + KRVector3(float X, float Y, float Z); KRVector3(); ~KRVector3(); diff --git a/objview/Classes/KRObjViewGLView.h b/objview/Classes/KRObjViewGLView.h index 0df1280..ae2bb1b 100644 --- a/objview/Classes/KRObjViewGLView.h +++ b/objview/Classes/KRObjViewGLView.h @@ -31,10 +31,6 @@ #import -#import -#import -#import - #import #import #import diff --git a/objview/Classes/KRObjViewGLView.mm b/objview/Classes/KRObjViewGLView.mm index ab4916a..7f5025d 100644 --- a/objview/Classes/KRObjViewGLView.mm +++ b/objview/Classes/KRObjViewGLView.mm @@ -31,7 +31,7 @@ #import "KRObjViewGLView.h" -#import + #import @implementation KRObjViewGLView diff --git a/objview/KRObjView.xcodeproj/project.pbxproj b/objview/KRObjView.xcodeproj/project.pbxproj index 37d831f..03954b7 100644 --- a/objview/KRObjView.xcodeproj/project.pbxproj +++ b/objview/KRObjView.xcodeproj/project.pbxproj @@ -19,10 +19,10 @@ 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 28D7ACF80DDB3853001CB0EB /* KRObjViewViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* KRObjViewViewController.mm */; }; - E40611D614E4E98B0065996A /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E40611D214E4E98B0065996A /* libTestFlight.a */; }; E40611D714E4E98B0065996A /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = E40611D314E4E98B0065996A /* README.txt */; }; E40611D814E4E98B0065996A /* release_notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = E40611D414E4E98B0065996A /* release_notes.txt */; }; E43A7A6E13CA2BA2000A565E /* libKREngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E43A7A6D13CA2BA2000A565E /* libKREngine.a */; }; + E46DBE831512B7C300D59F86 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E40611D214E4E98B0065996A /* libTestFlight.a */; }; E46FED2D13C9A49F009F5814 /* ShadowShader.vsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2113C9A488009F5814 /* ShadowShader.vsh */; }; E46FED2E13C9A49F009F5814 /* ShadowShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2213C9A488009F5814 /* ShadowShader.fsh */; }; E46FED2F13C9A49F009F5814 /* PostShader.fsh in Resources */ = {isa = PBXBuildFile; fileRef = E46FED2313C9A488009F5814 /* PostShader.fsh */; }; @@ -71,6 +71,7 @@ buildActionMask = 2147483647; files = ( E43A7A6E13CA2BA2000A565E /* libKREngine.a in Frameworks */, + E46DBE831512B7C300D59F86 /* libTestFlight.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, @@ -78,7 +79,6 @@ 1063FBAE136BA13F00EE555B /* CoreVideo.framework in Frameworks */, 1063FBB0136BA13F00EE555B /* OpenGLES.framework in Frameworks */, 1063FBB2136BA13F00EE555B /* QuartzCore.framework in Frameworks */, - E40611D614E4E98B0065996A /* libTestFlight.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -294,7 +294,8 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - "HEADER_SEARCH_PATHS[arch=*]" = /Users/kearwood/Documents/dev/svn/sarofax/tools/krengine/trunk/KREngine/KREngine/Classes; + HEADER_SEARCH_PATHS = ""; + "HEADER_SEARCH_PATHS[arch=*]" = ""; INFOPLIST_FILE = "KRObjView-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( @@ -305,7 +306,7 @@ ); PRODUCT_NAME = KRObjView; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/applemac/circa1948/circa1948_circa1948/tools/krengine/**"; + USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; }; name = Debug; }; @@ -316,7 +317,7 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - "HEADER_SEARCH_PATHS[arch=*]" = /Users/kearwood/Documents/dev/svn/sarofax/tools/krengine/trunk/KREngine/KREngine/Classes; + HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "KRObjView-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( @@ -327,7 +328,7 @@ ); PRODUCT_NAME = KRObjView; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/applemac/circa1948/circa1948_circa1948/tools/krengine/**"; + USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -377,7 +378,8 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = KRObjView_Prefix.pch; - "HEADER_SEARCH_PATHS[arch=*]" = /Users/kearwood/Documents/dev/svn/sarofax/tools/krengine/trunk/KREngine/KREngine/Classes; + HEADER_SEARCH_PATHS = ""; + "HEADER_SEARCH_PATHS[arch=*]" = ""; INFOPLIST_FILE = "KRObjView-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( @@ -388,7 +390,7 @@ ); PRODUCT_NAME = KRObjView; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "/Users/applemac/circa1948/circa1948_circa1948/tools/krengine/**"; + USER_HEADER_SEARCH_PATHS = "/Users/kearwood/Documents/dev/svn/kearwood/krengine/KREngine/KREngine/Classes/**"; VALIDATE_PRODUCT = YES; }; name = "Ad Hoc";