Various typo-fixes in the attempt to port to GNUstep.

diff --git a/Library.mm b/Library.mm
index bb76f49f477305723a77b992d474f3b2fa63e780..263c73c4b3666f57419b6a037849f4cac47a26d7 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -38,6 +38,8 @@
 /* }}} */
 
 #include <substrate.h>
 /* }}} */
 
 #include <substrate.h>

+#include <dlfcn.h>
+

 #include "cycript.hpp"
 
 #include "sig/parse.hpp"
 #include "cycript.hpp"
 
 #include "sig/parse.hpp"


@@ -98,6 +100,11 @@
     } \
 }
 
     } \
 }
 

+#ifndef __APPLE__
+#define class_getSuperclass GSObjCSuper
+#define object_getClass GSObjCClass
+#endif
+

 void CYThrow(JSContextRef context, JSValueRef value);
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);
 void CYThrow(JSContextRef context, JSValueRef value);
 
 const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception);


@@ -440,7 +447,7 @@ struct Instance :
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None) {
         JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));

-        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object == nil ? nil : object_getClass(object)));
+        JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));

         return value;
     }
 
         return value;
     }
 


@@ -1496,7 +1503,7 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas
             object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
             copy = false;
 #else
             object = (id) (CYCastBool(context, value) ? kCFBooleanTrue : kCFBooleanFalse);
             copy = false;
 #else

-            object = [[NSNumber alloc] initWithBoolean:value];
+            object = [[NSNumber alloc] initWithBool:CYCastBool(context, value)];

             copy = true;
 #endif
         break;
             copy = true;
 #endif
         break;

diff --git a/makefile b/makefile
index 84a03f869d5bf370920e05d9de86201a5cacdc47..0a6ab18936cfa6a2365eff0e532ddfd8f3f69c47 100644 (file)
--- a/makefile
+++ b/makefile
@@ -114,7 +114,7 @@ lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.mm $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.mm $(header)

-       $(target)g++ $(flags) -c -o $@ $< $(objc)
+       $(target)g++ $(objc) $(flags) -c -o $@ $<

 
 libcycript.$(dll): $(code)
        $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
 
 libcycript.$(dll): $(code)
        $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)