diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2009-10-17 13:46:41 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2009-10-17 13:46:41 -0400 |
commit | a157cd82a86390f1fcb1a2086f86af5187e85a69 (patch) | |
tree | a6ffa353c2e8db14a320d02f7ebdc3ed39176f84 /Makefile | |
parent | f2ab9f3f0d5fe1ad19881b7dba79b31e3673748a (diff) | |
download | mazeoflife-a157cd82a86390f1fcb1a2086f86af5187e85a69.tar.gz mazeoflife-a157cd82a86390f1fcb1a2086f86af5187e85a69.tar.bz2 mazeoflife-a157cd82a86390f1fcb1a2086f86af5187e85a69.zip |
Moved resources into subdirectory
Because Highscore List rendering requires a font and the font has to be included with the executable to work, it will be loaded into the executable like the images are. To make sure that all resources are included, regardless of type, a folder was made for them. Refs #104
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile index e44f590..9bad9b2 100644 --- a/Makefile +++ b/Makefile | |||
@@ -9,8 +9,8 @@ HEADERS = $(wildcard *.h) | |||
9 | MODULES = $(patsubst %.cpp,%,$(FILES)) | 9 | MODULES = $(patsubst %.cpp,%,$(FILES)) |
10 | SOURCES = $(addsuffix .o,$(MODULES)) | 10 | SOURCES = $(addsuffix .o,$(MODULES)) |
11 | WINSRC = $(addsuffix win,$(SOURCES)) | 11 | WINSRC = $(addsuffix win,$(SOURCES)) |
12 | IMAGES = $(wildcard *.bmp) | 12 | RES = $(wildcard resources/*) |
13 | CIMAGES = $(addprefix build/,$(IMAGES:.bmp=.bmp.o)) | 13 | CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES))) |
14 | LINCCFL = `sdl-config --cflags` | 14 | LINCCFL = `sdl-config --cflags` |
15 | LINLDFL = `sdl-config --libs` | 15 | LINLDFL = `sdl-config --libs` |
16 | WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS | 16 | WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS |
@@ -26,14 +26,14 @@ init: | |||
26 | clean: | 26 | clean: |
27 | rm -rdfv build | 27 | rm -rdfv build |
28 | 28 | ||
29 | $(LTARGET): $(SOURCES) $(CIMAGES) | 29 | $(LTARGET): $(SOURCES) $(CRES) |
30 | $(CC) $(SOURCES) $(CIMAGES) -o $(LTARGET) $(LINLDFL) | 30 | $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL) |
31 | 31 | ||
32 | $(SOURCES): build/%.o: %.cpp $(HEADERS) | 32 | $(SOURCES): build/%.o: %.cpp $(HEADERS) |
33 | $(CC) -c $< -o $@ $(LINCCFL) | 33 | $(CC) -c $< -o $@ $(LINCCFL) |
34 | 34 | ||
35 | $(WTARGET): $(WINSRC) $(CIMAGES) build/winres.o | 35 | $(WTARGET): $(WINSRC) $(CRES) build/winres.o |
36 | $(WINCC) $(WINSRC) $(CIMAGES) build/winres.o -o $(WTARGET) $(WINLDFL) | 36 | $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL) |
37 | 37 | ||
38 | $(WINSRC): build/%.owin: %.cpp $(HEADERS) | 38 | $(WINSRC): build/%.owin: %.cpp $(HEADERS) |
39 | $(WINCC) -c $< -o $@ $(WINCCFL) | 39 | $(WINCC) -c $< -o $@ $(WINCCFL) |
@@ -41,5 +41,5 @@ $(WINSRC): build/%.owin: %.cpp $(HEADERS) | |||
41 | build/winres.o: winres.rc | 41 | build/winres.o: winres.rc |
42 | $(WINDRES) $? $@ | 42 | $(WINDRES) $? $@ |
43 | 43 | ||
44 | $(CIMAGES): build/%.bmp.o: %.bmp | 44 | $(CRES): build/%.o: resources/% |
45 | objcopy --input binary --output elf32-i386 -B i386 $? $@ | 45 | objcopy --input binary --output elf32-i386 -B i386 $? $@ |