--- Makefile.orig 2010-03-23 19:52:15.000000000 +0300 +++ Makefile 2010-07-24 00:10:22.000000000 +0400 @@ -1,12 +1,9 @@ -#CXX = g++ -CXX = colorgcc -#CXXFLAGS = -ffunction-sections -fdata-sections -Wall -Os -fno-exceptions -fno-unwind-tables -fno-rtti -minline-all-stringops -ggdb -CXXFLAGS = -ffunction-sections -fdata-sections -Wall -Os -fno-exceptions -fno-unwind-tables -fno-rtti -minline-all-stringops -ggdb +CXXFLAGS += -Wall -fno-exceptions -fno-unwind-tables -fno-rtti -I${LOCALBASE}/include # -Weffc++ -U_FORTIFY_SOURCE # NDEBUG pro release ? -LDFLAGS = -Wl,--gc-sections -L/usr/X11R6/lib -LIBS = /usr/local/lib/libglfw.a -pthread -lGL -lm -lGLU -lX11 -lXrandr +LDFLAGS = -L${LOCALBASE}/lib +LIBS = ${LOCALBASE}/lib/libglfw.a ${PTHREAD_LIBS} -lGL -lm -lGLU -lX11 -lXrandr INCLUDES = FILE2C = utils/file2c.rb @@ -63,14 +60,4 @@ DEPDIR = .deps df = $(DEPDIR)/$(*F) -%.o : %.cpp - @$(MAKEDEPEND); \ - cp $(df).d $(df).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(df).d >> $(df).P; \ - rm -f $(df).d - $(COMPILE.cpp) -o $@ $< - --include $(SRCS:%.cpp=$(DEPDIR)/%.P) - # DO NOT DELETE