From: Stefan Bund Date: Fri, 29 Oct 2010 23:18:41 +0000 (+0200) Subject: Minor git and build fixes X-Git-Url: http://g0dil.de/git?p=pykit.git;a=commitdiff_plain;h=238713a9c57bd847085b92d5678e4d2339d8d2ca Minor git and build fixes --- diff --git a/.gitignore b/.gitignore index 7b4d044..3a846b5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ moc_* /pykit.app/ /build-*/ /Info.plist +/object_script.* diff --git a/Makefile b/Makefile index e25d314..18b004d 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ FORCE: ; clean: @-$(MAKE) -f Makefile.qmake distclean - rm -rf debug release + rm -rf debug release object_script.* Makefile: ; diff --git a/pykit.pro b/pykit.pro index 1f7e1c0..ea387ff 100644 --- a/pykit.pro +++ b/pykit.pro @@ -37,6 +37,10 @@ mac { QMAKE_CFLAGS -= -arch ppc x86_64 i386 } +win32 { + QMAKE_CXXFLAGS += -fno-strict-aliasing +} + # Input HEADERS += MainWindow.hh \ Publisher.hh \