From 72bfbad90d3241fceb7941553b4dc69d576fa5e1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 6 Nov 2013 09:47:43 +0000 Subject: [PATCH] A few more fixes to allow building on Haiku again --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2d92cebab..4ccb97812 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,10 @@ else ifeq ($(SYSNAME),Haiku) OS:=beos GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf +STDC_LIB:=-lstdc++ +ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) +STDC_LIB:=-lstdc++.r4 +endif else OS:=linux GPERF:=/usr/bin/gperf @@ -90,7 +94,7 @@ FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi) windows_ARCH_LINKS:=-lintl $(PNG) -lzdll -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) -lstdc++" +beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) ARCH_LINKS:=$($(OS)_ARCH_LINKS)