Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix for issue #5 and to fix SDL on the mac #6

Merged
merged 3 commits into from

3 participants

Richard Howell Tim Caswell Nathan Rajlich
Richard Howell

hey

i have pushed a few small commits you may want to merge, one to fix this:

#5

and another to make SDL run on the mac using the Quartz backend.

ta

Richard Mazo... added some commits
Tim Caswell creationix merged commit b89f9ac into from
Tim Caswell
Owner

Great work. I was wondering how to fix it for OSX

Nathan Rajlich

Dude, how did you figure this one out?? Nice!

with the power of grayskull, and to a lesser extent this doc page

i wonder if this works for ffi too... Those includes don't have any side effects other than declaring stuff right?

the objc headers just declare functions that are used by the objc runtime, to send messages to objects and handle properties and so on. you can see the gory details here:

https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ObjCRuntimeRef/Reference/reference.html

Oh, how intimately familiar I am with those crazy awesome functions :p

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 27, 2012
  1. use the correct method signature for EIO_WaitEvent

    Richard Mazorodze authored
  2. point sdl.js to the correct build directory

    Richard Mazorodze authored
  3. call [NSApplication sharedApplication] before SDL_Init(), otherwise t…

    Richard Mazorodze authored
    …he app will crash when SDL_SetVideoMode() is called
This page is out of date. Refresh to see the latest.
Showing with 16 additions and 8 deletions.
  1. +1 −1  sdl.js
  2. +13 −5 src/sdl.cc
  3. +2 −2 src/sdl.h
2  sdl.js 100644 → 100755
View
@@ -1,4 +1,4 @@
-var SDL = module.exports = require('./build/default/node-sdl.node');
+var SDL = module.exports = require('./build/Release/node-sdl.node');
// Easy event emitter based event loop. Started automatically when the first
// listener is added.
18 src/sdl.cc
View
@@ -1,11 +1,21 @@
-#include "sdl.h"
-using namespace v8;
+#ifdef __APPLE__
+#include <objc/objc.h>
+#include <objc/objc-runtime.h>
+#endif
+#include "SDL.h"
+using namespace v8;
extern "C" void
init(Handle<Object> target)
{
+#ifdef __APPLE__
+ // on the mac it is necessary to create to call [NSApplication sharedApplication]
+ // before we can create a rendering window
+ objc_msgSend(objc_lookUpClass("NSApplication"), sel_getUid("sharedApplication"));
+#endif
+
NODE_SET_METHOD(target, "init", sdl::Init);
NODE_SET_METHOD(target, "initSubSystem", sdl::InitSubSystem);
NODE_SET_METHOD(target, "quit", sdl::Quit);
@@ -107,7 +117,6 @@ init(Handle<Object> target)
GL->Set(String::New("ACCUM_GREEN_SIZE"), Number::New(SDL_GL_ACCUM_GREEN_SIZE));
GL->Set(String::New("ACCUM_BLUE_SIZE"), Number::New(SDL_GL_ACCUM_BLUE_SIZE));
GL->Set(String::New("ACCUM_ALPHA_SIZE"), Number::New(SDL_GL_ACCUM_ALPHA_SIZE));
-
}
////////////////////////////////////////////////////////////////////////////////
@@ -246,10 +255,9 @@ Handle<Value> sdl::SetError(const Arguments& args) {
return Undefined();
}
-static int sdl::EIO_WaitEvent(eio_req *req) {
+static void sdl::EIO_WaitEvent(eio_req *req) {
sdl::closure_t *closure = (sdl::closure_t *) req->data;
closure->status = SDL_WaitEvent(NULL);
- return 0;
}
static int sdl::EIO_OnEvent(eio_req *req) {
4 src/sdl.h
View
@@ -82,8 +82,8 @@ namespace sdl {
Persistent<Function> fn;
int status;
} closure_t;
- static int EIO_WaitEvent(eio_req *req);
- static int EIO_OnEvent(eio_req *req);
+ static void EIO_WaitEvent(eio_req *req);
+ static int EIO_OnEvent(eio_req *req);
}
Something went wrong with that request. Please try again.