Skip to content

Commit 1ea6144

Browse files
rentzschrentzsch
committed
[DEV] Add support for ppc (10.4), i386 (10.4) and x86_64 (10.5).
Note: we need to keep SDKROOT incorrectly set to 10.5 since 10.4 SDK's WebKit.framework lacks some symbols it should have.
1 parent 0055375 commit 1ea6144

File tree

3 files changed

+48
-34
lines changed

3 files changed

+48
-34
lines changed

‎ClickToFlash.xcodeproj/project.pbxproj

+24-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 42;
6+
objectVersion = 44;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -288,7 +288,7 @@
288288
55EB70320E04A8410016593D /* Project object */ = {
289289
isa = PBXProject;
290290
buildConfigurationList = 55EB70350E04A8410016593D /* Build configuration list for PBXProject "ClickToFlash" */;
291-
compatibilityVersion = "Xcode 2.4";
291+
compatibilityVersion = "Xcode 3.0";
292292
hasScannedForEncodings = 0;
293293
mainGroup = 55EB70300E04A8410016593D;
294294
productRefGroup = 55EB70430E04A8640016593D /* Products */;
@@ -467,13 +467,10 @@
467467
55EB70330E04A8410016593D /* Debug */ = {
468468
isa = XCBuildConfiguration;
469469
buildSettings = {
470-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
471-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
472470
COPY_PHASE_STRIP = NO;
473471
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
474472
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
475473
GCC_WARN_SIGN_COMPARE = YES;
476-
MACOSX_DEPLOYMENT_TARGET = 10.4;
477474
PRODUCT_VERSION = 1.5b2;
478475
WARNING_CFLAGS = "-Wall";
479476
};
@@ -482,13 +479,10 @@
482479
55EB70340E04A8410016593D /* Release */ = {
483480
isa = XCBuildConfiguration;
484481
buildSettings = {
485-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
486-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
487482
COPY_PHASE_STRIP = YES;
488483
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
489484
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
490485
GCC_WARN_SIGN_COMPARE = YES;
491-
MACOSX_DEPLOYMENT_TARGET = 10.4;
492486
PRODUCT_VERSION = 1.5b2;
493487
WARNING_CFLAGS = "-Wall";
494488
};
@@ -497,23 +491,29 @@
497491
55EB70450E04A8640016593D /* Debug */ = {
498492
isa = XCBuildConfiguration;
499493
buildSettings = {
500-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
501-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
494+
ARCHS = (
495+
ppc,
496+
i386,
497+
x86_64,
498+
);
502499
COPY_PHASE_STRIP = NO;
503500
FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
504501
GCC_DYNAMIC_NO_PIC = NO;
505502
GCC_ENABLE_FIX_AND_CONTINUE = YES;
506-
GCC_ENABLE_OBJC_GC = YES;
503+
GCC_ENABLE_OBJC_GC = supported;
507504
GCC_MODEL_TUNING = G5;
508505
GCC_OPTIMIZATION_LEVEL = 0;
509506
GCC_PRECOMPILE_PREFIX_HEADER = NO;
510507
GCC_PREFIX_HEADER = Plugin/ClickToFlash_Prefix.pch;
511508
INFOPLIST_FILE = "Plugin/Info-Plugin.plist";
512509
INSTALL_PATH = "$(HOME)/Library/Bundles";
510+
MACOSX_DEPLOYMENT_TARGET = 10.5;
511+
"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;
512+
"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.4;
513513
PREBINDING = NO;
514514
PRODUCT_NAME = ClickToFlash;
515-
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
516-
VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
515+
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
516+
VALID_ARCHS = "ppc i386 x86_64";
517517
WRAPPER_EXTENSION = webplugin;
518518
ZERO_LINK = NO;
519519
};
@@ -522,22 +522,28 @@
522522
55EB70460E04A8640016593D /* Release */ = {
523523
isa = XCBuildConfiguration;
524524
buildSettings = {
525-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
526-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
525+
ARCHS = (
526+
ppc,
527+
i386,
528+
x86_64,
529+
);
527530
COPY_PHASE_STRIP = YES;
528531
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
529532
FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)";
530533
GCC_ENABLE_FIX_AND_CONTINUE = NO;
531-
GCC_ENABLE_OBJC_GC = YES;
534+
GCC_ENABLE_OBJC_GC = supported;
532535
GCC_MODEL_TUNING = G5;
533536
GCC_PRECOMPILE_PREFIX_HEADER = NO;
534537
GCC_PREFIX_HEADER = "";
535538
INFOPLIST_FILE = "Plugin/Info-Plugin.plist";
536539
INSTALL_PATH = "$(HOME)/Library/Bundles";
540+
MACOSX_DEPLOYMENT_TARGET = 10.5;
541+
"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;
542+
"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.4;
537543
PREBINDING = NO;
538544
PRODUCT_NAME = ClickToFlash;
539-
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
540-
VALID_ARCHS = "i386 ppc ppc7400 ppc970 x86_64";
545+
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
546+
VALID_ARCHS = "ppc i386 x86_64";
541547
WRAPPER_EXTENSION = webplugin;
542548
ZERO_LINK = NO;
543549
};

‎MATrackingArea/MATrackingArea.m

+11-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ @implementation NSWindow (liveFrame)
2424
// This method is because -[NSWindow frame] isn't updated continually during a drag.
2525
- (NSRect)liveFrame {
2626
Rect qdRect;
27+
extern OSStatus
28+
GetWindowBounds(
29+
WindowRef window,
30+
WindowRegionCode regionCode,
31+
Rect * globalBounds);
32+
2733
GetWindowBounds([self windowRef], kWindowStructureRgn, &qdRect);
2834

2935
return NSMakeRect(qdRect.left,
@@ -215,7 +221,7 @@ + (void)addTrackingArea:(MATrackingArea *)trackingArea toView:(NSView *)view
215221
return;
216222
}
217223

218-
int index = [_views indexOfObject:view];
224+
NSUInteger index = [_views indexOfObject:view];
219225
if (index == NSNotFound) {
220226
// Add view to _views and create appropriate entry in _trackingAreas.
221227
[_views addObject:view];
@@ -252,7 +258,7 @@ + (void)removeTrackingArea:(MATrackingArea *)trackingArea fromView:(NSView *)vie
252258
return;
253259
}
254260

255-
int index = [_views indexOfObject:view];
261+
NSUInteger index = [_views indexOfObject:view];
256262
if (index == NSNotFound) {
257263
// We don't have any trackingAreas for that view.
258264
return;
@@ -285,7 +291,7 @@ + (void)removeTrackingArea:(MATrackingArea *)trackingArea fromView:(NSView *)vie
285291
+ (NSArray *)trackingAreasForView:(NSView *)view
286292
{
287293
if (view) {
288-
int index = [_views indexOfObject:view];
294+
NSUInteger index = [_views indexOfObject:view];
289295
if (index != NSNotFound) {
290296
return [NSArray arrayWithArray:[_trackingAreas objectAtIndex:index]];
291297
}
@@ -387,7 +393,7 @@ - (void)_setNotInside
387393

388394
- (id)copyWithZone:(NSZone *)zone
389395
{
390-
MATrackingArea *copy = (MATrackingArea *)[[[self class] allocWithZone:zone]
396+
MATrackingArea *copy = (MATrackingArea *)[(MATrackingArea *)[[self class] allocWithZone:zone]
391397
initWithRect:[self rect]
392398
options:[self options]
393399
owner:[self owner]
@@ -406,7 +412,7 @@ - (id)initWithCoder:(NSCoder *)coder
406412
NSDictionary *userInfo = [coder decodeObjectForKey:@"_userInfo"];
407413
id owner = [coder decodeObjectForKey:@"_owner"];
408414

409-
self = (MATrackingArea *)[[MATrackingArea alloc] initWithRect:rect
415+
self = (MATrackingArea *)[(MATrackingArea *)[MATrackingArea alloc] initWithRect:rect
410416
options:options
411417
owner:owner
412418
userInfo:userInfo];

‎Plugin/Plugin.m

+13-11
Original file line numberDiff line numberDiff line change
@@ -793,19 +793,19 @@ - (void) _addTrackingAreaForCTF
793793
trackingArea = [NSClassFromString(@"NSTrackingArea") alloc];
794794
if (trackingArea != nil)
795795
{
796-
[trackingArea initWithRect:[self bounds]
797-
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag | MATrackingInVisibleRect
798-
owner:self
799-
userInfo:nil];
796+
[(MATrackingArea *)trackingArea initWithRect:[self bounds]
797+
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag | MATrackingInVisibleRect
798+
owner:self
799+
userInfo:nil];
800800
[self addTrackingArea:trackingArea];
801801
}
802802
else
803803
{
804804
trackingArea = [NSClassFromString(@"MATrackingArea") alloc];
805-
[trackingArea initWithRect:[self bounds]
806-
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag | MATrackingInVisibleRect
807-
owner:self
808-
userInfo:nil];
805+
[(MATrackingArea *)trackingArea initWithRect:[self bounds]
806+
options:MATrackingMouseEnteredAndExited | MATrackingActiveInKeyWindow | MATrackingEnabledDuringMouseDrag | MATrackingInVisibleRect
807+
owner:self
808+
userInfo:nil];
809809
[MATrackingArea addTrackingArea:trackingArea toView:self];
810810
usingMATrackingArea = YES;
811811
}
@@ -1199,8 +1199,10 @@ - (void)setLaunchedAppBundleIdentifier:(NSString *)newValue
11991199

12001200
@implementation NSBezierPath(MRGradientFill)
12011201

1202+
//typedef void (*CGFunctionEvaluateCallback)(void *info, const CGFloat *in, CGFloat *out);
1203+
12021204
static void
1203-
evaluate(void *info, const float *in, float *out)
1205+
evaluate(void *info, const CGFloat *in, CGFloat *out)
12041206
{
12051207
// red
12061208
*out++ = start_red + *in * d_red;
@@ -1263,8 +1265,8 @@ -(void)linearGradientFill:(NSRect)thisRect
12631265
colorspace = CGColorSpaceCreateDeviceRGB();
12641266

12651267
size_t components;
1266-
static const float domain[2] = { 0.0, 1.0 };
1267-
static const float range[10] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
1268+
static const CGFloat domain[2] = { 0.0, 1.0 };
1269+
static const CGFloat range[10] = { 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 };
12681270
static const CGFunctionCallbacks callbacks = { 0, &evaluate, NULL };
12691271

12701272
components = 1 + CGColorSpaceGetNumberOfComponents(colorspace);

0 commit comments

Comments
 (0)