summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Makethird2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0f0c5b69..5379bf95 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ;
endif
CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
-CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
+CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS)) -o $@ -c $<
AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
diff --git a/Makethird b/Makethird
index fbc8b7f8..1dadf77a 100644
--- a/Makethird
+++ b/Makethird
@@ -164,7 +164,7 @@ HARFBUZZ_OBJ := $(addprefix $(HARFBUZZ_OUT)/, $(HARFBUZZ_SRC:%.cc=%.o))
$(HARFBUZZ_OUT):
$(MKDIR_CMD)
$(HARFBUZZ_OUT)/%.o: $(HARFBUZZ_DIR)/src/%.cc | $(HARFBUZZ_OUT)
- $(CC_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \
+ $(CXX_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \
-Dhb_malloc_impl=fz_hb_malloc -Dhb_calloc_impl=fz_hb_calloc \
-Dhb_free_impl=fz_hb_free -Dhb_realloc_impl=fz_hb_realloc \
-fno-rtti -fno-exceptions -fvisibility-inlines-hidden --std=c++0x