summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 23:24:39 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 23:24:39 +0000
commite58bda8d0dd948d6e9aec4b60d9ba592d786cf08 (patch)
treed6609486c4277a149a343e6f12bfc62dd6095fe4 /third_party
parent177f8de2637e71d660aebf848353d81fbfa8d421 (diff)
downloadchromium_src-e58bda8d0dd948d6e9aec4b60d9ba592d786cf08.zip
chromium_src-e58bda8d0dd948d6e9aec4b60d9ba592d786cf08.tar.gz
chromium_src-e58bda8d0dd948d6e9aec4b60d9ba592d786cf08.tar.bz2
Try 2 at fixing linux scons build.
TBR=tony Review URL: http://codereview.chromium.org/16559 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/sqlite/SConscript11
1 files changed, 8 insertions, 3 deletions
diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript
index 04ea3ed..a6a4ee6 100644
--- a/third_party/sqlite/SConscript
+++ b/third_party/sqlite/SConscript
@@ -90,10 +90,12 @@ input_files = [
'src/mem6.c',
'src/mutex.c',
'src/mutex.h',
+ 'src/mutex_unix.c',
'src/mutex_w32.c',
'src/os.c',
'src/os.h',
'src/os_common.h',
+ 'src/os_unix.c',
'src/os_win.c',
'src/pager.c',
'src/pager.h',
@@ -102,7 +104,6 @@ input_files = [
'src/printf.c',
'src/random.c',
'src/select.c',
- 'src/shell_icu.c',
'src/sqlite3ext.h',
'src/sqliteInt.h',
'src/sqliteLimit.h',
@@ -126,8 +127,12 @@ input_files = [
'src/where.c',
]
-x=env.ChromeLibrary('sqlite', input_files)
-env.Alias('sl', x)
+if env.Bit('windows'):
+ input_files += [
+ 'src/shell_icu.c',
+ ]
+
+env.ChromeLibrary('sqlite', input_files)
env.ChromeMSVSProject('$SQLITE_DIR/sqlite.vcproj',
guid='{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}')