diff options
Diffstat (limited to 'ue2')
| -rw-r--r-- | ue2/imgsynth2/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
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 @@ | |||
| 5 | CXX= g++ | 5 | CXX= g++ |
| 6 | LD= $(CXX) | 6 | LD= $(CXX) |
| 7 | DEBUGFLAGS= -DNDEBUG | 7 | DEBUGFLAGS= -DNDEBUG |
| 8 | <<<<<<< local | ||
| 9 | INCLUDE_PATH= -I/usr/local/include | 8 | INCLUDE_PATH= -I/usr/local/include |
| 10 | CXXFLAGS= -O -ansi -pedantic-errors -Wall $(INCLUDE_PATH) $(DEBUGFLAGS) | 9 | CXXFLAGS= -O -ansi -pedantic-errors -Wall $(INCLUDE_PATH) $(DEBUGFLAGS) |
| 11 | ======= | ||
| 12 | CFLAGS= -O -ansi -pedantic-errors -Wall -I/usr/local/include $(DEBUGFLAGS) | ||
| 13 | >>>>>>> other | ||
| 14 | LDFLAGS= | 10 | LDFLAGS= |
| 15 | LIBS= -L/usr/local/lib -lboost_program_options | 11 | LIBS= -L/usr/local/lib -lboost_program_options |
| 16 | 12 | ||