make smjs compile as a dep of another project

bnoordhuis · Mar 13, 2012 · 1bd38b3 · 1bd38b3
1 parent b78159b
commit 1bd38b3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 116 deletions.
diff --git a/config/linux/js-confdefs.h b/config/linux/js-confdefs.h
diff --git a/config/common/js-config.h → extra/js-config.h b/config/common/js-config.h → extra/js-config.h
diff --git a/smjs.gyp b/smjs.gyp
@@ -16,22 +16,40 @@
       },
     },
 
+    'direct_dependent_settings': {
+      'include_dirs': [
+        'extra/',
+        'src',
+      ],
+      'conditions': [
+        ['target_arch == "x64"', {
+          'defines': ['JS_BYTES_PER_WORD=8'],
+        }],
+        ['target_arch == "ia32"', {
+          'defines': ['JS_BYTES_PER_WORD=4'],
+        }],
+        ['target_arch == "arm"', {
+          'defines': ['JS_BYTES_PER_WORD=4'],
+        }],
+      ],
+    },
+
     'include_dirs': [
       '<(SHARED_INTERMEDIATE_DIR)',
-      'config/common',
       'extra/',
       'src',
       'src/assembler',
       'src/methodjit',
     ],
 
     'defines': [
-      'HAVE_VA_LIST_AS_ARRAY=0', # XXX arch/platform/ABI/compiler dependent...
+      'HAVE_VA_LIST_AS_ARRAY=1', # XXX arch/platform/ABI/compiler dependent...
       '__STDC_LIMIT_MACROS=1',
       'JS_MONOIC=1',
       'JS_POLYIC=1',
       'JS_METHODJIT=1',
       'JS_DEFAULT_JITREPORT_GRANULARITY=3',
+      'JSGC_INCREMENTAL=1',
     ],
 
     # XXX I have frankly no idea what JS_NUNBOX32 and JS_PUNBOX64 *really* do