4 files changed, 48 insertions, 24 deletions
diff --git a/Slimber/Qt/QtMenulet.cpp b/Slimber/Qt/QtMenulet.cpp
new file mode 100644
index 0000000..58c7d50
--- /dev/null
+++ b/Slimber/Qt/QtMenulet.cpp
@@ -0,0 +1,2 @@
+#include "Slimber/Qt/QtMenulet.h"
+
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
new file mode 100644
index 0000000..de2e910
--- /dev/null
+++ b/Slimber/Qt/SConscript
@@ -0,0 +1,44 @@
+import os, shutil, datetime
+
+Import("env")
+
+myenv = env.Clone()
+
+myenv.MergeFlags(env["SLIMBER_FLAGS"])
+myenv.MergeFlags(env["SWIFTEN_FLAGS"])
+myenv.MergeFlags(env["CPPUNIT_FLAGS"])
+myenv.MergeFlags(env["LIBIDN_FLAGS"])
+myenv.MergeFlags(env["BOOST_FLAGS"])
+myenv.MergeFlags(env["EXPAT_FLAGS"])
+
+myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
+myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
+myenv.EnableQt4Modules(['QtCore', 'QtGui'], debug = False)
+
+myenv.Append(CPPPATH = ["."])
+
+if env["PLATFORM"] == "win32" :
+	myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
+	myenv.Append(LIBS = "qtmain")
+
+sources = ["main.cpp", "QtMenulet.cpp"]
+
+#if env["PLATFORM"] == "win32" :
+#	myenv.RES("../resources/Windows/Slimber.rc")
+#	sources += ["../resources/Windows/Slimber.res"]
+
+if env["PLATFORM"] == "win32" :
+	slimberProgram = myenv.Program("Slimber", sources)
+else :
+	slimberProgram = myenv.Program("slimber", sources)
+
+myenv.Qrc("Slimber.qrc")
+
+if env["PLATFORM"] == "win32" :
+	if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
+		myenv.WindowsBundle("Slimber", resources = [], qtlibs = ["QtCore4", "QtGui4"])
+		myenv.Append(NSIS_OPTIONS = [
+				"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
+				"/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
+			])
+		#myenv.Nsis("../Packaging/nsis/slimber.nsi")
diff --git a/Slimber/Qt/Slimber.pro b/Slimber/Qt/Slimber.pro
deleted file mode 100644
index 128bed6..0000000
--- a/Slimber/Qt/Slimber.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE = app
-CONFIG += debug
-TARGET = slimber
-
-DEPENDPATH += . ../.. ../../3rdParty/Boost
-INCLUDEPATH += . ../.. ../../3rdParty/Boost
-LIBS += ../Slimber.a ../../Swiften/Swiften.a -lexpat -L. -lavahi-client -lxml2
-include(config.pri)
-
-DEFINES += BOOST_SIGNALS_NAMESPACE=bsignals BOOST_ALL_NO_LIB
-
-HEADERS += \
-	QtMenulet.h
-
-SOURCES += \
-	main.cpp
-
-RESOURCES += \
-	Slimber.qrc
-
-#win32 {
-#	RC_FILE = ../Resources/Swift.rc
-#}
-
diff --git a/Slimber/SConscript b/Slimber/SConscript
index 504aa1b..125a264 100644
--- a/Slimber/SConscript
+++ b/Slimber/SConscript
@@ -26,3 +26,5 @@ env.Append(UNITTEST_SOURCES = [
 SConscript("CLI/SConscript")
 if env["PLATFORM"] == "darwin" :
   SConscript("Cocoa/SConscript")
+else :
+  SConscript("Qt/SConscript")