diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/Makefile.am | 6 | ||||
| -rw-r--r-- | setup/execute.c | 5 | ||||
| -rw-r--r-- | setup/mainmenu.c | 10 | ||||
| -rw-r--r-- | setup/setup-res.rc.in (renamed from setup/chocolate-setup-res.rc.in) | 0 | ||||
| -rw-r--r-- | setup/setup_icon.c (renamed from setup/chocolate_setup_icon.c) | 6 |
5 files changed, 14 insertions, 13 deletions
diff --git a/setup/Makefile.am b/setup/Makefile.am index 10085218..670d8cde 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -23,10 +23,10 @@ SOURCE_FILES = \ txt_mouseinput.c txt_mouseinput.h EXTRA_DIST= \ - chocolate_setup_icon.c + setup_icon.c if HAVE_WINDRES -chocolate_setup_SOURCES=$(SOURCE_FILES) chocolate-setup-res.rc +chocolate_setup_SOURCES=$(SOURCE_FILES) setup-res.rc else chocolate_setup_SOURCES=$(SOURCE_FILES) endif @@ -38,7 +38,7 @@ endif if HAVE_PYTHON -chocolate_setup_icon.c : ../data/chocolate-setup.png +setup_icon.c : ../data/setup.png ../data/convert-icon $^ $@ endif diff --git a/setup/execute.c b/setup/execute.c index 39fd5958..b5b8a7c6 100644 --- a/setup/execute.c +++ b/setup/execute.c @@ -37,14 +37,15 @@ #include "textscreen.h" +#include "config.h" #include "configfile.h" #include "execute.h" #include "m_argv.h" #ifdef _WIN32 -#define DOOM_BINARY "chocolate-doom.exe" +#define DOOM_BINARY PACKAGE_TARNAME ".exe" #else -#define DOOM_BINARY INSTALL_DIR "/chocolate-doom" +#define DOOM_BINARY INSTALL_DIR "/" PACKAGE_TARNAME #endif #ifdef _WIN32 diff --git a/setup/mainmenu.c b/setup/mainmenu.c index 71643400..335bd61b 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -28,7 +28,7 @@ #include "configfile.h" #include "m_argv.h" -#include "chocolate_setup_icon.c" +#include "setup_icon.c" #include "compatibility.h" #include "display.h" @@ -152,11 +152,11 @@ static void SetIcon(void) { SDL_Surface *surface; - surface = SDL_CreateRGBSurfaceFrom(chocolate_setup_data, - chocolate_setup_w, - chocolate_setup_h, + surface = SDL_CreateRGBSurfaceFrom(setup_icon_data, + setup_icon_w, + setup_icon_h, 24, - chocolate_setup_w * 3, + setup_icon_w * 3, 0xff << 0, 0xff << 8, 0xff << 16, diff --git a/setup/chocolate-setup-res.rc.in b/setup/setup-res.rc.in index cb49a1b2..cb49a1b2 100644 --- a/setup/chocolate-setup-res.rc.in +++ b/setup/setup-res.rc.in diff --git a/setup/chocolate_setup_icon.c b/setup/setup_icon.c index 57270950..23459716 100644 --- a/setup/chocolate_setup_icon.c +++ b/setup/setup_icon.c @@ -1,7 +1,7 @@ -static int chocolate_setup_w = 32; -static int chocolate_setup_h = 32; +static int setup_icon_w = 32; +static int setup_icon_h = 32; -static unsigned char chocolate_setup_data[] = { +static unsigned char setup_icon_data[] = { 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff, |