summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.defaults3
-rw-r--r--beos/Makefile.target10
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.defaults b/Makefile.defaults
index 97793318d..45a3a2067 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -94,6 +94,9 @@ NETSURF_FS_BACKING_STORE := NO
# Initial CFLAGS. Optimisation level etc. tend to be target specific.
CFLAGS :=
+# Initial CXXFLAGS. Optimisation level etc. tend to be target specific.
+CXXFLAGS :=
+
# Default installation/execution prefix
PREFIX ?= /usr/local
diff --git a/beos/Makefile.target b/beos/Makefile.target
index f8f329266..9a57b41cb 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -2,7 +2,6 @@
# BeOS target setup
# ----------------------------------------------------------------------------
-
$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
@@ -36,6 +35,10 @@ ifeq ($(HOST),beos)
-I/boot/home/config/include/hubbub \
-I/boot/home/config/include/libcss \
-I/boot/home/config/include/parserutils
+ CXXFLAGS += -I/boot/home/config/include \
+ -I/boot/home/config/include/hubbub \
+ -I/boot/home/config/include/libcss \
+ -I/boot/home/config/include/parserutils
ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
LDFLAGS += -lzeta
endif
@@ -45,6 +48,10 @@ ifeq ($(HOST),beos)
-I/boot/common/include/hubbub \
-I/boot/common/include/libcss \
-I/boot/common/include/parserutils
+ CXXFLAGS += -I/boot/common/include \
+ -I/boot/common/include/hubbub \
+ -I/boot/common/include/libcss \
+ -I/boot/common/include/parserutils
NETLDFLAGS := -lnetwork
else
ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)
@@ -69,6 +76,7 @@ endif
ifeq ($(HOST),beos)
CFLAGS += -I$(PREFIX)/include
+ CXXFLAGS += -I$(PREFIX)/include
LDFLAGS += -L$(PREFIX)/lib
$(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))