diff --git a/KREngine/Kraken.xcodeproj/project.pbxproj b/KREngine/Kraken.xcodeproj/project.pbxproj index 8304be3..a4fc02e 100644 --- a/KREngine/Kraken.xcodeproj/project.pbxproj +++ b/KREngine/Kraken.xcodeproj/project.pbxproj @@ -1764,6 +1764,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; DSTROOT = /tmp/KREngine.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1772,6 +1773,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "kraken_ios/Kraken-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2013.3/lib/gcc4/ub\"", @@ -1788,6 +1790,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; DSTROOT = /tmp/KREngine.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1796,6 +1799,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "kraken_ios/Kraken-Prefix.pch"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SYSTEM_APPS_DIR)/Autodesk/FBX SDK/2013.3/lib/gcc4/ub\"", diff --git a/KREngine/kraken/KREngine-common.h b/KREngine/kraken/KREngine-common.h index 700adba..5ad60fc 100644 --- a/KREngine/kraken/KREngine-common.h +++ b/KREngine/kraken/KREngine-common.h @@ -11,10 +11,6 @@ #ifndef KRENGINE_COMMON_H #define KRENGINE_COMMON_H -#define KRAKEN_MEM_PAGE_SIZE 4096 -#define KRAKEN_MEM_ROUND_DOWN_PAGE(x) (x & ~(KRAKEN_MEM_PAGE_SIZE - 1)) -#define KRENGINE_MAX_TEXTURE_UNITS 8 - float const PI = 3.141592653589793f; float const D2R = PI * 2 / 360; @@ -71,6 +67,11 @@ using std::queue; #define KRAKEN_HAVE_BLAS 1 #endif +int KRAKEN_MEM_PAGE_SIZE = getpagesize(); + +#define KRAKEN_MEM_ROUND_DOWN_PAGE(x) (x & ~(KRAKEN_MEM_PAGE_SIZE - 1)) +#define KRENGINE_MAX_TEXTURE_UNITS 8 + #if !defined(__i386__) && defined(__arm__) #define KRAKEN_USE_ARM_NEON