Enable to build on Mac OS X 64 bits.

greenheartgames · Oct 10, 2014 · ac1b80c · ac1b80c
1 parent 2d3c5a0
commit ac1b80c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -26,8 +26,19 @@
       ],
     }],
     ['OS=="mac"', {
+      'conditions': [
+        ['target_arch=="ia32"', {
+          'variables': {
+            'project_name': 'greenworks-osx32',
+          },
+        }],
+        ['target_arch=="x64"', {
+          'variables': {
+            'project_name': 'greenworks-osx64',
+          },
+        }],
+      ],
       'variables': {
-        'project_name': 'greenworks-osx',
         'redist_bin_dir': 'osx32',
         'lib_steam': 'libsteam_api.dylib'
       },

diff --git a/lib/greenworks.js b/lib/greenworks.js
@@ -1,9 +1,12 @@
 var fs = require('fs');
 var greenworks;
 
-if (process.platform == 'darwin')
-  greenworks = require('../build/Release/greenworks-osx');
-else if (process.platform == 'win32') {
+if (process.platform == 'darwin') {
+  if (process.arch == 'x64')
+    greenworks = require('../build/Release/greenworks-osx64');
+  else if (process.arch == 'ia32')
+    greenworks = require('../build/Release/greenworks-osx32');
+} else if (process.platform == 'win32') {
   if (process.arch == 'x64')
     greenworks = require('../build/Release/greenworks-win64');
   else if (process.arch == 'ia32')

diff --git a/src/greenworks_api.cc b/src/greenworks_api.cc
@@ -306,7 +306,11 @@ void init(v8::Handle<v8::Object> exports) {
     NODE_MODULE(greenworks_win64, init)
   #endif
 #elif defined(__APPLE__)
-  NODE_MODULE(greenworks_osx, init)
+  #if defined(__x86_64__) || defined(__ppc64__)
+    NODE_MODULE(greenworks_osx64, init)
+  #else
+    NODE_MODULE(greenworks_osx32, init)
+  #endif
 #elif defined(__linux__)
   #if defined(__x86_64__) || defined(__ppc64__)
     NODE_MODULE(greenworks_linux64, init)