diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2009-06-08 14:15:15 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2009-06-08 14:15:15 -0400 |
| commit | 905f018510bd388c0f101d23806b974dd0faea52 (patch) | |
| tree | 459a7c9000a2747182ef491f9b2a376621155e8d /SConstruct | |
| parent | ab05b87e83c2ca7eaf0c8a79a82e2c9d3499a17e (diff) | |
| parent | 6d446d4e6d7ad66d644901b488558f7b2a70d924 (diff) | |
| download | mongo-905f018510bd388c0f101d23806b974dd0faea52.tar.gz | |
Merge commit 'alanw/master'
Conflicts:
db/db.cpp
msvc/server_only/server_only.vcproj
stdafx.cpp
util/log.h
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 9a90c10e75d..8a4c93a9142 100644 --- a/SConstruct +++ b/SConstruct @@ -185,7 +185,7 @@ if ( not ( usesm or usejvm ) ): # ------ SOURCE FILE SETUP ----------- commonFiles = Split( "stdafx.cpp buildinfo.cpp db/jsobj.cpp db/json.cpp db/commands.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" ) -commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" ] +commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" , "util/assert_util.cpp" ] commonFiles += Glob( "util/*.c" ) commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/model.cpp" ) commonFiles += [ "scripting/engine.cpp" ] |