diff options
-rw-r--r-- | src/osd/osdcore.h | 12 | ||||
-rw-r--r-- | src/osd/sdl/sdlmain.c | 7 | ||||
-rw-r--r-- | src/osd/sdl/sdlos_macosx.c | 8 | ||||
-rw-r--r-- | src/osd/sdl/sdlos_unix.c | 8 | ||||
-rw-r--r-- | src/osd/sdl/sdlos_win32.c | 33 | ||||
-rw-r--r-- | src/osd/windows/winfile.c | 13 |
6 files changed, 0 insertions, 81 deletions
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h index 96fa6bffb0e..6e31d523740 100644 --- a/src/osd/osdcore.h +++ b/src/osd/osdcore.h @@ -850,18 +850,6 @@ osd_directory_entry *osd_stat(const char *path); ***************************************************************************/ /*----------------------------------------------------------------------------- - osd_get_emulator_directory: returns the path containing the emulator - - Parameters: - - dir - space to output directory - dir_size - size of path - ------------------------------------------------------------------------------*/ - -void osd_get_emulator_directory(char *dir, size_t dir_size); - -/*----------------------------------------------------------------------------- osd_get_full_path: retrieves the full path Parameters: diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index a92403a4a57..b930c8332fa 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -64,10 +64,6 @@ // Global variables //============================================================ -#ifdef MESS -char sdl_cwd[512]; -#endif - //============================================================ // Local variables //============================================================ @@ -284,9 +280,6 @@ int main(int argc, char *argv[]) #ifdef SDLMAME_OS2 MorphToPM(); #endif - #ifdef MESS - getcwd(sdl_cwd, 511); - #endif #if defined(SDLMAME_X11) && (SDL_MAJOR_VERSION == 1) && (SDL_MINOR_VERSION == 2) if (SDL_Linked_Version()->patch < 10) diff --git a/src/osd/sdl/sdlos_macosx.c b/src/osd/sdl/sdlos_macosx.c index 0251c7df836..c78a8eaa294 100644 --- a/src/osd/sdl/sdlos_macosx.c +++ b/src/osd/sdl/sdlos_macosx.c @@ -389,12 +389,4 @@ file_error osd_get_full_path(char **dst, const char *path) return err; } -//============================================================ -// osd_get_emulator_directory -//============================================================ -extern char sdl_cwd[512]; -void osd_get_emulator_directory(char *dir, size_t dir_size) -{ - strncpy(dir, sdl_cwd, dir_size); -} #endif diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c index 3c5de9ce299..a54524a1566 100644 --- a/src/osd/sdl/sdlos_unix.c +++ b/src/osd/sdl/sdlos_unix.c @@ -309,12 +309,4 @@ file_error osd_get_full_path(char **dst, const char *path) return err; } -//============================================================ -// osd_get_emulator_directory -//============================================================ -extern char sdl_cwd[512]; -void osd_get_emulator_directory(char *dir, size_t dir_size) -{ - strncpy(dir, sdl_cwd, dir_size); -} #endif diff --git a/src/osd/sdl/sdlos_win32.c b/src/osd/sdl/sdlos_win32.c index a73de1a2b17..fa411351e78 100644 --- a/src/osd/sdl/sdlos_win32.c +++ b/src/osd/sdl/sdlos_win32.c @@ -553,37 +553,4 @@ done: return err; } -//============================================================ -// win_get_module_file_name_utf8 -//============================================================ - -static DWORD win_get_module_file_name_utf8(HMODULE module, char *filename, DWORD size) -{ - TCHAR t_filename[MAX_PATH]; - char *utf8_filename; - - if (GetModuleFileName(module, t_filename, ARRAY_LENGTH(t_filename)) == 0) - return 0; - - utf8_filename = utf8_from_tstring(t_filename); - if (!utf8_filename) - return 0; - - size = (DWORD) snprintf(filename, size, "%s", utf8_filename); - free(utf8_filename); - return size; -} - -//============================================================ -// osd_get_emulator_directory -//============================================================ - -void osd_get_emulator_directory(char *dir, size_t dir_size) -{ - char *s; - win_get_module_file_name_utf8(NULL, dir, dir_size); - s = strrchr(dir, '\\'); - if (s) - s[1] = '\0'; -} #endif diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c index 6e5eee5ee5d..5c769309c07 100644 --- a/src/osd/windows/winfile.c +++ b/src/osd/windows/winfile.c @@ -520,16 +520,3 @@ const char *osd_get_volume_name(int idx) return p; } - -//============================================================ -// osd_get_emulator_directory -//============================================================ - -void osd_get_emulator_directory(char *dir, size_t dir_size) -{ - char *s; - win_get_module_file_name_utf8(NULL, dir, dir_size); - s = strrchr(dir, '\\'); - if (s) - s[1] = '\0'; -} |