1 files changed, 11 insertions, 10 deletions
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 RESNAME(title,part) binary_resources_ ## title ## _ ## part
-#define DEFIMAGE(title) extern int* binary_ ## title ## _bmp_start; extern int* binary_ ## title ## _bmp_size;
 #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 RESNAME(title,part) _binary_resources_ ## title ## _ ## part
-#define DEFIMAGE(title) extern int* _binary_ ## title ## _bmp_start; extern int* _binary_ ## title ## _bmp_size;
 #endif
-DEFIMAGE(icon)
+#define DEFRES(title) extern int* RESNAME(title,start); extern int* RESNAME(title,size);
-DEFIMAGE(title)
+#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);
-DEFIMAGE(pointer)
-DEFIMAGE(htp1)
+DEFRES(icon_bmp)
-DEFIMAGE(htp2)
+DEFRES(title_bmp)
-DEFIMAGE(chl)
+DEFRES(pointer_bmp)
+DEFRES(htp1_bmp)
+DEFRES(htp2_bmp)
+DEFRES(chl_bmp)
 #endif

diff --git a/resources.h b/resources.h index dd18ffe..fc9229a 100644 --- a/resources.h +++ b/resources.h
@@ -2,18 +2,19 @@
2	#define RESOURCES_H	2	#define RESOURCES_H
3		3
4	#ifdef WINDOWS	4	#ifdef WINDOWS
5	#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);	5	#define RESNAME(title,part) binary_resources_ ## title ## _ ## part
6	#define DEFIMAGE(title) extern int* binary_ ## title ## _bmp_start; extern int* binary_ ## title ## _bmp_size;
7	#else	6	#else
8	#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);	7	#define RESNAME(title,part) _binary_resources_ ## title ## _ ## part
9	#define DEFIMAGE(title) extern int* _binary_ ## title ## _bmp_start; extern int* _binary_ ## title ## _bmp_size;
10	#endif	8	#endif
11		9
12	DEFIMAGE(icon)	10	#define DEFRES(title) extern int* RESNAME(title,start); extern int* RESNAME(title,size);
13	DEFIMAGE(title)	11	#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);
14	DEFIMAGE(pointer)	12
15	DEFIMAGE(htp1)	13	DEFRES(icon_bmp)
16	DEFIMAGE(htp2)	14	DEFRES(title_bmp)
17	DEFIMAGE(chl)	15	DEFRES(pointer_bmp)
		16	DEFRES(htp1_bmp)
		17	DEFRES(htp2_bmp)
		18	DEFRES(chl_bmp)
18		19
19	#endif	20	#endif