1 files changed, 8 insertions, 3 deletions

diff --git a/ue2/imgsynth2/Makefile b/ue2/imgsynth2/Makefile
index 376abac..3183b54 100644
--- a/ue2/imgsynth2/Makefile
+++ b/ue2/imgsynth2/Makefile
@@ -2,10 +2,15 @@
 # Author:       Guenther Neuwirth (0626638), Manuel Mausz (0728348)
 # Created:      26.04.2009
 
-CC=             g++
-LD=             $(CC)
+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
 
@@ -20,7 +25,7 @@ HEADERS=	cpixelformat.h cpixelformat_bgr24.h cpixelformat_bgr555.h \
 all: $(BIN)
 
 .cpp.o:
-        $(CC) $(CFLAGS) -c $< -o $@
+        $(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(OBJS): $(HEADERS)