summaryrefslogtreecommitdiffstats
path: root/gears/SConscript
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-23 19:40:08 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-23 19:40:08 +0000
commitb92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a (patch)
tree24b7f2fc48a7e535871bf4be9dfd705618e9557e /gears/SConscript
parent524b38893b0dc11de8707292c5348b9823f78787 (diff)
downloadchromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.zip
chromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.tar.gz
chromium_src-b92ed9d2ae1bce0d5240fd7e30b2ba4dfdee299a.tar.bz2
Change DEPS to pull Gears from the opensource svn mirror.
Also, I adjusted the SConscripts to reflect the new source tree layout (gears, third_party, and third_party_internal). Review URL: http://codereview.chromium.org/8046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript')
-rw-r--r--gears/SConscript15
1 files changed, 12 insertions, 3 deletions
diff --git a/gears/SConscript b/gears/SConscript
index f373024..bfc0b65 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -35,9 +35,9 @@ import os
Import('env')
env = env.Clone(
- OPEN_DIR = "googleclient/gears/opensource/gears",
- THIRD_PARTY_DIR = "googleclient/gears/opensource/third_party",
- PRIVATE_THIRD_PARTY_DIR = "googleclient/third_party",
+ OPEN_DIR = "gears",
+ THIRD_PARTY_DIR = "third_party",
+ PRIVATE_THIRD_PARTY_DIR = "third_party_internal",
)
if not os.path.exists(env.Dir('#/$OPEN_DIR').abspath):
@@ -680,6 +680,15 @@ elif env['OS'] == 'osx':
'-O2',
],
)
+
+# TODO(mpcomplete): fix this and properly separate our DLL flags from EXE
+# flags.
+env.Append(
+ SHLINKFLAGS = [
+ '$LINKFLAGS',
+ '/DLL',
+ ],
+)
# Load all the components