diff options
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/SConscript b/src/SConscript index 2eeb869e..3dd5d450 100644 --- a/src/SConscript +++ b/src/SConscript @@ -13,20 +13,16 @@ modules = [ 'Sql',
'WebKit',
'Xml',
- 'XmlPatterns'
+ 'XmlPatterns',
+ 'Declarative'
]
if env['QT_MAJOR_VERSION'] > 4:
modules += [
'Widgets',
'Qml',
- 'Quick',
'WebKitWidgets'
]
-else:
- modules += [
- 'Declarative'
- ]
env.EnableQtModules(*modules)
@@ -34,6 +30,7 @@ env.Uic4(env.Glob('*.ui')) env.RequireLibraries('uibase', 'shared', 'bsatk', 'esptk')
+
env.AppendUnique(LIBS = [
'shell32',
'user32',
@@ -58,8 +55,10 @@ for file in env.Glob('*.rc'): # Doing appendunique seems to throw the moc code into a tizzy
env['CPPPATH'] += [
'../archive',
- '../boss_modified/boss-api',
+# '../boss_modified/boss-api',
+ '../plugins/gamefeatures',
'.', # Why is this necessary?
+ '${LOOTPATH}',
'${BOOSTPATH}',
]
@@ -69,9 +68,7 @@ env.AppendUnique(CPPDEFINES = [ '_SCL_SECURE_NO_WARNINGS',
'NOMINMAX',
'BOOST_DISABLE_ASSERTS',
-# Although the .pro file says it adds this, the compile line doesn't seem to
-# have it (unless it's in the annoying '@' file
-# 'NDEBUG'
+ 'NDEBUG'
])
env.AppendUnique(CPPFLAGS = [ '-wd4100', '-wd4127', '-wd4512', '-wd4189' ])
@@ -93,6 +90,9 @@ hgid = subprocess.check_output(['hg', 'id', '-i']).rstrip() about_env.AppendUnique(CPPDEFINES = [ 'HGID=\\"%s\\"' % hgid ])
other_sources.append(about_env.StaticObject('aboutdialog.cpp'))
+env.AppendUnique(LIBPATH = "${ZLIBPATH}/build")
+env.AppendUnique(LIBS = 'zlibstatic')
+
prog = env.Program('ModOrganizer',
cpp_files + env.Glob('*.qrc') + other_sources)
@@ -104,6 +104,9 @@ for subdir in ('tutorials', 'stylesheets'): # FIXME Sort the translations. Except they don't exist on the 1.2 branch
+res = env['QT_USED_MODULES']
+Return('res')
+
"""
CONFIG(debug, debug|release) {
} else {
|