5 files changed, 48 insertions, 11 deletions

@@ -1,12 +1,15 @@
-OBJS = mazeoflife.o titlestate.o htpstate.o gamestate.o
+SOURCES = mazeoflife.cpp titlestate.cpp htpstate.cpp gamestate.cpp
+OBJS = $(SOURCES:.cpp=.cpp.o)
+IMAGES = title.bmp pointer.bmp htp1.bmp htp2.bmp
+CIMAGES = $(IMAGES:.bmp=.bmp.o)
 CC = g++
 CFLAGS = `pkg-config sdl --cflags`
 LIBS = `pkg-config sdl --libs`
 
-mazeoflife: $(OBJS)
-        $(CC) $(OBJS) $(LIBS) -o mazeoflife
+mazeoflife: $(OBJS) $(CIMAGES)
+        $(CC) $(OBJS) $(CIMAGES) $(LIBS) -o mazeoflife
 
-%.o: %.cpp
+%.cpp.o: %.cpp
         $(CC) -c $< $(CFLAGS) -o $@
 
 %.d: %.cpp
@@ -15,7 +18,10 @@ mazeoflife: $(OBJS)
         sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
         rm -f $@.$$$$
 
-include $(OBJS:.o=.d)
+%.bmp.o: %.bmp
+        objcopy --input binary --output elf32-i386 -B i386 $< $@
+
+include $(OBJS:.cpp.o=.d)
 
 clean:
-        rm -rdfv $(OBJS) $(OBJS:.o=.d) mazeoflife
+        rm -rdfv $(OBJS) $(OBJS:.cpp.o=.d) $(CIMAGES) mazeoflife
@@ -2,9 +2,15 @@
 
 HowToPlayState::HowToPlayState()
 {
-        background1 = SDL_LoadBMP("htp1.bmp");
-        background2 = SDL_LoadBMP("htp2.bmp");
-        pointer = SDL_LoadBMP("pointer.bmp");
+        SDL_RWops *rw = SDL_RWFromMem(&_binary_htp1_bmp_start, (int) &_binary_htp1_bmp_size);
+        background1 = SDL_LoadBMP_RW(rw, 1);
+
+        rw = SDL_RWFromMem(&_binary_htp2_bmp_start, (int) &_binary_htp2_bmp_size);
+        background2 = SDL_LoadBMP_RW(rw, 1);
+
+        rw = SDL_RWFromMem(&_binary_pointer_bmp_start, (int) &_binary_pointer_bmp_size);
+        pointer = SDL_LoadBMP_RW(rw, 1);
+
         secondPage = false;
         selection = 0;
 
@@ -4,6 +4,7 @@
 #include <string>
 #include "state.h"
 #include "mazeoflife.h"
+#include "resources.h"
 #include "titlestate.h"
 #include "htpstate.h"
 #include "gamestate.h"
@@ -0,0 +1,20 @@
+#ifndef RESOURCES_H
+#define RESOURCES_H
+
+// title.bmp
+extern int* _binary_title_bmp_start;
+extern int* _binary_title_bmp_size;
+
+// pointer.bmp
+extern int* _binary_pointer_bmp_start;
+extern int* _binary_pointer_bmp_size;
+
+// htp1.bmp
+extern int* _binary_htp1_bmp_start;
+extern int* _binary_htp1_bmp_size;
+
+// htp2.bmp
+extern int* _binary_htp2_bmp_start;
+extern int* _binary_htp2_bmp_size;
+
+#endif
@@ -2,8 +2,12 @@
 
 TitleState::TitleState()
 {
-        background = SDL_LoadBMP("title.bmp");
-        pointer = SDL_LoadBMP("pointer.bmp");
+        SDL_RWops *rw = SDL_RWFromMem(&_binary_title_bmp_start, (int) &_binary_title_bmp_size);
+        background = SDL_LoadBMP_RW(rw, 1);
+
+        rw = SDL_RWFromMem(&_binary_pointer_bmp_start, (int) &_binary_pointer_bmp_size);
+        pointer = SDL_LoadBMP_RW(rw, 1);
+
         selection = 0;
 
         SDL_WM_SetCaption("Maze Of Life", NULL);