diff --git a/Makefile.win32 b/Makefile.win32 index 348b99859f..8a1d911de9 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -11,7 +11,7 @@ HAVE_XML = 1 libsnes ?= -lsnes LIBS = -DEFINES = -I. +DEFINES = -I. -DHAVE_CONFIGFILE LDFLAGS = -L. -static-libgcc -s SRC_LIBS = -lsamplerate-0 diff --git a/gfx/gl.c b/gfx/gl.c index f74732d4f0..9074846b4c 100644 --- a/gfx/gl.c +++ b/gfx/gl.c @@ -357,7 +357,6 @@ static void* gl_init(video_info_t *video, const input_driver_t **input, void **i glGenTextures(1, &gl->texture); - glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, gl->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); diff --git a/settings.c b/settings.c index 08fd588cbb..509b5a4efc 100644 --- a/settings.c +++ b/settings.c @@ -30,7 +30,9 @@ struct settings g_settings; +#ifdef HAVE_CONFIGFILE static void read_keybinds(config_file_t *conf); +#endif static void set_defaults(void) { @@ -96,7 +98,9 @@ static void set_defaults(void) g_settings.video.smooth = video_smooth; g_settings.video.force_aspect = force_aspect; g_settings.video.aspect_ratio = SNES_ASPECT_RATIO; +#ifdef HAVE_FILTER g_settings.video.filter = FILTER_NONE; +#endif g_settings.audio.enable = audio_enable; g_settings.audio.out_rate = out_rate; @@ -341,7 +345,6 @@ static void parse_config_file(void) config_file_free(conf); } -#endif struct bind_map { @@ -593,4 +596,4 @@ static void read_keybinds(config_file_t *conf) } } } - +#endif