diff options
| author | Günther Neuwirth <e0626638@student.tuwien.ac.at> | 2009-04-28 22:54:06 +0200 |
|---|---|---|
| committer | Günther Neuwirth <e0626638@student.tuwien.ac.at> | 2009-04-28 22:54:06 +0200 |
| commit | 4082834f82217514a48e6e00027e4027a673887e (patch) | |
| tree | 386fac6e167cb1de675b318664faaf262d12defb /ue2 | |
| parent | e1ad46101085cc7f8fd766936552b31d67188a15 (diff) | |
| download | ooprog-4082834f82217514a48e6e00027e4027a673887e.tar.gz ooprog-4082834f82217514a48e6e00027e4027a673887e.tar.bz2 ooprog-4082834f82217514a48e6e00027e4027a673887e.zip | |
Adding CPixMap handler to cscriptparser, adding cpixmap and cpixelformat_indexed8 to Makefile
Diffstat (limited to 'ue2')
| -rw-r--r-- | ue2/imgsynth2/Makefile | 6 | ||||
| -rw-r--r-- | ue2/imgsynth2/cscriptparser.cpp | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ue2/imgsynth2/Makefile b/ue2/imgsynth2/Makefile index 22e53e5..8c3079d 100644 --- a/ue2/imgsynth2/Makefile +++ b/ue2/imgsynth2/Makefile | |||
| @@ -12,9 +12,11 @@ LIBS= -L/usr/local/lib -lboost_program_options | |||
| 12 | 12 | ||
| 13 | BIN= imgsynth2 | 13 | BIN= imgsynth2 |
| 14 | OBJS= cpixelformat_bgr24.o cpixelformat_bgr555.o \ | 14 | OBJS= cpixelformat_bgr24.o cpixelformat_bgr555.o \ |
| 15 | cwindowsbitmap.o cbitmap.o cscriptparser.o imgsynth2.o | 15 | cpixelformat_indexed8.o cpixmap.o cwindowsbitmap.o \ |
| 16 | cbitmap.o cscriptparser.o imgsynth2.o | ||
| 16 | HEADERS= cpixelformat.h cpixelformat_bgr24.h cpixelformat_bgr555.h \ | 17 | HEADERS= cpixelformat.h cpixelformat_bgr24.h cpixelformat_bgr555.h \ |
| 17 | cfile.h cbitmap.h cwindowsbitmap.h cscriptparser.h | 18 | cpixelformat_indexed8.h cpixmap.h cfile.h cbitmap.h \ |
| 19 | cwindowsbitmap.h cscriptparser.h | ||
| 18 | 20 | ||
| 19 | .SUFFIXES: .cpp .o | 21 | .SUFFIXES: .cpp .o |
| 20 | 22 | ||
diff --git a/ue2/imgsynth2/cscriptparser.cpp b/ue2/imgsynth2/cscriptparser.cpp index ea9b242..da6aec5 100644 --- a/ue2/imgsynth2/cscriptparser.cpp +++ b/ue2/imgsynth2/cscriptparser.cpp | |||
| @@ -19,6 +19,7 @@ CScriptparser::CScriptparser(const std::string& scriptfile) | |||
| 19 | { | 19 | { |
| 20 | /* add our handlers */ | 20 | /* add our handlers */ |
| 21 | m_handlers.insert(new CWindowsBitmap); | 21 | m_handlers.insert(new CWindowsBitmap); |
| 22 | m_handlers.insert(new CPixMap); | ||
| 22 | } | 23 | } |
| 23 | 24 | ||
| 24 | /*----------------------------------------------------------------------------*/ | 25 | /*----------------------------------------------------------------------------*/ |
