diff options
| author | manuel <manuel@clan-server.at> | 2009-04-28 19:45:59 +0200 |
|---|---|---|
| committer | manuel <manuel@clan-server.at> | 2009-04-28 19:45:59 +0200 |
| commit | b0aaa12c49d6348877fd1eefb191790f1aa2a2a6 (patch) | |
| tree | 5301e94d27fb621bad04941542f469160c4081af /ue2/imgsynth2 | |
| parent | 88a84e3bc371d1b1b3533143658ad192476c59ab (diff) | |
| parent | 5c6c845ce51abe9bd4129fa5eb8cdec26d861556 (diff) | |
| download | ooprog-b0aaa12c49d6348877fd1eefb191790f1aa2a2a6.tar.gz ooprog-b0aaa12c49d6348877fd1eefb191790f1aa2a2a6.tar.bz2 ooprog-b0aaa12c49d6348877fd1eefb191790f1aa2a2a6.zip | |
nicer Makefile
Diffstat (limited to 'ue2/imgsynth2')
| -rw-r--r-- | ue2/imgsynth2/Makefile | 11 |
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 @@ | |||
| 2 | # Author: Guenther Neuwirth (0626638), Manuel Mausz (0728348) | 2 | # Author: Guenther Neuwirth (0626638), Manuel Mausz (0728348) |
| 3 | # Created: 26.04.2009 | 3 | # Created: 26.04.2009 |
| 4 | 4 | ||
| 5 | CC= g++ | 5 | CXX= g++ |
| 6 | LD= $(CC) | 6 | LD= $(CXX) |
| 7 | DEBUGFLAGS= -DNDEBUG | 7 | DEBUGFLAGS= -DNDEBUG |
| 8 | <<<<<<< local | ||
| 9 | INCLUDE_PATH= -I/usr/local/include | ||
| 10 | CXXFLAGS= -O -ansi -pedantic-errors -Wall $(INCLUDE_PATH) $(DEBUGFLAGS) | ||
| 11 | ======= | ||
| 8 | CFLAGS= -O -ansi -pedantic-errors -Wall -I/usr/local/include $(DEBUGFLAGS) | 12 | CFLAGS= -O -ansi -pedantic-errors -Wall -I/usr/local/include $(DEBUGFLAGS) |
| 13 | >>>>>>> other | ||
| 9 | LDFLAGS= | 14 | LDFLAGS= |
| 10 | LIBS= -L/usr/local/lib -lboost_program_options | 15 | LIBS= -L/usr/local/lib -lboost_program_options |
| 11 | 16 | ||
| @@ -20,7 +25,7 @@ HEADERS= cpixelformat.h cpixelformat_bgr24.h cpixelformat_bgr555.h \ | |||
| 20 | all: $(BIN) | 25 | all: $(BIN) |
| 21 | 26 | ||
| 22 | .cpp.o: | 27 | .cpp.o: |
| 23 | $(CC) $(CFLAGS) -c $< -o $@ | 28 | $(CXX) $(CXXFLAGS) -c $< -o $@ |
| 24 | 29 | ||
| 25 | $(OBJS): $(HEADERS) | 30 | $(OBJS): $(HEADERS) |
| 26 | 31 | ||