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 +++++++------- chl.bmp | Bin 921654 -> 0 bytes htp1.bmp | Bin 921738 -> 0 bytes htp2.bmp | Bin 921738 -> 0 bytes icon.bmp | Bin 3126 -> 0 bytes pointer.bmp | Bin 2038 -> 0 bytes resources.h | 21 +++++++++++---------- resources/chl.bmp | Bin 0 -> 921654 bytes resources/htp1.bmp | Bin 0 -> 921738 bytes resources/htp2.bmp | Bin 0 -> 921738 bytes resources/icon.bmp | Bin 0 -> 3126 bytes resources/pointer.bmp | Bin 0 -> 2038 bytes resources/title.bmp | Bin 0 -> 921654 bytes title.bmp | Bin 921654 -> 0 bytes 14 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 chl.bmp delete mode 100644 htp1.bmp delete mode 100644 htp2.bmp delete mode 100644 icon.bmp delete mode 100644 pointer.bmp create mode 100644 resources/chl.bmp create mode 100644 resources/htp1.bmp create mode 100644 resources/htp2.bmp create mode 100644 resources/icon.bmp create mode 100644 resources/pointer.bmp create mode 100644 resources/title.bmp delete mode 100644 title.bmp 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 $? $@ diff --git a/chl.bmp b/chl.bmp deleted file mode 100644 index b69efd0..0000000 Binary files a/chl.bmp and /dev/null differ diff --git a/htp1.bmp b/htp1.bmp deleted file mode 100644 index df06101..0000000 Binary files a/htp1.bmp and /dev/null differ diff --git a/htp2.bmp b/htp2.bmp deleted file mode 100644 index 5dcb4c4..0000000 Binary files a/htp2.bmp and /dev/null differ diff --git a/icon.bmp b/icon.bmp deleted file mode 100644 index 024cea5..0000000 Binary files a/icon.bmp and /dev/null differ diff --git a/pointer.bmp b/pointer.bmp deleted file mode 100644 index e1cee4e..0000000 Binary files a/pointer.bmp and /dev/null differ diff --git a/resources.h b/resources.h index dd18ffe..fc9229a 100644 --- a/resources.h +++ b/resources.h @@ -2,18 +2,19 @@ #define RESOURCES_H #ifdef WINDOWS -#define LOADIMAGE(var,title) SDL_RWops * title ## _rw = SDL_RWFromMem(&binary_ ## title ## _bmp_start, (int) &binary_ ## title ## _bmp_size); var = SDL_LoadBMP_RW( title ## _rw, 1); -#define DEFIMAGE(title) extern int* binary_ ## title ## _bmp_start; extern int* binary_ ## title ## _bmp_size; +#define RESNAME(title,part) binary_resources_ ## title ## _ ## part #else -#define LOADIMAGE(var,title) SDL_RWops * title ## _rw = SDL_RWFromMem(&_binary_ ## title ## _bmp_start, (int) &_binary_ ## title ## _bmp_size); var = SDL_LoadBMP_RW( title ## _rw, 1); -#define DEFIMAGE(title) extern int* _binary_ ## title ## _bmp_start; extern int* _binary_ ## title ## _bmp_size; +#define RESNAME(title,part) _binary_resources_ ## title ## _ ## part #endif -DEFIMAGE(icon) -DEFIMAGE(title) -DEFIMAGE(pointer) -DEFIMAGE(htp1) -DEFIMAGE(htp2) -DEFIMAGE(chl) +#define DEFRES(title) extern int* RESNAME(title,start); extern int* RESNAME(title,size); +#define LOADIMAGE(var,title) SDL_RWops * title ## _rw = SDL_RWFromMem(&RESNAME(title ## _bmp,start), (int) &RESNAME(title ## _bmp,size)); var = SDL_LoadBMP_RW( title ## _rw, 1); + +DEFRES(icon_bmp) +DEFRES(title_bmp) +DEFRES(pointer_bmp) +DEFRES(htp1_bmp) +DEFRES(htp2_bmp) +DEFRES(chl_bmp) #endif diff --git a/resources/chl.bmp b/resources/chl.bmp new file mode 100644 index 0000000..b69efd0 Binary files /dev/null and b/resources/chl.bmp differ diff --git a/resources/htp1.bmp b/resources/htp1.bmp new file mode 100644 index 0000000..df06101 Binary files /dev/null and b/resources/htp1.bmp differ diff --git a/resources/htp2.bmp b/resources/htp2.bmp new file mode 100644 index 0000000..5dcb4c4 Binary files /dev/null and b/resources/htp2.bmp differ diff --git a/resources/icon.bmp b/resources/icon.bmp new file mode 100644 index 0000000..024cea5 Binary files /dev/null and b/resources/icon.bmp differ diff --git a/resources/pointer.bmp b/resources/pointer.bmp new file mode 100644 index 0000000..e1cee4e Binary files /dev/null and b/resources/pointer.bmp differ diff --git a/resources/title.bmp b/resources/title.bmp new file mode 100644 index 0000000..ae0b624 Binary files /dev/null and b/resources/title.bmp differ diff --git a/title.bmp b/title.bmp deleted file mode 100644 index ae0b624..0000000 Binary files a/title.bmp and /dev/null differ -- cgit 1.4.1