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

---
 .hgignore                | 68 ++++++++++++++++++++++++------------------------
 src/SConscript           | 23 +++++++++-------
 src/savetextasdialog.cpp |  4 +--
 src/shared/SConscript    |  3 +++
 4 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/.hgignore b/.hgignore
index 819b6f4d..f67264ff 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,46 +1,46 @@
 syntax: glob
 scons_configure.py
 scons-ModOrganizer-*
-#ModOrganizer-build-desktop*
+ModOrganizer-build-desktop*
 outputd/*
 output/*
 build-ModOrganizer-*
-#source/NCC/*/bin
-#source/NCC/*/obj
-#source/NCC/bin
+source/NCC/*/bin
+source/NCC/*/obj
+source/NCC/bin
 *.orig
-#source/plugins/proxyPython/build
-#staging/*
-#source - Copy/*
-#ModOrganizer-build-*
-#pdbs/*
-#source/NCC/BossDummy.x/*
-#*.ts
-#staging_prepare/*
-#staging_trans/*
-#tools/python_zip/*
-#Makefile
-#html
-#*.vcxproj
-#*.pdb
-#*.dll
-#*.exp
-#*.tlog
+source/plugins/proxyPython/build
+staging/*
+source - Copy/*
+ModOrganizer-build-*
+pdbs/*
+source/NCC/BossDummy.x/*
+*.ts
+staging_prepare/*
+staging_trans/*
+tools/python_zip/*
+Makefile
+html
+*.vcxproj
+*.pdb
+*.dll
+*.exp
+*.tlog
 *.user
-#*.obj
-#*.suo
-#*.sln
-#*.log
-#*.filters
-#*.lib
-#source/organizer/resources/contents/icons
-#source/plugins/build-*
-#*/GeneratedFiles/*
-#translations/*
+*.obj
+*.suo
+*.sln
+*.log
+*.filters
+*.lib
+source/organizer/resources/contents/icons
+source/plugins/build-*
+*/GeneratedFiles/*
+translations/*
 source/LocalPaths.pri
-#source/*/Win32/Debug/*
-#source/plugins/*/Win32/Debug/*
-#*~
+source/*/Win32/Debug/*
+source/plugins/*/Win32/Debug/*
+*~
 syntax: regexp
 Makefile\.(Debug|Release)
 source/.*/debug/.*
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 {
diff --git a/src/savetextasdialog.cpp b/src/savetextasdialog.cpp
index 1f23356f..1a940094 100644
--- a/src/savetextasdialog.cpp
+++ b/src/savetextasdialog.cpp
@@ -1,6 +1,6 @@
 #include "savetextasdialog.h"
 #include "ui_savetextasdialog.h"
-#include <report.h>
+#include "report.h"
 #include <QClipboard>
 #include <QFileDialog>
 
@@ -37,7 +37,7 @@ void SaveTextAsDialog::on_saveAsBtn_clicked()
   if (!fileName.isEmpty()) {
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
-      MOBase::reportError(tr("failed to open \"%1\" for writing").arg(fileName));
+      reportError(tr("failed to open \"%1\" for writing").arg(fileName));
       return;
     }
 
diff --git a/src/shared/SConscript b/src/shared/SConscript
index 35c65d73..69a95289 100644
--- a/src/shared/SConscript
+++ b/src/shared/SConscript
@@ -20,3 +20,6 @@ env.AppendUnique(CPPPATH = [
 
 # Not sure if renaming this helps much as it's static
 env.StaticLibrary('mo_shared', env.Glob('*.cpp'))
+
+res = env['QT_USED_MODULES']
+Return('res')
-- 
cgit v1.3.1