From d852574c6252c421312d433115ca310a8ef4b29e Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Mon, 11 Aug 2008 03:16:46 +0000 Subject: [PATCH] Gfceux bugfixes and sdl fceux bugfixes [[Split portion of a mixed commit.]] --- SConstruct | 4 +++- changelog.txt | 4 +++- src/drivers/sdl/input.cpp | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 8c76d26f..c4a02986 100644 --- a/SConstruct +++ b/SConstruct @@ -118,4 +118,6 @@ env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)]) env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)]) env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, auxlib_src)]) -env.Alias(target="install", source=env.Install(dir="/usr/local/bin/", source=("bin/fceux", "bin/auxlib.lua"))) +# TODO: Fix this build script to gracefully install auxlib and the man page +#env.Alias(target="install", source=env.Install(dir="/usr/local/bin/", source=("bin/fceux", "bin/auxlib.lua"))) +env.Alias(target="install", source=env.Install(dir="/usr/local/bin/", source="bin/fceux")) diff --git a/changelog.txt b/changelog.txt index 67fad6bb..c7e08634 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,6 @@ ----version 2.0.2 released--- +---version 2.0.2 released--- +10-aug-2008 - punkrockguy318 - SDL: cleaned up the SConsruct +10-aug-2008 - punkrockguy318 - SDL: fixed issue where fceu would lock up when file dialogs were opened during fullscreen 10-aug-2008 - punkrockguy318 - SDL: fixed bug where fceux would close when file dialogs were closed 10-aug-2008 - punkrockguy318 - SDL: File open dialog is now used to movie playback 10-aug-2008 - punkrockguy318 - SDL: File open wrapper now takes a titlebar argument diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index 21c641f4..689e10fd 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -179,6 +179,10 @@ std::string GetFilename(const char* title) fname = GetOpenFileName(&ofn); #else + int fullscreen = 0; + g_config->getOption("SDL.Fullscreen", &fullscreen); + if(fullscreen) + ToggleFS(); FILE *fpipe; std::string command = "zenity --file-selection --title=\""; command.append(title);