deps: luajit: fix 64 bits and windows

s/x86/x64/ -D P64 is for 64 bits not X64 -D WIN is for windows not X64WIN
luvit · Jul 5, 2012 · d39d2cb · d39d2cb
1 parent 1f9b9c5
commit d39d2cb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/deps/luajit.gyp b/deps/luajit.gyp
@@ -301,21 +301,21 @@
         'outputs': ['<(INTERMEDIATE_DIR)/buildvm_arch.h'],
         'inputs': [ '<(PRODUCT_DIR)/minilua' ],
         'variables': {
-          'DASM_FLAGS': [ '-D', 'JIT', '-D', 'FPU' ],
           'conditions': [
-            ['target_arch == "ia32" or target_arch == "x86"', {
+            ['target_arch == "ia32" or target_arch == "x64"', {
               'DASM_ARCH': 'x86'
             }],
             ['target_arch == "arm"', {
               'DASM_ARCH': 'arm'
             }],
-            ['target_arch == "x64" and OS == "win"', {
-               'DASM_FLAGS': ['-D', 'X64WIN']
-            }],
             ['target_arch == "x64" and OS != "win"', {
-               'DASM_FLAGS': ['-D', 'X64']
+               'DASM_FLAGS': ['-D', 'P64']
             }],
-          ]
+            ['OS == "win"', {
+               'DASM_FLAGS': ['-D', 'WIN']
+            }],
+          ],
+          'DASM_FLAGS': [ '-D', 'JIT', '-D', 'FPU' ],
         },
         'action': [
           '<(PRODUCT_DIR)/minilua', 'luajit/dynasm/dynasm.lua', '<@(DASM_FLAGS)', '-o', '<(INTERMEDIATE_DIR)/buildvm_arch.h', 'luajit/src/vm_<(DASM_ARCH).dasc'