diff options
| author | Simon Howard | 2008-01-25 17:37:48 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-01-25 17:37:48 +0000 |
| commit | 092e2c4f3c63b7ada368a927a6eee1b4dc9fdaaa (patch) | |
| tree | 1821b0c7ecf6fc37a81ca1cdc8a654fcb80e4132 /src | |
| parent | 0103f6b6e6f64e1c3c6fb636e201f6da2136f4ac (diff) | |
| download | chocolate-doom-092e2c4f3c63b7ada368a927a6eee1b4dc9fdaaa.tar.gz chocolate-doom-092e2c4f3c63b7ada368a927a6eee1b4dc9fdaaa.tar.bz2 chocolate-doom-092e2c4f3c63b7ada368a927a6eee1b4dc9fdaaa.zip | |
Rename some files to be package name independent.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1024
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/doom-screensaver.desktop.in (renamed from src/chocolate-doom-screensaver.desktop) | 4 | ||||
| -rw-r--r-- | src/i_video.c | 10 | ||||
| -rw-r--r-- | src/icon.c (renamed from src/chocolate_doom_icon.c) | 6 | ||||
| -rw-r--r-- | src/resource.rc.in (renamed from src/chocolate-doom-res.rc.in) | 0 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f2f9f140..4358d6e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -158,16 +158,16 @@ SOURCE_FILES = $(MAIN_SOURCE_FILES) \ $(FEATURE_SOUND_SOURCE_FILES) if HAVE_WINDRES -chocolate_doom_SOURCES=$(SOURCE_FILES) chocolate-doom-res.rc +chocolate_doom_SOURCES=$(SOURCE_FILES) resource.rc else chocolate_doom_SOURCES=$(SOURCE_FILES) endif chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ -EXTRA_DIST = \ - chocolate_doom_icon.c \ - chocolate-doom-screensaver.desktop +EXTRA_DIST = \ + icon.c \ + doom-screensaver.desktop.in .rc.o: $(WINDRES) $^ -o $@ @@ -176,7 +176,7 @@ EXTRA_DIST = \ if HAVE_PYTHON -chocolate_doom_icon.c : ../data/chocolate-doom.png +icon.c : ../data/doom.png ../data/convert-icon $^ $@ endif diff --git a/src/chocolate-doom-screensaver.desktop b/src/doom-screensaver.desktop.in index d90127a3..cee79c2d 100644 --- a/src/chocolate-doom-screensaver.desktop +++ b/src/doom-screensaver.desktop.in @@ -3,8 +3,8 @@ Encoding=UTF-8 Name=Doom Comment=DOOM by Id Software. -TryExec=chocolate-doom -Exec=chocolate-doom +TryExec=@PACKAGE_TARNAME@ +Exec=@PACKAGE_TARNAME@ StartupNotify=false Terminal=false Type=Application diff --git a/src/i_video.c b/src/i_video.c index 568f0f7d..7732c63d 100644 --- a/src/i_video.c +++ b/src/i_video.c @@ -30,7 +30,7 @@ #include <ctype.h> #include <math.h> -#include "chocolate_doom_icon.c" +#include "icon.c" #include "config.h" #include "deh_main.h" @@ -850,11 +850,11 @@ void I_SetWindowIcon(void) { SDL_Surface *surface; - surface = SDL_CreateRGBSurfaceFrom(chocolate_doom_data, - chocolate_doom_w, - chocolate_doom_h, + surface = SDL_CreateRGBSurfaceFrom(icon_data, + icon_w, + icon_h, 24, - chocolate_doom_w * 3, + icon_w * 3, 0xff << 0, 0xff << 8, 0xff << 16, diff --git a/src/chocolate_doom_icon.c b/src/icon.c index 51feba09..3a967e72 100644 --- a/src/chocolate_doom_icon.c +++ b/src/icon.c @@ -1,7 +1,7 @@ -static int chocolate_doom_w = 32; -static int chocolate_doom_h = 32; +static int icon_w = 32; +static int icon_h = 32; -static unsigned char chocolate_doom_data[] = { +static unsigned char icon_data[] = { 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, 0x00,0x00,0x00, diff --git a/src/chocolate-doom-res.rc.in b/src/resource.rc.in index a6635932..a6635932 100644 --- a/src/chocolate-doom-res.rc.in +++ b/src/resource.rc.in |