Author: [email protected]
Date: Thu Apr 30 00:21:54 2009
New Revision: 1822
Modified:
branches/bleeding_edge/SConstruct
branches/bleeding_edge/test/cctest/test-regexp.cc
Log:
Added architecture properties to Windows Scons build.
Made scons build work on windows.
Review URL: http://codereview.chromium.org/100175
Modified: branches/bleeding_edge/SConstruct
==============================================================================
--- branches/bleeding_edge/SConstruct (original)
+++ branches/bleeding_edge/SConstruct Thu Apr 30 00:21:54 2009
@@ -172,6 +172,9 @@
'ARFLAGS': ['/NOLOGO'],
'CCPDBFLAGS': ['/Zi']
},
+ 'arch:ia32': {
+ 'CPPDEFINES': ['V8_ARCH_IA32']
+ },
'mode:debug': {
'CCFLAGS': ['/Od', '/Gm'],
'CPPDEFINES': ['_DEBUG', 'ENABLE_DISASSEMBLER', 'DEBUG'],
@@ -209,9 +212,6 @@
'WARNINGFLAGS': ['-Wall', '-Werror', '-W',
'-Wno-unused-parameter']
},
- 'arch:arm': {
- 'CPPDEFINES': ['ARM']
- },
'os:win32': {
'WARNINGFLAGS': ['-pedantic', '-Wno-long-long']
},
@@ -234,7 +234,7 @@
'LIBS': ['winmm', 'ws2_32']
},
'arch:arm': {
- 'CPPDEFINES': ['ARM'],
+ 'CPPDEFINES': ['V8_ARCH_ARM'],
# /wd4996 is to silence the warning about sscanf
# used by the arm simulator.
'WARNINGFLAGS': ['/wd4996']
@@ -341,6 +341,9 @@
},
'library:shared': {
'CPPDEFINES': ['USING_V8_SHARED']
+ },
+ 'arch:ia32': {
+ 'CPPDEFINES': ['V8_ARCH_IA32']
}
}
}
@@ -432,6 +435,9 @@
'CCFLAGS': ['/GL'],
'LINKFLAGS': ['/LTCG'],
}
+ },
+ 'arch:ia32': {
+ 'CPPDEFINES': ['V8_ARCH_IA32']
},
'mode:debug': {
'CCFLAGS': ['/Od'],
Modified: branches/bleeding_edge/test/cctest/test-regexp.cc
==============================================================================
--- branches/bleeding_edge/test/cctest/test-regexp.cc (original)
+++ branches/bleeding_edge/test/cctest/test-regexp.cc Thu Apr 30 00:21:54
2009
@@ -1,4 +1,4 @@
-// Copyright 2008 the V8 project authors. All rights reserved.
+/// Copyright 2008 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -38,9 +38,13 @@
#include "jsregexp-inl.h"
#include "regexp-macro-assembler.h"
#include "regexp-macro-assembler-irregexp.h"
-#ifdef ARM
+#ifdef V8_ARCH_ARM
#include "arm/regexp-macro-assembler-arm.h"
-#else // IA32
+#endif
+#ifdef V8_ARCH_X64
+// No X64-implementation yet.
+#endif
+#ifdef V8_ARCH_IA32
#include "ia32/macro-assembler-ia32.h"
#include "ia32/regexp-macro-assembler-ia32.h"
#endif
@@ -657,7 +661,7 @@
}
-#ifndef ARM // IA32 only tests.
+#ifdef V8_ARCH_IA32 // IA32 only tests.
class ContextInitializer {
public:
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
