Fix compile with HAVE_CONFIGFILE=0.

This commit is contained in:
Themaister 2011-10-28 17:10:58 +02:00
parent c2a06bfa09
commit 5e28d82af2
2 changed files with 12 additions and 0 deletions

View File

@ -131,7 +131,9 @@ static unsigned lut_textures[MAX_TEXTURES];
static unsigned lut_textures_num = 0;
static char lut_textures_uniform[MAX_TEXTURES][64];
#ifdef HAVE_CONFIGFILE
static snes_tracker_t *snes_tracker = NULL;
#endif
void gl_cg_set_proj_matrix(void)
{
@ -242,6 +244,7 @@ void gl_cg_set_params(unsigned width, unsigned height,
}
}
#ifdef HAVE_CONFIGFILE
// Set state parameters
if (snes_tracker)
{
@ -259,6 +262,7 @@ void gl_cg_set_params(unsigned width, unsigned height,
set_param_1f(param_f, info[i].value);
}
}
#endif
}
}
@ -276,11 +280,13 @@ void gl_cg_deinit(void)
glDeleteTextures(lut_textures_num, lut_textures);
lut_textures_num = 0;
#ifdef HAVE_CONFIGFILE
if (snes_tracker)
{
snes_tracker_free(snes_tracker);
snes_tracker = NULL;
}
#endif
cgDestroyContext(cgCtx);
}

View File

@ -507,6 +507,8 @@ static void set_paths(const char *path)
fill_pathname_dir(g_extern.savestate_name, g_extern.basename, ".state", sizeof(g_extern.savestate_name));
SSNES_LOG("Redirecting save state to \"%s\".\n", g_extern.savestate_name);
}
#ifdef HAVE_CONFIGFILE
if (*g_extern.config_path && path_is_directory(g_extern.config_path))
{
fill_pathname_dir(g_extern.config_path, g_extern.basename, ".cfg", sizeof(g_extern.config_path));
@ -517,6 +519,7 @@ static void set_paths(const char *path)
SSNES_LOG("Did not find config file. Using system default.\n");
}
}
#endif
}
static void verify_stdin_paths(void)
@ -546,12 +549,15 @@ static void verify_stdin_paths(void)
print_help();
exit(1);
}
#ifdef HAVE_CONFIGFILE
else if (path_is_directory(g_extern.config_path))
{
SSNES_ERR("Cannot specify directory for config file (--config) when reading from stdin.\n");
print_help();
exit(1);
}
#endif
}
static void parse_input(int argc, char *argv[])