25 lines
828 B
Text
25 lines
828 B
Text
$NetBSD: patch-ai,v 1.5 2015/03/31 15:51:11 joerg Exp $
|
|
|
|
* Pass DO_ICONV_CAST
|
|
|
|
--- makefiles/arch/desktop.mk.orig 2012-11-30 12:41:25.000000000 +0000
|
|
+++ makefiles/arch/desktop.mk
|
|
@@ -12,8 +12,7 @@ CC = $(CCACHE) gcc
|
|
AR = ar rsu
|
|
LD = g++
|
|
|
|
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
|
|
-LDFLAGS =
|
|
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG ${CPPFLAGS}
|
|
EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
|
|
|
|
ifeq "$(UI_TYPE)" "qt"
|
|
@@ -21,7 +20,7 @@ ifeq "$(UI_TYPE)" "qt"
|
|
QTINCLUDE = -I /usr/include/qt3
|
|
else
|
|
MOC = $(shell pkg-config QtCore --variable=moc_location)
|
|
- QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
|
|
+ QTINCLUDE = $(shell pkg-config --cflags QtCore)
|
|
endif
|
|
|
|
GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
|