12 files changed, 26 insertions, 51 deletions

@@ -1 +1,2 @@
 build
+.DS_Store
@@ -10,8 +10,8 @@ MODULES = $(patsubst %.cpp,%,$(FILES))
 SOURCES = $(addsuffix .o,$(MODULES))
 WINSRC  = $(addsuffix win,$(SOURCES))
 RES     = $(wildcard resources/*)
-CRES    = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES)))
-LINCCFL = `sdl-config --cflags`
+CRES    = $(patsubst resources/%,build/%,$(RES))
+LINCCFL = `sdl-config --cflags` -I/usr/local/Cellar/sdl_net/1.2.8/include/SDL/ -I/usr/local/Cellar/sdl_ttf/2.0.11/include/SDL/
 LINLDFL = `sdl-config --libs` -lSDL_ttf -lSDL_net
 WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS
 WINLDFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --libs` -lSDL_ttf -lSDL_net
@@ -27,13 +27,13 @@ clean:
         rm -rdfv build
 
 $(LTARGET): $(SOURCES) $(CRES)
-        $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL)
+        $(CC) $(SOURCES) -o $(LTARGET) $(LINLDFL)
 
 $(SOURCES): build/%.o: %.cpp $(HEADERS)
         $(CC) -c $< -o $@ $(LINCCFL)
 
 $(WTARGET): $(WINSRC) $(CRES) build/winres.o
-        $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL)
+        $(WINCC) $(WINSRC) 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) $? $@
 
-$(CRES): build/%.o: resources/%
-        objcopy --input binary --output elf32-i386 -B i386 $? $@
+$(CRES): build/%: resources/%
+        cp $? $@
@@ -2,8 +2,8 @@
 
 ChooseHighscoreListState::ChooseHighscoreListState()
 {
-        LOADIMAGE(background,chl)
-        LOADIMAGE(pointer,pointer)
+        background = SDL_LoadBMP("chl.bmp");
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         selection = 0;
 }
@@ -2,8 +2,8 @@
 
 GlobalHighscoreListState::GlobalHighscoreListState()
 {
-        LOADIMAGE(options,hlo_rtm)
-        LOADIMAGE(pointer,pointer)
+        options = SDL_LoadBMP("hlo_rtm.bmp");
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         list = SDL_CreateRGBSurface(SDL_SWSURFACE || SDL_SRCCOLORKEY, 480, 480, 32, 0,0,0,0);
         Uint32 bgColor = SDL_MapRGB(list->format, 255, 255, 255);
@@ -6,12 +6,12 @@ LocalHighscoreListState::LocalHighscoreListState(bool fromGame)
 
         if (fromGame)
         {
-                LOADIMAGE(options,hlo_paartm)
+                options = SDL_LoadBMP("hlo_paartm.bmp");
         } else {
-                LOADIMAGE(options,hlo_rtm)
+                options = SDL_LoadBMP("hlo_rtm.bmp");
         }
 
-        LOADIMAGE(pointer,pointer)
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         LocalHighscoreList* lhl = new LocalHighscoreList();
         list = lhl->render();
@@ -4,8 +4,8 @@ NewHighscoreState::NewHighscoreState(int level)
 {
         this->level = level;
 
-        LOADIMAGE(options,hlo_passartm)
-        LOADIMAGE(pointer,pointer)
+        options = SDL_LoadBMP("hlo_passartm.bmp");
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         lhl = new NewHighscoreList(level);
         newpos = lhl->getNewPos();
@@ -2,7 +2,7 @@
 
 SubmitHighscoreListState::SubmitHighscoreListState(char* hsname, int level)
 {
-        LOADIMAGE(pointer,pointer)
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         this->hsname = hsname;
         this->level = level;
@@ -38,9 +38,9 @@ int SubmitHighscoreListState::LoadHighscoreList(void* pParam)
 
         if (lhl->hasFailed())
         {
-                LOADIMAGE(((SubmitHighscoreListState*)pParam)->options,hlo_passartm)
+                ((SubmitHighscoreListState*)pParam)->options = SDL_LoadBMP("hlo_passartm.bmp");
         } else {
-                LOADIMAGE(((SubmitHighscoreListState*)pParam)->options,hlo_paartm)
+                ((SubmitHighscoreListState*)pParam)->options = SDL_LoadBMP("hlo_paartm.bmp");
         }
 
         SDL_Rect oSpace = {0, 440, ((SubmitHighscoreListState*)pParam)->options->w, ((SubmitHighscoreListState*)pParam)->options->h};
@@ -2,9 +2,9 @@
 
 HowToPlayState::HowToPlayState()
 {
-        LOADIMAGE(background1,htp1)
-        LOADIMAGE(background2,htp2)
-        LOADIMAGE(pointer,pointer)
+        background1 = SDL_LoadBMP("htp1.bmp");
+        background2 = SDL_LoadBMP("htp2.bmp");
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         secondPage = false;
         selection = 0;
@@ -11,7 +11,6 @@
 #include <exception>
 #include "state.h"
 #include "mazeoflife.h"
-#include "resources.h"
 #include "titlestate.h"
 #include "htpstate.h"
 #include "chlstate.h"
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
         SDL_WM_SetCaption("Maze Of Life", NULL);
 
         SDL_Surface* icon;
-        LOADIMAGE(icon,icon)
+        icon = SDL_LoadBMP("icon.bmp");
         SDL_WM_SetIcon(icon, NULL);
 
         /*
@@ -118,8 +118,7 @@ Uint32 tick(Uint32 interval, void *param)
 
 TTF_Font* loadFont(int size)
 {
-        SDL_RWops* mono_rw = SDL_RWFromMem(&RESNAME(mono_ttf,start), (int) &RESNAME(mono_ttf,size));
-        TTF_Font* tmpfont = TTF_OpenFontRW(mono_rw, 1, size);
+        TTF_Font* tmpfont = TTF_OpenFont("mono.ttf", size);
 
         if (tmpfont == NULL)
         {
@@ -1,24 +0,0 @@
-#ifndef RESOURCES_H
-#define RESOURCES_H
-
-#ifdef WINDOWS
-#define RESNAME(title,part) binary_resources_ ## title ## _ ## part
-#else
-#define RESNAME(title,part) _binary_resources_ ## title ## _ ## part
-#endif
-
-#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)
-DEFRES(hlo_rtm_bmp)
-DEFRES(hlo_paartm_bmp)
-DEFRES(hlo_passartm_bmp)
-DEFRES(mono_ttf)
-
-#endif
@@ -2,8 +2,8 @@
 
 TitleState::TitleState()
 {
-        LOADIMAGE(background,title)
-        LOADIMAGE(pointer,pointer)
+        background = SDL_LoadBMP("title.bmp");
+        pointer = SDL_LoadBMP("pointer.bmp");
 
         selection = 0;
 }