Index: Makefile --- Makefile.orig +++ Makefile @@ -10,13 +10,13 @@ ICON_FILES := mandel_icon.pix CXX := g++ -DEFS := -Wall -ansi -pedantic -D_REENTRANT -D_GNU_SOURCE +DEFS := -Wall -ansi -Wno-mismatched-tags -D_REENTRANT -D_GNU_SOURCE DEFS := $(shell pkg-config --cflags gtk+-2.0 libpng) $(DEFS) CXXFLAGS := $(DEFS) -O2 -fomit-frame-pointer -ffast-math #CXXFLAGS := $(DEFS) -g -LDFLAGS := -lz -lpthread -lboost_regex -lboost_filesystem +LDFLAGS := -lz -lpthread -lboost_regex -lboost_filesystem -lboost_system LDFLAGS := $(shell pkg-config --libs gtk+-2.0 libpng) $(LDFLAGS) HEADERS := $(wildcard *.h) @@ -24,11 +24,11 @@ PALETTES := $(wildcard palettes/*.map) $(GTK_FRONTEND): $(GTK_FRONTEND_OBJS) @echo Linking $(GTK_FRONTEND) - @$(CXX) $(CXXFLAGS) $(GTK_FRONTEND_OBJS) $(LDFLAGS) -o $(GTK_FRONTEND) + $(CXX) $(CXXFLAGS) $(DEFS) $(GTK_FRONTEND_OBJS) $(LDFLAGS) -o $(GTK_FRONTEND) %.o: %.cpp $(HEADERS) Makefile @echo Compiling $< - @$(CXX) $(CXXFLAGS) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(DEFS) -c $< -o $@ palettes.cpp: make_palettes.py $(PALETTES) ./make_palettes.py