Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[DEV] Add 64-bit support back to 1.4.2, trashing 10.4 support along t…

…he way. Hence this branch.
  • Loading branch information...
commit 28377dc5af56d9ca3e179c3c793cf1f0eabd9c84 1 parent a51e80c
Jonathan 'Wolf' Rentzsch authored
18 ClickToFlash.xcodeproj/project.pbxproj
View
@@ -532,14 +532,14 @@
55EB70330E04A8410016593D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
COPY_PHASE_STRIP = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_SIGN_COMPARE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
PRODUCT_VERSION = 1.4.2;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
WARNING_CFLAGS = "-Wall";
};
name = Debug;
@@ -547,14 +547,14 @@
55EB70340E04A8410016593D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
COPY_PHASE_STRIP = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_SIGN_COMPARE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
PRODUCT_VERSION = 1.4.2;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
WARNING_CFLAGS = "-Wall";
};
name = Release;
@@ -562,8 +562,6 @@
55EB70450E04A8640016593D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
GCC_DYNAMIC_NO_PIC = NO;
@@ -577,7 +575,6 @@
INSTALL_PATH = "$(HOME)/Library/Bundles";
PREBINDING = NO;
PRODUCT_NAME = ClickToFlash;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
WRAPPER_EXTENSION = webplugin;
ZERO_LINK = NO;
@@ -587,8 +584,6 @@
55EB70460E04A8640016593D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
@@ -601,7 +596,6 @@
INSTALL_PATH = "$(HOME)/Library/Bundles";
PREBINDING = NO;
PRODUCT_NAME = ClickToFlash;
- SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
WRAPPER_EXTENSION = webplugin;
ZERO_LINK = NO;
16 MATrackingArea/MATrackingArea.m
View
@@ -24,6 +24,12 @@ @implementation NSWindow (liveFrame)
// This method is because -[NSWindow frame] isn't updated continually during a drag.
- (NSRect)liveFrame {
Rect qdRect;
+ extern OSStatus
+ GetWindowBounds(
+ WindowRef window,
+ WindowRegionCode regionCode,
+ Rect * globalBounds);
+
GetWindowBounds([self windowRef], kWindowStructureRgn, &qdRect);
return NSMakeRect(qdRect.left,
@@ -215,7 +221,7 @@ + (void)addTrackingArea:(MATrackingArea *)trackingArea toView:(NSView *)view
return;
}
- int index = [_views indexOfObject:view];
+ NSUInteger index = [_views indexOfObject:view];
if (index == NSNotFound) {
// Add view to _views and create appropriate entry in _trackingAreas.
[_views addObject:view];
@@ -252,7 +258,7 @@ + (void)removeTrackingArea:(MATrackingArea *)trackingArea fromView:(NSView *)vie
return;
}
- int index = [_views indexOfObject:view];
+ NSUInteger index = [_views indexOfObject:view];
if (index == NSNotFound) {
// We don't have any trackingAreas for that view.
return;
@@ -285,7 +291,7 @@ + (void)removeTrackingArea:(MATrackingArea *)trackingArea fromView:(NSView *)vie
+ (NSArray *)trackingAreasForView:(NSView *)view
{
if (view) {
- int index = [_views indexOfObject:view];
+ NSUInteger index = [_views indexOfObject:view];
if (index != NSNotFound) {
return [NSArray arrayWithArray:[_trackingAreas objectAtIndex:index]];
}
@@ -387,7 +393,7 @@ - (void)_setNotInside
- (id)copyWithZone:(NSZone *)zone
{
- MATrackingArea *copy = (MATrackingArea *)[[[self class] allocWithZone:zone]
+ MATrackingArea *copy = (MATrackingArea *)[(MATrackingArea *)[[self class] allocWithZone:zone]
initWithRect:[self rect]
options:[self options]
owner:[self owner]
@@ -406,7 +412,7 @@ - (id)initWithCoder:(NSCoder *)coder
NSDictionary *userInfo = [coder decodeObjectForKey:@"_userInfo"];
id owner = [coder decodeObjectForKey:@"_owner"];
- self = (MATrackingArea *)[[MATrackingArea alloc] initWithRect:rect
+ self = (MATrackingArea *)[(MATrackingArea *)[MATrackingArea alloc] initWithRect:rect
options:options
owner:owner
userInfo:userInfo];
17 Plugin/Plugin.m
View
@@ -394,7 +394,7 @@ - (void) mouseDown:(NSEvent *)event
trackingArea = [NSClassFromString(@"NSTrackingArea") alloc];
if (trackingArea != nil)
{
- [trackingArea initWithRect:[self bounds]
+ [(MATrackingArea *)trackingArea initWithRect:[self bounds]
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag
owner:self
userInfo:nil];
@@ -403,7 +403,7 @@ - (void) mouseDown:(NSEvent *)event
else
{
trackingArea = [NSClassFromString(@"MATrackingArea") alloc];
- [trackingArea initWithRect:[self bounds]
+ [(MATrackingArea *)trackingArea initWithRect:[self bounds]
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag
owner:self
userInfo:nil];
@@ -1154,8 +1154,11 @@ - (void)setLaunchedAppBundleIdentifier:(NSString *)newValue
@implementation NSBezierPath(MRGradientFill)
+
+//typedef void (*CGFunctionEvaluateCallback)(void *info, const CGFloat *in, CGFloat *out);
+
static void
-evaluate(void *info, const float *in, float *out)
+evaluate(void *info, const CGFloat *in, CGFloat *out)
{
// red
*out++ = start_red + *in * d_red;
@@ -1218,10 +1221,10 @@ -(void)linearGradientFill:(NSRect)thisRect
colorspace = CGColorSpaceCreateDeviceRGB();
size_t components;
- static const float domain[2] = { 0.0, 1.0 };
- static const float range[10] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
- static const CGFunctionCallbacks callbacks = { 0, &evaluate, NULL };
-
+ static const CGFloat domain[2] = { 0.0, 1.0 };
+ static const CGFloat range[10] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
+ static const CGFunctionCallbacks callbacks = {0, &evaluate, NULL};
+
components = 1 + CGColorSpaceGetNumberOfComponents(colorspace);
function = CGFunctionCreate((void *)components, 1, domain, components,
range, &callbacks);
10 Sparkle/Sparkle.xcodeproj/project.pbxproj
View
@@ -976,8 +976,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
GCC_ENABLE_OBJC_GC = supported;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
};
name = Debug;
};
@@ -987,12 +987,15 @@
buildSettings = {
GCC_DEBUGGING_SYMBOLS = full;
GCC_ENABLE_OBJC_GC = supported;
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
};
name = Release;
};
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
WARNING_CFLAGS = "-Wundeclared-selector";
};
name = Debug;
@@ -1000,6 +1003,8 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
WARNING_CFLAGS = "-Wundeclared-selector";
};
name = Release;
@@ -1007,6 +1012,8 @@
61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5-only) */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
GCC_VERSION = "";
WARNING_CFLAGS = "-Wundeclared-selector";
};
@@ -1018,6 +1025,7 @@
buildSettings = {
GCC_ENABLE_OBJC_GC = supported;
INSTALL_PATH = "@loader_path/../Frameworks";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
};
name = "Release (GC dual-mode; 10.5-only)";
};
Please sign in to comment.
Something went wrong with that request. Please try again.