From 55c85db9ba929dd94c5a27eadaf3a1bc53101aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 9 Aug 2009 19:05:16 +0200
Subject: Fixed SCons windows building.


diff --git a/SConstruct b/SConstruct
index df51358..cb4367a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -49,6 +49,8 @@ if conf.CheckCHeader("openssl/ssl.h") :
 	env["OPENSSL_FLAGS"] = {
 			"LIBS": ["ssl", "crypto"]
 		}
+else :
+	env["OPENSSL_FLAGS"] = ""
 
 if conf.CheckLib("z") :
 	env.Append(LIBS = "z")
diff --git a/Swift/QtUI/Roster/RosterDelegate.h b/Swift/QtUI/Roster/RosterDelegate.h
index 4a4ad6b..934f0bb 100644
--- a/Swift/QtUI/Roster/RosterDelegate.h
+++ b/Swift/QtUI/Roster/RosterDelegate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#import <QStyledItemDelegate>
+#include <QStyledItemDelegate>
 
 namespace Swift {
 	class RosterDelegate : public QStyledItemDelegate {
@@ -11,4 +11,4 @@ namespace Swift {
 		static const int avatarSize_ = 32;
 		static const int margin_ = 4;
 	};
-}
\ No newline at end of file
+}
diff --git a/site_scons/site_tools/qt4.py b/site_scons/site_tools/qt4.py
index df99a73..f84485a 100644
--- a/site_scons/site_tools/qt4.py
+++ b/site_scons/site_tools/qt4.py
@@ -280,7 +280,7 @@ def generate(env):
 		QT4_QRCCXXSUFFIX = '$CXXFILESUFFIX',
 		QT4_QRCCXXPREFIX = 'qrc_',
 		QT4_MOCCPPPATH = [],
-		QT4_MOCINCFLAGS = '$( ${_concat(INCPREFIX, QT4_MOCCPPPATH, INCSUFFIX, __env__, RDirs)} $)',
+		QT4_MOCINCFLAGS = '$( ${_concat("-I", QT4_MOCCPPPATH, INCSUFFIX, __env__, RDirs)} $)',
 
 		# Commands for the qt support ...
 		QT4_UICCOM = '$QT4_UIC $QT4_UICFLAGS -o $TARGET $SOURCE',
-- 
cgit v0.10.2-6-g49f6