Merge pull request #66 from hangarr/master

Fix to permit build with Java 1.6 or Java 1.7 on OS X
joeferner · Sep 14, 2013 · c65b9af · c65b9af
2 parents cb11185 + 68aaf21
commit c65b9af
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -10,6 +10,9 @@
       }],
       ['OS=="linux" or OS=="mac"', {
         'javahome%': "<!(echo $JAVA_HOME)"
+      }],
+      ['OS=="mac"', {
+      	'javaver%' : "<!(awk -F/ -v h=$JAVA_HOME 'BEGIN {n=split(h, a); print a[2]; exit}')"
       }]
     ]
   },
@@ -76,10 +79,33 @@
             ]
           }
         ],
-        ['OS=="mac"',
+        ['OS=="mac" and javaver=="Library"',
+          {
+            "include_dirs": [
+              "<(javahome)/include",
+              "<(javahome)/include/darwin"
+            ],
+            "libraries": [
+              "-L<(javahome)/jre/lib/server",
+              "-Wl,-rpath,<(javahome)/jre/lib/server",
+              "-ljvm"
+            ]
+          }
+        ],
+        ['OS=="mac" and javaver=="System"',
+          {
+            "include_dirs": [
+              "/System/Library/Frameworks/JavaVM.framework/Headers"
+            ],
+            "libraries": [
+              "-framework JavaVM"
+            ]
+          }
+        ],
+        ['OS=="mac" and javaver==""',
           {
             "include_dirs": [
-              "/System/Library/Frameworks/JavaVM.framework/Headers",
+              "/System/Library/Frameworks/JavaVM.framework/Headers"
             ],
             "libraries": [
               "-framework JavaVM"