From e1ad46101085cc7f8fd766936552b31d67188a15 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 28 Apr 2009 19:49:28 +0200 Subject: again... --- ue2/imgsynth2/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'ue2') diff --git a/ue2/imgsynth2/Makefile b/ue2/imgsynth2/Makefile index 3183b54..22e53e5 100644 --- a/ue2/imgsynth2/Makefile +++ b/ue2/imgsynth2/Makefile @@ -5,12 +5,8 @@ CXX= g++ LD= $(CXX) DEBUGFLAGS= -DNDEBUG -<<<<<<< local INCLUDE_PATH= -I/usr/local/include CXXFLAGS= -O -ansi -pedantic-errors -Wall $(INCLUDE_PATH) $(DEBUGFLAGS) -======= -CFLAGS= -O -ansi -pedantic-errors -Wall -I/usr/local/include $(DEBUGFLAGS) ->>>>>>> other LDFLAGS= LIBS= -L/usr/local/lib -lboost_program_options -- cgit v1.2.3