jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename some files to be package name independent.

Browse source 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1024
This commit is contained in:
Simon Howard 2008-01-25 17:37:48 +00:00
parent 0103f6b6e6
commit 092e2c4f3c
17 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -23,11 +23,11 @@ CODEBLOCKS_FILES= \
codeblocks/config.h \
codeblocks/libpcsound.cbp
DATA_FILES= \
data/chocolate-doom.ico \
data/chocolate-doom.png \
data/chocolate-setup.ico \
data/chocolate-setup.png \
DATA_FILES= \
data/doom.ico \
data/doom.png \
data/setup.ico \
data/setup.png \
data/convert-icon
EXTRA_DIST= \

5
configure.in
View file

@ -76,7 +76,8 @@ setup/Makefile
man/Makefile
src/Makefile
pcsound/Makefile
src/chocolate-doom-res.rc
setup/chocolate-setup-res.rc
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
])

2
data/convert-icon
View file

@ -41,7 +41,7 @@ def convert_image(filename, output_filename):
size = im.size
struct_name = os.path.basename(filename)
struct_name = os.path.basename(output_filename)
struct_name = re.sub(re.compile("\\..*$"), "", struct_name)
struct_name = re.sub(re.compile("\W"), "_", struct_name)

0
data/chocolate-doom.ico → data/doom.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
data/chocolate-doom.png → data/doom.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
data/chocolate-setup.ico → data/setup.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
data/chocolate-setup.png → data/setup.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 620 B

After

Width:  |  Height:  |  Size: 620 B

6
setup/Makefile.am
View file

@ -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

5
setup/execute.c
View file

@ -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

10
setup/mainmenu.c
View file

@ -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,

0
setup/chocolate-setup-res.rc.in → setup/setup-res.rc.in
View file

6
setup/chocolate_setup_icon.c → setup/setup_icon.c
View file

@ -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,

10
src/Makefile.am
View file

@ -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

4
src/chocolate-doom-screensaver.desktop → src/doom-screensaver.desktop.in
View file

@ -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

10
src/i_video.c
View file

@ -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,

6
src/chocolate_doom_icon.c → src/icon.c
View file

@ -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,

0
src/chocolate-doom-res.rc.in → src/resource.rc.in
View file