Merge pull request joeferner#35 from raztus/master

Fix variables in binding.gyp and add Windows defaults
Newcomer520 · May 4, 2013 · d2d1bb2 · d2d1bb2
2 parents 7c64d7b + cb58966
commit d2d1bb2
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -2,10 +2,6 @@
   "targets": [
     {
       "target_name": "oracle_bindings",
-      "variables": {
-         "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
-         "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
-      },
       "sources": [ "src/connection.cpp", 
                    "src/oracle_bindings.cpp", 
                    "src/executeBaton.cpp",
@@ -18,16 +14,16 @@
         }],
         ["OS!='win'", {
           "variables": {
-             "oci_include_dir%": "<!(echo $OCI_INCLUDE_DIR)",
-             "oci_lib_dir%": "<!(echo $OCI_LIB_DIR)"
+			 "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
+			 "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
           },
           "libraries": [ "-locci", "-lclntsh", "-lnnz11" ],
           "link_settings": {"libraries": [ '-L<(oci_lib_dir)'] }
         }],
         ["OS=='win'", {
           "variables": {
-            "oci_include_dir%": "<!(echo %OCI_INCLUDE_DIR%)",
-            "oci_lib_dir%": "<!(echo %OCI_LIB_DIR%)"
+            "oci_include_dir%": "<!(IF DEFINED OCI_INCLUDE_DIR (echo %OCI_INCLUDE_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))",
+            "oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))",
          },
          # "libraries": [ "-loci" ],
          "link_settings": {"libraries": [ '<(oci_lib_dir)\oraocci11.lib'] }