Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Cleaned up build settings to only support 32-bit until Espresso goes …

…64; updated JSCocoa to most recent version
  • Loading branch information...
commit 230ca156c146952052525a5e9be15d7436a85f62 1 parent 045d7f4
Ian Beck authored
9 JSCocoa.framework/Versions/A/Headers/JSCocoaController.h
@@ -26,7 +26,7 @@ struct JSValueRefAndContextRef
26 26 typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
27 27
28 28 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
29   -#import "iPhone/ffi.h"
  29 +#import "iPhone/libffi/ffi.h"
30 30 #import "iPhone/BurksPool.h"
31 31 #endif
32 32
@@ -43,11 +43,14 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
43 43
44 44 @property (assign) id delegate;
45 45
  46 +- (id)init;
  47 +- (id)initWithGlobalContext:(JSGlobalContextRef)ctx;
46 48 + (id)sharedController;
47 49 + (id)controllerFromContext:(JSContextRef)ctx;
48 50 + (BOOL)hasSharedController;
49 51 - (JSGlobalContextRef)ctx;
50 52 + (void)hazardReport;
  53 ++ (NSString*)runningArchitecture;
51 54
52 55 //
53 56 // Evaluation
@@ -96,6 +99,7 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
96 99
97 100 + (void)logInstanceStats;
98 101 - (id)instanceStats;
  102 ++ (void)logBoxedObjects;
99 103
100 104 //
101 105 // Class handling
@@ -140,6 +144,7 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
140 144 - (void)setUseSafeDealloc:(BOOL)b;
141 145
142 146 - (const char*)typeEncodingOfMethod:(NSString*)methodName class:(NSString*)className;
  147 ++ (const char*)typeEncodingOfMethod:(NSString*)methodName class:(NSString*)className;
143 148
144 149
145 150
@@ -249,7 +254,7 @@ id JSLocalizedString(id stringName, id firstArg, ...) NS_REQUIRES_NIL_TERMINATIO
249 254
250 255
251 256 //
252   -// From PyObjC : when to call objc_msgSendStret, for structure return
  257 +// From PyObjC : when to call objc_msgSend_stret, for structure return
253 258 // Depending on structure size & architecture, structures are returned as function first argument (done transparently by ffi) or via registers
254 259 //
255 260
2  JSCocoa.framework/Versions/A/Headers/JSCocoaFFIArgument.h
@@ -13,7 +13,7 @@
13 13 #include <ffi/ffi.h>
14 14 #endif
15 15 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
16   -#import "iPhone/ffi.h"
  16 +#import "iPhone/libffi/ffi.h"
17 17 #endif
18 18
19 19 @interface JSCocoaFFIArgument : NSObject {
4 JSCocoa.framework/Versions/A/Headers/JSCocoaFFIClosure.h
@@ -15,7 +15,7 @@
15 15 #import "JSCocoaFFIArgument.h"
16 16
17 17 #if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
18   -#import "iPhone/ffi.h"
  18 +#import "iPhone/libffi/ffi.h"
19 19 #endif
20 20
21 21
@@ -26,7 +26,9 @@
26 26 JSContextRef ctx;
27 27
28 28 ffi_cif cif;
  29 +#if !TARGET_OS_IPHONE
29 30 ffi_closure* closure;
  31 +#endif
30 32 ffi_type** argTypes;
31 33
32 34 NSMutableArray* encodings;
BIN  JSCocoa.framework/Versions/A/JSCocoa
Binary file not shown
9 Spice-sugar.xcodeproj/project.pbxproj
@@ -290,7 +290,7 @@
290 290 isa = XCBuildConfiguration;
291 291 buildSettings = {
292 292 APPLICATION_PATH = /Applications/Espresso.app;
293   - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
  293 + ARCHS = "$(ARCHS_STANDARD_32_BIT)";
294 294 BUNDLE_LOADER = "$(APPLICATION_PATH)/Contents/MacOS/Espresso";
295 295 GCC_C_LANGUAGE_STANDARD = gnu99;
296 296 GCC_ENABLE_OBJC_GC = supported;
@@ -298,9 +298,10 @@
298 298 GCC_WARN_ABOUT_RETURN_TYPE = YES;
299 299 GCC_WARN_UNUSED_VARIABLE = YES;
300 300 HEADER_SEARCH_PATHS = "$(APPLICATION_PATH)/Contents/Headers";
301   - ONLY_ACTIVE_ARCH = YES;
  301 + ONLY_ACTIVE_ARCH = NO;
302 302 PREBINDING = NO;
303 303 SDKROOT = macosx10.5;
  304 + VALID_ARCHS = "x86_64 i386 ppc ppc64 ppc7400 ppc970";
304 305 };
305 306 name = Debug;
306 307 };
@@ -308,15 +309,17 @@
308 309 isa = XCBuildConfiguration;
309 310 buildSettings = {
310 311 APPLICATION_PATH = /Applications/Espresso.app;
311   - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
  312 + ARCHS = "$(ARCHS_STANDARD_32_BIT)";
312 313 BUNDLE_LOADER = "$(APPLICATION_PATH)/Contents/MacOS/Espresso";
313 314 GCC_C_LANGUAGE_STANDARD = gnu99;
314 315 GCC_ENABLE_OBJC_GC = supported;
315 316 GCC_WARN_ABOUT_RETURN_TYPE = YES;
316 317 GCC_WARN_UNUSED_VARIABLE = YES;
317 318 HEADER_SEARCH_PATHS = "$(APPLICATION_PATH)/Contents/Headers";
  319 + ONLY_ACTIVE_ARCH = NO;
318 320 PREBINDING = NO;
319 321 SDKROOT = macosx10.5;
  322 + VALID_ARCHS = "x86_64 i386 ppc ppc64 ppc7400 ppc970";
320 323 };
321 324 name = Release;
322 325 };

0 comments on commit 230ca15

Please sign in to comment.
Something went wrong with that request. Please try again.