Update project files for new directory layout

This commit is contained in:
Vinnie Falco
2013-09-11 10:08:35 -07:00
parent 03174a0d6a
commit a04fa04d07
2 changed files with 26 additions and 27 deletions

View File

@@ -44,28 +44,28 @@ linux-g++:QMAKE_CXXFLAGS += \
INCLUDEPATH += \ INCLUDEPATH += \
"../.." \ "../.." \
"../../Subtrees" \ "../../src" \
"../../Subtrees/leveldb/" \ "../../src/leveldb/" \
"../../Subtrees/leveldb/port" \ "../../src/leveldb/port" \
"../../Subtrees/leveldb/include" \ "../../src/leveldb/include" \
$${PROTOS_DIR} $${PROTOS_DIR}
OTHER_FILES += \ OTHER_FILES += \
# $$files(../../Subtrees/beast/*) \ # $$files(../../src/beast/*) \
# $$files(../../Subtrees/beast/modules/beast_basics/diagnostic/*) # $$files(../../src/beast/modules/beast_basics/diagnostic/*)
# $$files(../../Subtrees/beast/modules/beast_core/, true) # $$files(../../src/beast/modules/beast_core/, true)
# $$files(../../modules/*, true) \ # $$files(../../modules/*, true) \
UI_HEADERS_DIR += ../../modules/ripple_basics UI_HEADERS_DIR += ../../modules/ripple_basics
SOURCES += \ SOURCES += \
../../Subtrees/beast/modules/beast_asio/beast_asio.cpp \ ../../src/beast/modules/beast_asio/beast_asio.cpp \
../../Subtrees/beast/modules/beast_boost/beast_boost.cpp \ ../../src/beast/modules/beast_core/beast_core.cpp \
../../Subtrees/beast/modules/beast_core/beast_core.cpp \ ../../src/beast/modules/beast_crypto/beast_crypto.cpp \
../../Subtrees/beast/modules/beast_crypto/beast_crypto.cpp \ ../../src/beast/modules/beast_db/beast_db.cpp \
../../Subtrees/beast/modules/beast_db/beast_db.cpp \ ../../src/beast/modules/beast_extras/beast_extras.cpp \
../../Subtrees/beast/modules/beast_sqdb/beast_sqdb.cpp \ ../../src/beast/modules/beast_sqdb/beast_sqdb.cpp \
../../Subtrees/beast/modules/beast_sqlite/beast_sqlite.c \ ../../src/beast/modules/beast_sqlite/beast_sqlite.c \
../../modules/ripple_app/ripple_app.cpp \ ../../modules/ripple_app/ripple_app.cpp \
../../modules/ripple_app/ripple_app_pt1.cpp \ ../../modules/ripple_app/ripple_app_pt1.cpp \
../../modules/ripple_app/ripple_app_pt2.cpp \ ../../modules/ripple_app/ripple_app_pt2.cpp \

View File

@@ -111,11 +111,11 @@ else:
INCLUDE_PATHS = [ INCLUDE_PATHS = [
'.', '.',
'build/proto', 'build/proto',
'Subtrees', 'src',
'Subtrees/leveldb', 'src/leveldb',
'Subtrees/leveldb/port', 'src/leveldb/port',
'Subtrees/leveldb/include', 'src/leveldb/include',
'Subtrees/beast', 'src/beast',
] ]
# if BOOST_HOME: # if BOOST_HOME:
@@ -123,19 +123,19 @@ INCLUDE_PATHS = [
if OSX: if OSX:
COMPILED_FILES = [ COMPILED_FILES = [
'Subtrees/beast/modules/beast_core/beast_core.mm' 'src/beast/modules/beast_core/beast_core.mm'
] ]
else: else:
COMPILED_FILES = [ COMPILED_FILES = [
'Subtrees/beast/modules/beast_core/beast_core.cpp' 'src/beast/modules/beast_core/beast_core.cpp'
] ]
COMPILED_FILES.extend([ COMPILED_FILES.extend([
'Subtrees/beast/modules/beast_asio/beast_asio.cpp', 'src/beast/modules/beast_asio/beast_asio.cpp',
'Subtrees/beast/modules/beast_crypto/beast_crypto.cpp', 'src/beast/modules/beast_crypto/beast_crypto.cpp',
'Subtrees/beast/modules/beast_db/beast_db.cpp', 'src/beast/modules/beast_db/beast_db.cpp',
'Subtrees/beast/modules/beast_sqdb/beast_sqdb.cpp', 'src/beast/modules/beast_sqdb/beast_sqdb.cpp',
'Subtrees/beast/modules/beast_sqlite/beast_sqlite.c', 'src/beast/modules/beast_sqlite/beast_sqlite.c',
'modules/ripple_app/ripple_app.cpp', 'modules/ripple_app/ripple_app.cpp',
'modules/ripple_app/ripple_app_pt1.cpp', 'modules/ripple_app/ripple_app_pt1.cpp',
'modules/ripple_app/ripple_app_pt2.cpp', 'modules/ripple_app/ripple_app_pt2.cpp',
@@ -162,7 +162,6 @@ COMPILED_FILES.extend([
VariantDir('build/obj/src', 'src', duplicate=0) VariantDir('build/obj/src', 'src', duplicate=0)
VariantDir('build/obj/modules', 'modules', duplicate=0) VariantDir('build/obj/modules', 'modules', duplicate=0)
VariantDir('build/obj/Subtrees', 'Subtrees', duplicate=0)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------