summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Alberto Mardegan <mardy@users.sourceforge.net>2013-04-01 23:03:47 +0300
committerGravatar Alberto Mardegan <mardy@users.sourceforge.net>2013-04-01 23:07:47 +0300
commitb5b14f1d95b0362a13fa3f11ac3f334012750099 (patch)
treea38d0d27ab85d7cce5bc9cebba10e39813624f6c /Makefile
parentf2ab8f42ee5bbbe643b4810bf663d4f58835644b (diff)
downloadsubsurface-b5b14f1d95b0362a13fa3f11ac3f334012750099.tar.gz
Define QT_NO_KEYWORDS
This prevents Qt headers from defining macro symbols such as "emit" and "signals", therefore avoiding conflicts when struct members with the same names are defined in some C header. Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a9da8dd1a..aeb3cca0f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION=3.0.2
CC=gcc
CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
CXX=g++
-CXXFLAGS=-Wall -g $(CLCFLAGS)
+CXXFLAGS=-Wall -g $(CLCFLAGS) -DQT_NO_KEYWORDS
INSTALL=install
PKGCONFIG=pkg-config
XML2CONFIG=xml2-config