diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2009-06-22 17:08:47 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2009-06-22 17:08:47 -0400 |
commit | 71a493de351277cc61a36aee47501f64f76cca87 (patch) | |
tree | d19269490fe4d45eb763eacd02ad24f4363e6130 | |
parent | 131531314f87fbd18d52122356dc8f44884b7bac (diff) | |
download | mazeoflife-71a493de351277cc61a36aee47501f64f76cca87.tar.gz mazeoflife-71a493de351277cc61a36aee47501f64f76cca87.tar.bz2 mazeoflife-71a493de351277cc61a36aee47501f64f76cca87.zip |
Added Windows icon resource
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | icon.bmp | bin | 0 -> 3126 bytes | |||
-rw-r--r-- | icon.ico | bin | 0 -> 6766 bytes | |||
-rw-r--r-- | winres.rc | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile index e7429a5..4face93 100644 --- a/Makefile +++ b/Makefile | |||
@@ -3,6 +3,7 @@ LTARGET = build/$(PROJECT) | |||
3 | WTARGET = build/$(PROJECT).exe | 3 | WTARGET = build/$(PROJECT).exe |
4 | CC = g++ | 4 | CC = g++ |
5 | WINCC = i586-mingw32msvc-g++ | 5 | WINCC = i586-mingw32msvc-g++ |
6 | WINDRES = i586-mingw32msvc-windres | ||
6 | FILES = $(addprefix build/,$(wildcard *.cpp)) | 7 | FILES = $(addprefix build/,$(wildcard *.cpp)) |
7 | MODULES = $(patsubst %.cpp,%,$(FILES)) | 8 | MODULES = $(patsubst %.cpp,%,$(FILES)) |
8 | SOURCES = $(addsuffix .o,$(MODULES)) | 9 | SOURCES = $(addsuffix .o,$(MODULES)) |
@@ -30,11 +31,14 @@ $(LTARGET): $(SOURCES) $(CIMAGES) | |||
30 | $(SOURCES): build/%.o: %.cpp | 31 | $(SOURCES): build/%.o: %.cpp |
31 | $(CC) -c $? -o $@ $(LINCCFL) | 32 | $(CC) -c $? -o $@ $(LINCCFL) |
32 | 33 | ||
33 | $(WTARGET): $(WINSRC) $(CIMAGES) | 34 | $(WTARGET): $(WINSRC) $(CIMAGES) build/winres.o |
34 | $(WINCC) $(WINSRC) $(CIMAGES) -o $(WTARGET) $(WINLDFL) | 35 | $(WINCC) $(WINSRC) $(CIMAGES) build/winres.o -o $(WTARGET) $(WINLDFL) |
35 | 36 | ||
36 | $(WINSRC): build/%.owin: %.cpp | 37 | $(WINSRC): build/%.owin: %.cpp |
37 | $(WINCC) -c $? -o $@ $(WINCCFL) | 38 | $(WINCC) -c $? -o $@ $(WINCCFL) |
38 | 39 | ||
40 | build/winres.o: winres.rc | ||
41 | $(WINDRES) $? $@ | ||
42 | |||
39 | $(CIMAGES): build/%.bmp.o: %.bmp | 43 | $(CIMAGES): build/%.bmp.o: %.bmp |
40 | objcopy --input binary --output elf32-i386 -B i386 $? $@ | 44 | objcopy --input binary --output elf32-i386 -B i386 $? $@ |
diff --git a/icon.bmp b/icon.bmp new file mode 100644 index 0000000..024cea5 --- /dev/null +++ b/icon.bmp | |||
Binary files differ | |||
diff --git a/icon.ico b/icon.ico new file mode 100644 index 0000000..37e9db6 --- /dev/null +++ b/icon.ico | |||
Binary files differ | |||
diff --git a/winres.rc b/winres.rc new file mode 100644 index 0000000..1bc463a --- /dev/null +++ b/winres.rc | |||
@@ -0,0 +1 @@ | |||
IDI_ICON1 ICON DISCARDABLE "icon.ico" | |||