From 7128ea3e64edf98a95501ca1700a3c761d5cca52 Mon Sep 17 00:00:00 2001
From: Jean-Michel Paris <jean_michel_paris@hotmail.fr>
Date: Mon, 6 Feb 2017 18:50:46 +0100
Subject: [PATCH] New folder name for resources

the folder for resources has been renamed from images to resources; to avoid the confusion with dsk images.
---
 src/Frame.cpp                           |   2 +-
 src/Makefile                            |   1 -
 src/Video.cpp                           |   4 ++--
 src/{images => resources}/charset40.bmp | Bin
 src/{images => resources}/font.bmp      | Bin
 src/{images => resources}/icon.bmp      | Bin
 src/{images => resources}/splash.bmp    | Bin
 src/stretch.cpp                         |   2 +-
 8 files changed, 4 insertions(+), 5 deletions(-)
 rename src/{images => resources}/charset40.bmp (100%)
 rename src/{images => resources}/font.bmp (100%)
 rename src/{images => resources}/icon.bmp (100%)
 rename src/{images => resources}/splash.bmp (100%)

diff --git a/src/Frame.cpp b/src/Frame.cpp
index 47a5e9e..98742ef 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -1204,7 +1204,7 @@ int InitSDL()
 	SDL_WM_SetIcon(apple_icon, NULL);
 	printf("Icon was set! Width=%d, height=%d\n", apple_icon->w, apple_icon->h);*/
 
-	apple_icon = SDL_LoadBMP("images/icon.bmp");
+	apple_icon = SDL_LoadBMP("resources/icon.bmp");
 	if(apple_icon != NULL) {
 		Uint32 colorkey = SDL_MapRGB(apple_icon->format, 0, 0, 0);
 		SDL_SetColorKey(apple_icon, SDL_SRCCOLORKEY, colorkey);
diff --git a/src/Makefile b/src/Makefile
index 2fcc7e3..7e8cd25 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,6 @@ $(EXE): Applewin
 	mv $^ $@
 	strip $@
 	@echo " o $(EXE) compiled succesfully"
-#	cp $@ ../
 
 clean:
 	rm -f $(EXE) *.o
diff --git a/src/Video.cpp b/src/Video.cpp
index 3c29bb3..13c4866 100644
--- a/src/Video.cpp
+++ b/src/Video.cpp
@@ -1866,13 +1866,13 @@ void VideoInitialize () {
   ZeroMemory(vidlastmem,0x10000);
 
   // LOAD THE splash screen
-  tmp_surface = SDL_LoadBMP("images/splash.bmp");
+  tmp_surface = SDL_LoadBMP("resources/splash.bmp");
   if (tmp_surface != NULL)  g_hLogoBitmap = SDL_DisplayFormat(tmp_surface);
   	else fprintf(stderr, "Video: splash.bmp was not loaded\n");
   SDL_FreeSurface(tmp_surface);
 
   // LOAD APPLE CHARSET40
-  tmp_surface = SDL_LoadBMP("images/charset40.bmp");
+  tmp_surface = SDL_LoadBMP("resources/charset40.bmp");
   if(tmp_surface != NULL)  charset40 = SDL_DisplayFormat(tmp_surface);
   	else fprintf(stderr, "Video: Apple text is not unavailable: charset40.bmp was not loaded\n");
   SDL_FreeSurface(tmp_surface);
diff --git a/src/images/charset40.bmp b/src/resources/charset40.bmp
similarity index 100%
rename from src/images/charset40.bmp
rename to src/resources/charset40.bmp
diff --git a/src/images/font.bmp b/src/resources/font.bmp
similarity index 100%
rename from src/images/font.bmp
rename to src/resources/font.bmp
diff --git a/src/images/icon.bmp b/src/resources/icon.bmp
similarity index 100%
rename from src/images/icon.bmp
rename to src/resources/icon.bmp
diff --git a/src/images/splash.bmp b/src/resources/splash.bmp
similarity index 100%
rename from src/images/splash.bmp
rename to src/resources/splash.bmp
diff --git a/src/stretch.cpp b/src/stretch.cpp
index 339595f..2165c9e 100644
--- a/src/stretch.cpp
+++ b/src/stretch.cpp
@@ -454,7 +454,7 @@ SDL_Surface *font_sfc = NULL;	// used for font
 bool fonts_initialization(void)
 {
 	SDL_Surface *temp_surface;
-	temp_surface = SDL_LoadBMP("images/font.bmp");
+	temp_surface = SDL_LoadBMP("resources/font.bmp");
 	if(!temp_surface) return false;
 	font_sfc = SDL_DisplayFormat(temp_surface);