From a157cd82a86390f1fcb1a2086f86af5187e85a69 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 17 Oct 2009 13:46:41 -0400 Subject: 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 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e44f590..9bad9b2 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ HEADERS = $(wildcard *.h) MODULES = $(patsubst %.cpp,%,$(FILES)) SOURCES = $(addsuffix .o,$(MODULES)) WINSRC = $(addsuffix win,$(SOURCES)) -IMAGES = $(wildcard *.bmp) -CIMAGES = $(addprefix build/,$(IMAGES:.bmp=.bmp.o)) +RES = $(wildcard resources/*) +CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES))) LINCCFL = `sdl-config --cflags` LINLDFL = `sdl-config --libs` WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS @@ -26,14 +26,14 @@ init: clean: rm -rdfv build -$(LTARGET): $(SOURCES) $(CIMAGES) - $(CC) $(SOURCES) $(CIMAGES) -o $(LTARGET) $(LINLDFL) +$(LTARGET): $(SOURCES) $(CRES) + $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL) $(SOURCES): build/%.o: %.cpp $(HEADERS) $(CC) -c $< -o $@ $(LINCCFL) -$(WTARGET): $(WINSRC) $(CIMAGES) build/winres.o - $(WINCC) $(WINSRC) $(CIMAGES) build/winres.o -o $(WTARGET) $(WINLDFL) +$(WTARGET): $(WINSRC) $(CRES) build/winres.o + $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL) $(WINSRC): build/%.owin: %.cpp $(HEADERS) $(WINCC) -c $< -o $@ $(WINCCFL) @@ -41,5 +41,5 @@ $(WINSRC): build/%.owin: %.cpp $(HEADERS) build/winres.o: winres.rc $(WINDRES) $? $@ -$(CIMAGES): build/%.bmp.o: %.bmp +$(CRES): build/%.o: resources/% objcopy --input binary --output elf32-i386 -B i386 $? $@ -- cgit 1.4.1