diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-09-05 16:01:44 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-09-05 16:01:44 +0100 |
| commit | 4f530a3f8fff035006e2c9afbcfd233cd38a499a (patch) | |
| tree | db356c0ef1c02bf0476213e6927bd0e579c4a62d /beos | |
| parent | ef5b2340809ca61b4ffd87d864fec8f40ea43120 (diff) | |
| download | netsurf-4f530a3f8fff035006e2c9afbcfd233cd38a499a.tar.gz netsurf-4f530a3f8fff035006e2c9afbcfd233cd38a499a.tar.bz2 | |
Pull warning flags out into variables that can be overriden seperately for C and C++
Diffstat (limited to 'beos')
| -rw-r--r-- | beos/Makefile.target | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target index bbeb0be22..f8f329266 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -4,21 +4,21 @@ $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) +$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) +# Linker flags LDFLAGS += -L/boot/home/config/lib # for Haiku LDFLAGS += -L/boot/common/lib -# some people do *not* have libm... LDFLAGS += -lssl -lcrypto -lcss -$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet LDFLAGS += -lexpat -lcurl -CFLAGS += -O $(WARNFLAGS) -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE \ - -Drestrict="" -Wno-multichar -# DEBUG -CFLAGS += -g -O0 -# -DDEBUG=1 +COMMON_WARNFLAGS += -Wno-multichar + +# compiler flags +CFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g -O0 +CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g -O0 BEOS_BERES := beres BEOS_RC := rc @@ -30,38 +30,40 @@ VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/ver VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) RESOURCES = $(RSRC_BEOS) + ifeq ($(HOST),beos) - CFLAGS += -I/boot/home/config/include \ + CFLAGS += -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 - ifneq ($(wildcard /boot/system/develop/lib/*/libnetwork.so),) + ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),) + LDFLAGS += -lzeta + endif + ifneq ($(wildcard /boot/system/develop/lib/*/libnetwork.so),) # Haiku CFLAGS += -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),) + else + ifneq ($(wildcard /boot/develop/lib/*/libbind.so),) # BONE NETLDFLAGS := -lsocket -lbind - else + else # net_server, will probably never work NETLDFLAGS := -lnet - endif endif - else + endif +else # cross: Haiku ? NETLDFLAGS := -lnetwork - endif - LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS) - ifeq ($(CC_MAJOR),2) +endif + +LDFLAGS += -lbe -ltranslation -ltracker $(NETLDFLAGS) +ifeq ($(CC_MAJOR),2) LDFLAGS += -lstdc++.r4 - else +else LDFLAGS += -lstdc++ -lsupc++ endif |