Skip to content

Added 64-bit support #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caspahouzer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added 64-bit support #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions mobile/ios/Classes/ComObscureTicarouselCarouselView.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,20 @@ - (id)initWithFrame:(CGRect)frame {
- (void)dealloc {
self.carousel.delegate = nil;
self.carousel.dataSource = nil;

[super dealloc];
/* [super dealloc]; */
}

- (void)frameSizeChanged:(CGRect)frame bounds:(CGRect)bounds {
[super frameSizeChanged:frame bounds:bounds];
[TiUtils setView:self.carousel positionRect:bounds];
}


- (iCarousel *)carousel {
if (!_carousel) {
_carousel = [[iCarousel alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, [self bounds].size.height)];
_carousel.type = iCarouselTypeLinear;
_carousel.delegate = (id<iCarouselDelegate>) self.proxy;
_carousel.dataSource = (id<iCarouselDataSource>) self.proxy;

_carousel.clipsToBounds = YES; // never overflow the carousel bounds
}
if (_carousel.superview != self) {
Expand Down
13 changes: 6 additions & 7 deletions mobile/ios/Classes/ComObscureTicarouselCarouselViewProxy.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ - (id)init {
self.numberOfVisibleItems = 3;
self.doubleSided = [NSNumber numberWithBool:YES];

transformOptionNames = [[NSDictionary dictionaryWithObjectsAndKeys:
transformOptionNames = [NSDictionary dictionaryWithObjectsAndKeys:
@"angle", [NSNumber numberWithInt:iCarouselOptionAngle],
@"arc", [NSNumber numberWithInt:iCarouselOptionArc],
@"count", [NSNumber numberWithInt:iCarouselOptionCount],
@"radius", [NSNumber numberWithInt:iCarouselOptionRadius],
@"spacing", [NSNumber numberWithInt:iCarouselOptionSpacing],
@"tilt", [NSNumber numberWithInt:iCarouselOptionTilt],
@"yoffset", [NSNumber numberWithInt:iCarouselOptionExYOffset],
@"zoffset", [NSNumber numberWithInt:iCarouselOptionExZOffset],
nil] retain];
@"zoffset", [NSNumber numberWithInt:iCarouselOptionExZOffset], nil];
}
return self;
}
Expand All @@ -56,9 +55,9 @@ - (void)dealloc {
// clean up views
pthread_rwlock_destroy(&viewsLock);
[viewProxies makeObjectsPerformSelector:@selector(setParent:) withObject:nil];
[viewProxies release];
[transformOptionNames release];
[super dealloc];
//[viewProxies release];
//[transformOptionNames release];
//[super dealloc];
}

- (iCarousel *)carousel {
Expand Down Expand Up @@ -96,7 +95,7 @@ - (void)setViews:(id)args {
[self forgetProxy:oldViewProxy];
}
}
[viewProxies autorelease];
// [viewProxies autorelease];
viewProxies = [args mutableCopy];
[self unlockViews];
[self replaceValue:args forKey:@"views" notification:YES];
Expand Down
2 changes: 1 addition & 1 deletion mobile/ios/Classes/ComObscureTicarouselModule.m
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ -(void)shutdown:(id)sender {
#pragma mark Cleanup

-(void)dealloc {
[super dealloc];
/*[super dealloc];*/
}

#pragma mark Internal Memory Management
Expand Down
3 changes: 2 additions & 1 deletion mobile/ios/manifest
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 1.1
version: 1.2
apiversion: 2
description: module that wraps the iCarousel library by Nick Lockwood
author: Paul Mietz Egli
Expand All @@ -16,3 +16,4 @@ moduleid: com.obscure.ticarousel
guid: 2295ea8d-38ef-4786-b48b-b76c27e14fbb
platform: iphone
minsdk: 2.0.1.GA2
architectures: armv7 i386 x86_64 arm64
60 changes: 21 additions & 39 deletions mobile/ios/ticarousel.xcodeproj/project.pbxproj
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0610;
};
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "ticarousel" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -267,15 +267,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/ComObscureTicarousel.dst;
Expand Down Expand Up @@ -308,6 +301,7 @@
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv7 i386 x86_64 arm64";
};
name = Debug;
};
Expand All @@ -316,15 +310,8 @@
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/ComObscureTicarousel.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
Expand All @@ -344,29 +331,25 @@
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";
PRODUCT_NAME = ComObscureTicarousel;
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv7 i386 x86_64 arm64";
};
name = Release;
};
1DEB922308733DC00010E9CD /* Debug */ = {
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)";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DSTROOT = /tmp/ComObscureTicarousel.dst;
Expand All @@ -387,7 +370,8 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"-DDEBUG",
"-DTI_POST_1_2",
Expand All @@ -399,6 +383,7 @@
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv7 i386 x86_64 arm64";
};
name = Debug;
};
Expand All @@ -407,15 +392,9 @@
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)";
CLANG_ENABLE_OBJC_ARC = YES;
DSTROOT = /tmp/ComObscureTicarousel.dst;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_MODEL_TUNING = G5;
Expand All @@ -434,13 +413,16 @@
GCC_WARN_UNUSED_VALUE = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
"IPHONEOS_DEPLOYMENT_TARGET[sdk=iphoneos*]" = 6.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-DTI_POST_1_2";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = ComObscureTicarousel;
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv7 i386 x86_64 arm64";
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion mobile/ios/titanium.xcconfig
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 3.1.2.GA
TITANIUM_SDK_VERSION = 3.5.0.RC


//
Expand Down