diff options
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 2ffebed..1c5af2e 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -53,6 +53,8 @@ env = Environment( TARGET_ROOT = '#/$BUILD_TYPE', OBJ_ROOT = '$TARGET_ROOT', + LIBS_DIR = '#/$BUILD_TYPE/Libs', + BASE_DIR = '#/$BUILD_TYPE/base', BREAKPAD_DIR = '#/$BUILD_TYPE/breakpad', CHROME_DIR = '#/$BUILD_TYPE/chrome', @@ -96,6 +98,8 @@ env = Environment( THIRD_PARTY_WEBKIT_DIR = '$THIRD_PARTY_DIR/webkit', PYTHON=sys.executable, + + LIBPATH = ['$LIBS_DIR'], ) @@ -108,7 +112,9 @@ def ChromeTestProgram(env, *args, **kw): env.AddMethod(ChromeTestProgram, "ChromeTestProgram") def ChromeStaticLibrary(env, *args, **kw): - return env.StaticLibrary(*args, **kw) + result = env.StaticLibrary(*args, **kw) + env.Install('$LIBS_DIR', result) + return result env.AddMethod(ChromeStaticLibrary, "ChromeStaticLibrary") def ChromeSharedLibrary(env, *args, **kw): @@ -194,12 +200,6 @@ if env['PLATFORM'] == 'win32': '$VISUAL_STUDIO/VC/atlmfc/include', ], - LIBPATH = [ - '$PLATFORMSDK_VISTA/files/Lib', - '$PLATFORMSDK_VISTA/files/VC/LIB', - '$VISUAL_STUDIO/VC/atlmfc/lib', - ], - LIBS = [ 'advapi32.lib', 'comdlg32.lib', @@ -229,6 +229,14 @@ if env['PLATFORM'] == 'win32': ], ) + env.Append( + LIBPATH = [ + '$PLATFORMSDK_VISTA/files/Lib', + '$PLATFORMSDK_VISTA/files/VC/LIB', + '$VISUAL_STUDIO/VC/atlmfc/lib', + ], + ) + # TODO(sgk): remove once we upgrade to SCons 0.98.4 for var in ['INCLUDE', 'LIB', 'PATH']: msvs_env[var] = msvs_env[var].split('|', 1)[0] |