From b0c5479f13c40f0c8e07cc6b679408b56d8891c7 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Fri, 19 Mar 2021 19:31:49 -0400 Subject: db_get_*_dir(): Move out of src/main.c --- (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 4b5b25d..aa05340 100644 --- a/src/main.c +++ b/src/main.c @@ -19,38 +19,15 @@ #include #include -#include -#include #include -#include #include "defs.h" -#include "main.h" +#include "dirs.h" #include "main-menu.h" #include "output.h" -static const char *_db_games_dir; -static const char *_db_fonts_dir; static SDL_Window *_db_window; static SDL_Renderer *_db_renderer; -static void -_db_find_dirs(char *program_name) -{ - char *program_dir; - - program_dir = realpath(dirname(program_name), NULL); - if (strcmp(program_dir, ABS_BUILDDIR) == 0) { - /* Running in place */ - _db_games_dir = ABS_BUILDDIR "/games"; - _db_fonts_dir = ABS_BUILDDIR "/fonts"; - } else { - /* Running from installation */ - _db_games_dir = GAMESDIR; - _db_fonts_dir = FONTSDIR; - } - free(program_dir); -} - static int _db_init(void) { @@ -97,23 +74,11 @@ _db_quit(void) SDL_Quit(); } -const char * -db_get_games_dir(void) -{ - return _db_games_dir; -} - -const char * -db_get_fonts_dir(void) -{ - return _db_fonts_dir; -} - int main(int argc __attribute__((__unused__)), char *argv[]) { /* Find data directories */ - _db_find_dirs(argv[0]); + db_find_dirs(argv[0]); /* Initialize SDL libraries */ if (_db_init() < 0) { -- cgit v0.9.1