diff --git a/.gitignore b/.gitignore
index a606ca9..85b6dd7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
tmp
bin
build
-*.zip
diff --git a/cameraview.xcodeproj/project.pbxproj b/cameraview.xcodeproj/project.pbxproj
index 3a5149f..83af2f9 100755
--- a/cameraview.xcodeproj/project.pbxproj
+++ b/cameraview.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -162,8 +162,11 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0610;
+ };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "cameraview" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -226,15 +229,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
- ARCHS = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphoneos*]" = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DSTROOT = /tmp/TiCamera.dst;
@@ -243,6 +239,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TiCamera_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
+ GCC_THUMB_SUPPORT = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = NO;
@@ -274,21 +271,15 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphoneos*]" = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
DSTROOT = /tmp/TiCamera.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TiCamera_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
+ GCC_THUMB_SUPPORT = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = NO;
@@ -301,6 +292,7 @@
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 5.1.1;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
@@ -315,15 +307,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
- ARCHS = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphoneos*]" = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DSTROOT = /tmp/TiCamera.dst;
@@ -332,6 +317,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TiCamera_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
+ GCC_THUMB_SUPPORT = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = NO;
@@ -343,6 +329,8 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DDEBUG",
"-DTI_POST_1_2",
@@ -354,6 +342,7 @@
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
+ VALID_ARCHS = "armv7 arm64 i386 x86_64";
};
name = Debug;
};
@@ -362,21 +351,15 @@
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphoneos*]" = (
- armv6,
- armv7,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
DSTROOT = /tmp/TiCamera.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = TiCamera_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
+ GCC_THUMB_SUPPORT = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = NO;
@@ -388,13 +371,15 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
- IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ "IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 5.1.1;
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = TiCamera;
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
+ VALID_ARCHS = "armv7 arm64 i386 x86_64";
};
name = Release;
};
@@ -405,6 +390,7 @@
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_THUMB_SUPPORT = NO;
PRODUCT_NAME = "Build & test";
};
name = Debug;
@@ -416,6 +402,7 @@
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_THUMB_SUPPORT = NO;
PRODUCT_NAME = "Build & test";
ZERO_LINK = NO;
};
diff --git a/cameraview.xcodeproj/project.xcworkspace/xcshareddata/cameraview.xccheckout b/cameraview.xcodeproj/project.xcworkspace/xcshareddata/cameraview.xccheckout
new file mode 100644
index 0000000..e756f00
--- /dev/null
+++ b/cameraview.xcodeproj/project.xcworkspace/xcshareddata/cameraview.xccheckout
@@ -0,0 +1,41 @@
+
+
+
+
+ IDESourceControlProjectFavoriteDictionaryKey
+
+ IDESourceControlProjectIdentifier
+ A1072B42-4472-4A09-A655-943770DF867D
+ IDESourceControlProjectName
+ cameraview
+ IDESourceControlProjectOriginsDictionary
+
+ A2572C653C3B4C27D42F816F74C82B10CEA9F349
+ https://github.com/caspahouzer/CameraView.git
+
+ IDESourceControlProjectPath
+ cameraview.xcodeproj
+ IDESourceControlProjectRelativeInstallPathDictionary
+
+ A2572C653C3B4C27D42F816F74C82B10CEA9F349
+ ../..
+
+ IDESourceControlProjectURL
+ https://github.com/caspahouzer/CameraView.git
+ IDESourceControlProjectVersion
+ 111
+ IDESourceControlProjectWCCIdentifier
+ A2572C653C3B4C27D42F816F74C82B10CEA9F349
+ IDESourceControlProjectWCConfigurations
+
+
+ IDESourceControlRepositoryExtensionIdentifierKey
+ public.vcs.git
+ IDESourceControlWCCIdentifierKey
+ A2572C653C3B4C27D42F816F74C82B10CEA9F349
+ IDESourceControlWCCName
+ CameraView
+
+
+
+
diff --git a/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate b/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..8b22edb
Binary files /dev/null and b/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/WorkspaceSettings.xcsettings b/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..bfffcfe
--- /dev/null
+++ b/cameraview.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+
+
+
+
+ HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges
+
+ SnapshotAutomaticallyBeforeSignificantChanges
+
+
+
diff --git a/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/Build & Test.xcscheme b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/Build & Test.xcscheme
new file mode 100644
index 0000000..6af3e25
--- /dev/null
+++ b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/Build & Test.xcscheme
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/cameraview.xcscheme b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/cameraview.xcscheme
new file mode 100644
index 0000000..39417c0
--- /dev/null
+++ b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/cameraview.xcscheme
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/xcschememanagement.plist b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..95cb363
--- /dev/null
+++ b/cameraview.xcodeproj/xcuserdata/sebastian.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+
+
+
+
+ SchemeUserState
+
+ Build & Test.xcscheme
+
+ orderHint
+ 1
+
+ cameraview.xcscheme
+
+ orderHint
+ 0
+
+
+ SuppressBuildableAutocreation
+
+ 24416B8111C4CA220047AFDD
+
+ primary
+
+
+ D2AAC07D0554694100DB518D
+
+ primary
+
+
+
+
+
diff --git a/dist/ti.camera-iphone-0.20.zip b/dist/ti.camera-iphone-0.20.zip
new file mode 100644
index 0000000..d4a30de
Binary files /dev/null and b/dist/ti.camera-iphone-0.20.zip differ
diff --git a/manifest b/manifest
index d792bec..9e47e91 100755
--- a/manifest
+++ b/manifest
@@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
-version: 0.19
+version: 0.20
apiversion: 2
description: My module
author: Your Name
@@ -15,4 +15,5 @@ name: cameraview
moduleid: ti.camera
guid: 8a95d30b-e405-480b-a138-67f012993544
platform: iphone
-minsdk: 2.0.1.GA2
+minsdk: 3.4.1.GA
+architectures: armv7 arm64 i386 x86_64
diff --git a/titanium.xcconfig b/titanium.xcconfig
index 01b0bee..d43542b 100755
--- a/titanium.xcconfig
+++ b/titanium.xcconfig
@@ -4,13 +4,13 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
-TITANIUM_SDK_VERSION = 2.0.1.GA2
+TITANIUM_SDK_VERSION = 3.4.1.GA
//
// THESE SHOULD BE OK GENERALLY AS-IS
//
-TITANIUM_SDK = /Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
+TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)