Permalink
Browse files

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

…64; updated JSCocoa to most recent version
  • Loading branch information...
1 parent 045d7f4 commit 230ca156c146952052525a5e9be15d7436a85f62 @onecrayon committed Sep 13, 2009
View
9 JSCocoa.framework/Versions/A/Headers/JSCocoaController.h
@@ -26,7 +26,7 @@ struct JSValueRefAndContextRef
typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
-#import "iPhone/ffi.h"
+#import "iPhone/libffi/ffi.h"
#import "iPhone/BurksPool.h"
#endif
@@ -43,11 +43,14 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
@property (assign) id delegate;
+- (id)init;
+- (id)initWithGlobalContext:(JSGlobalContextRef)ctx;
+ (id)sharedController;
+ (id)controllerFromContext:(JSContextRef)ctx;
+ (BOOL)hasSharedController;
- (JSGlobalContextRef)ctx;
+ (void)hazardReport;
++ (NSString*)runningArchitecture;
//
// Evaluation
@@ -96,6 +99,7 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
+ (void)logInstanceStats;
- (id)instanceStats;
++ (void)logBoxedObjects;
//
// Class handling
@@ -140,6 +144,7 @@ typedef struct JSValueRefAndContextRef JSValueRefAndContextRef;
- (void)setUseSafeDealloc:(BOOL)b;
- (const char*)typeEncodingOfMethod:(NSString*)methodName class:(NSString*)className;
++ (const char*)typeEncodingOfMethod:(NSString*)methodName class:(NSString*)className;
@@ -249,7 +254,7 @@ id JSLocalizedString(id stringName, id firstArg, ...) NS_REQUIRES_NIL_TERMINATIO
//
-// From PyObjC : when to call objc_msgSendStret, for structure return
+// From PyObjC : when to call objc_msgSend_stret, for structure return
// Depending on structure size & architecture, structures are returned as function first argument (done transparently by ffi) or via registers
//
View
2 JSCocoa.framework/Versions/A/Headers/JSCocoaFFIArgument.h
@@ -13,7 +13,7 @@
#include <ffi/ffi.h>
#endif
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
-#import "iPhone/ffi.h"
+#import "iPhone/libffi/ffi.h"
#endif
@interface JSCocoaFFIArgument : NSObject {
View
4 JSCocoa.framework/Versions/A/Headers/JSCocoaFFIClosure.h
@@ -15,7 +15,7 @@
#import "JSCocoaFFIArgument.h"
#if TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
-#import "iPhone/ffi.h"
+#import "iPhone/libffi/ffi.h"
#endif
@@ -26,7 +26,9 @@
JSContextRef ctx;
ffi_cif cif;
+#if !TARGET_OS_IPHONE
ffi_closure* closure;
+#endif
ffi_type** argTypes;
NSMutableArray* encodings;
View
BIN JSCocoa.framework/Versions/A/JSCocoa
Binary file not shown.
View
9 Spice-sugar.xcodeproj/project.pbxproj
@@ -290,33 +290,36 @@
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_PATH = /Applications/Espresso.app;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
BUNDLE_LOADER = "$(APPLICATION_PATH)/Contents/MacOS/Espresso";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(APPLICATION_PATH)/Contents/Headers";
- ONLY_ACTIVE_ARCH = YES;
+ ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
SDKROOT = macosx10.5;
+ VALID_ARCHS = "x86_64 i386 ppc ppc64 ppc7400 ppc970";
};
name = Debug;
};
1DEB914008733D840010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_PATH = /Applications/Espresso.app;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
BUNDLE_LOADER = "$(APPLICATION_PATH)/Contents/MacOS/Espresso";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(APPLICATION_PATH)/Contents/Headers";
+ ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
SDKROOT = macosx10.5;
+ VALID_ARCHS = "x86_64 i386 ppc ppc64 ppc7400 ppc970";
};
name = Release;
};

0 comments on commit 230ca15

Please sign in to comment.