From a9cec9e5e230dbd56d62ae6dd517ae10252125ae Mon Sep 17 00:00:00 2001
From: Tom Tanner <thosrtanner2@users.sourceforge.net>
Date: Fri, 20 Mar 2015 10:34:30 +0000
Subject: Fixed Scons build for existing bits. Changed pynedit.pro to fetch
 from 'standard' install location Changed saveas code to use organizer report
 rather than uibase - this way it's not dependant on the vagaries of the
 include path, and works the same as the rest of the organiser directory

---
 src/SConscript | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/SConscript')

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 {
-- 
cgit v1.3.1