summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-09 17:05:16 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-09 17:12:12 (GMT)
commit55c85db9ba929dd94c5a27eadaf3a1bc53101aa9 (patch)
treec4017e28b3e4857d009859ddd408d3cbc8e347b8
parentfc40b37d47d510154e1ce58bfaabe6b927333cde (diff)
downloadswift-55c85db9ba929dd94c5a27eadaf3a1bc53101aa9.zip
swift-55c85db9ba929dd94c5a27eadaf3a1bc53101aa9.tar.bz2
Fixed SCons windows building.
-rw-r--r--SConstruct2
-rw-r--r--Swift/QtUI/Roster/RosterDelegate.h4
-rw-r--r--site_scons/site_tools/qt4.py2
3 files changed, 5 insertions, 3 deletions
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',