From 7e8401885aa2a246f482c897c6466a1460038307 Mon Sep 17 00:00:00 2001 From: bgk Date: Tue, 2 Sep 2008 06:16:34 +0000 Subject: [PATCH] SDL : - Renamed the configuration file to vbam.cfg to avoid conflict with the original VBA (thanks to tttttttttanaka for the patch) - Changed the window title to VBA-M git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@679 a31d4220-a93d-0410-bf67-fe4944624d44 --- CMakeLists.txt | 4 ++-- src/sdl/SDL.cpp | 8 ++++---- .../{VisualBoyAdvance.cfg-example => vbam.cfg-example} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename src/sdl/{VisualBoyAdvance.cfg-example => vbam.cfg-example} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93077bb8..b5b06533 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,9 +282,9 @@ IF( CAN_BUILD_VBAM ) ) INSTALL(PROGRAMS vbam DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/VisualBoyAdvance.cfg-example + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example DESTINATION ${SYSCONFDIR} - RENAME VisualBoyAdvance.cfg) + RENAME vbam.cfg) ENDIF( CAN_BUILD_VBAM ) diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp index 9652ae37..0a1a191f 100644 --- a/src/sdl/SDL.cpp +++ b/src/sdl/SDL.cpp @@ -838,7 +838,7 @@ void sdlOpenGLInit(int w, int h) void sdlReadPreferences() { - FILE *f = sdlFindFile("VisualBoyAdvance.cfg"); + FILE *f = sdlFindFile("vbam.cfg"); if(f == NULL) { fprintf(stderr, "Configuration file NOT FOUND (using defaults)\n"); @@ -2223,7 +2223,7 @@ int main(int argc, char **argv) autoFrameSkipLastTime = throttleLastTime = systemGetClock(); - SDL_WM_SetCaption("VisualBoyAdvance", NULL); + SDL_WM_SetCaption("VBA-M", NULL); // now we can enable cheats? { @@ -2426,9 +2426,9 @@ void systemShowSpeed(int speed) if(!fullscreen && showSpeed) { char buffer[80]; if(showSpeed == 1) - sprintf(buffer, "VisualBoyAdvance-%3d%%", systemSpeed); + sprintf(buffer, "VBA-M - %d%%", systemSpeed); else - sprintf(buffer, "VisualBoyAdvance-%3d%%(%d, %d fps)", systemSpeed, + sprintf(buffer, "VBA-M - %d%%(%d, %d fps)", systemSpeed, systemFrameSkip, showRenderedFrames); diff --git a/src/sdl/VisualBoyAdvance.cfg-example b/src/sdl/vbam.cfg-example similarity index 100% rename from src/sdl/VisualBoyAdvance.cfg-example rename to src/sdl/vbam.cfg-example