From c5c5d521aac9835f6dd7ae0276c1747deec57d2a Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 13 Nov 2010 13:16:30 +0100 Subject: [PATCH] Go back to standard conf --- Makefile | 2 +- config.h | 11 +++++------ config.mk | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4fc8717b0c..4ae946cb88 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TARGET = ssnes DEFINES = OBJ = ssnes.o -LIBS = -lsamplerate libsnes.a +LIBS = -lsamplerate -lsnes ifeq ($(BUILD_RSOUND), 1) OBJ += rsound.o diff --git a/config.h b/config.h index 1ffe5d783f..6e2bfa40a1 100644 --- a/config.h +++ b/config.h @@ -29,7 +29,6 @@ #include - ///////////////// Drivers #define VIDEO_GL 0 //////////////////////// @@ -55,8 +54,8 @@ static const float yscale = 4.0; // Real y res = 224 * yscale // Fullscreen static bool fullscreen = false; // To start in Fullscreen or not -static const unsigned fullscreen_x = 1920; -static const unsigned fullscreen_y = 1200; +static const unsigned fullscreen_x = 1280; +static const unsigned fullscreen_y = 720; // Video VSYNC (recommended) static const bool vsync = true; @@ -65,7 +64,7 @@ static const bool vsync = true; static const bool video_smooth = true; // Path to custom Cg shader. If using custom shaders, it is recommended to disable video_smooth. -static const char *cg_shader_path = "hqflt/scanline.cg"; +static const char *cg_shader_path = "hqflt/hq2x.cg"; // On resize and fullscreen, rendering area will stay 4:3 static const bool force_aspect = true; @@ -91,14 +90,14 @@ static const bool force_aspect = true; static const bool audio_enable = true; // Output samplerate -static const unsigned out_rate = 96000; +static const unsigned out_rate = 48000; // Input samplerate from libSNES. // Lower this (slightly) if you are experiencing frequent audio dropouts while vsync is enabled. static const unsigned in_rate = 31950; // Audio device (e.g. hw:0,0 or /dev/audio). If NULL, will use defaults. -static const char* audio_device = "hw:0"; +static const char* audio_device = NULL; // Desired audio latency in milliseconds. Might not be honored if driver can't provide given latency. static const int out_latency = 8; diff --git a/config.mk b/config.mk index 6907ff9c5b..64e9c95494 100644 --- a/config.mk +++ b/config.mk @@ -1,6 +1,6 @@ BUILD_OPENGL = 1 -BUILD_CG = 1 +BUILD_CG = 0 BUILD_FILTER = 0 BUILD_RSOUND = 0