Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: chrome/test/chrome_plugin/SConscript

Issue 5035: Bring chrome/test/chrome_plugin/ into Linux build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/SConscript ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chrome_plugin/SConscript
===================================================================
--- chrome/test/chrome_plugin/SConscript (revision 2688)
+++ chrome/test/chrome_plugin/SConscript (working copy)
@@ -18,33 +18,38 @@
],
)
-env.Prepend(
- LINKFLAGS = [
- '/INCREMENTAL',
+input_files = [
+ 'test_chrome_plugin.cc',
+]
- '/MANIFEST',
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/MACHINE:X86',
- '/FIXED:No',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
+if env['PLATFORM'] == 'win32':
+ env.Prepend(
+ LINKFLAGS = [
+ '/INCREMENTAL',
- '/DEBUG',
- ],
- LIBS = [
- 'winmm.lib',
- ],
-)
+ '/MANIFEST',
+ '/DELAYLOAD:"dwmapi.dll"',
+ '/DELAYLOAD:"uxtheme.dll"',
+ '/MACHINE:X86',
+ '/FIXED:No',
-input_files = [
- 'test_chrome_plugin.cc',
- 'test_chrome_plugin.def',
-]
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/nxcompat',
+ '/DEBUG',
+ ],
+ LIBS = [
+ 'winmm.lib',
+ ],
+ )
+
+ input_files.extend([
+ 'test_chrome_plugin.def',
+ ])
+
dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files)
i = env.Install('$TARGET_ROOT', dll)
« no previous file with comments | « chrome/SConscript ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698