diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_lib.scons | 6 | ||||
| -rw-r--r-- | base/debug_message.scons | 7 | ||||
| -rw-r--r-- | base/gfx/base_gfx.scons | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons index b1b965e..7965c5e 100644 --- a/base/base_lib.scons +++ b/base/base_lib.scons @@ -219,8 +219,8 @@ input_files = ChromeFileList([ 'system_monitor.h', 'system_monitor_win.cc', 'task.h', - 'test_file_util_win.cc', 'test_file_util.h', + 'test_file_util_win.cc', 'thread.cc', 'thread.h', 'thread_collision_warner.cc', @@ -246,8 +246,9 @@ input_files = ChromeFileList([ 'values.cc', 'values.h', 'waitable_event.h', - 'waitable_event_win.cc', + 'waitable_event_watcher.h', 'waitable_event_watcher_win.cc', + 'waitable_event_win.cc', 'watchdog.cc', 'watchdog.h', 'win_util.cc', @@ -388,6 +389,7 @@ env.ChromeLibrary('base', input_files) p = env.ChromeMSVSProject('build/base.vcproj', dest='$CHROME_SRC_DIR/base/build/base.vcproj', guid='{1832A374-8A74-4F9E-B536-69A699B3E165}', + keyword='Win32Proj', dependencies=[ 'build/debug_message.vcproj', # Necessary for chrome.sln. diff --git a/base/debug_message.scons b/base/debug_message.scons index 55f981f..5e329f2 100644 --- a/base/debug_message.scons +++ b/base/debug_message.scons @@ -28,12 +28,11 @@ if env.Bit('windows'): # if it's really Windows-specific. env.ChromeProgram('debug_message', input_files) -env.ChromeMSVSProject('$BASE_DIR/build/debug_message.vcproj', - guid='{0E5474AC-5996-4B13-87C0-4AE931EE0815}') - p = env.ChromeMSVSProject('build/debug_message.vcproj', - dest='$CHROME_SRC_DIR/base/build/debug_message.vcproj', + dest=('$CHROME_SRC_DIR/base/' + + 'build/debug_message.vcproj'), guid='{0E5474AC-5996-4B13-87C0-4AE931EE0815}', + keyword='Win32Proj', files=input_files, root_namespace='DebugMessage', tools = [ diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons index 8b0983d..ceb663b 100644 --- a/base/gfx/base_gfx.scons +++ b/base/gfx/base_gfx.scons @@ -61,6 +61,7 @@ env.ChromeLibrary('base_gfx', input_files) p = env.ChromeMSVSProject('../build/base_gfx.vcproj', dest='$CHROME_SRC_DIR/base/build/base_gfx.vcproj', guid='{A508ADD3-CECE-4E0F-8448-2F5E454DF551}', + keyword='Win32Proj', files=input_files, tools=[ 'VCPreBuildEventTool', |