summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/doom/Makefile.am2
-rw-r--r--src/heretic/Makefile.am8
-rw-r--r--src/heretic/in_lude.c12
-rw-r--r--src/hexen/Makefile.am6
-rw-r--r--src/resource.rc.in4
-rw-r--r--src/setup-res.rc.in4
-rw-r--r--src/setup/Makefile.am2
-rw-r--r--src/strife/Makefile.am2
9 files changed, 23 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 16496d88..1e54824c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,9 +18,9 @@ SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT) \
execgames_SCRIPTS = $(SETUP_BINARIES)
-AM_CFLAGS = -I$(top_builddir)/textscreen \
- -I$(top_builddir)/opl \
- -I$(top_builddir)/pcsound \
+AM_CFLAGS = -I$(top_srcdir)/textscreen \
+ -I$(top_srcdir)/opl \
+ -I$(top_srcdir)/pcsound \
@SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
# Common source files used by absolutely everything:
diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
index 74ba7014..e2ce86b4 100644
--- a/src/doom/Makefile.am
+++ b/src/doom/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I.. @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libdoom.a
diff --git a/src/heretic/Makefile.am b/src/heretic/Makefile.am
index bf834733..88ccc7b8 100644
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -1,6 +1,6 @@
-AM_CFLAGS=-I.. \
- -I$(top_builddir)/textscreen \
+AM_CFLAGS=-I$(top_srcdir)/src \
+ -I$(top_srcdir)/textscreen \
@SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libheretic.a
@@ -51,11 +51,11 @@ r_segs.c \
r_things.c \
sb_bar.c \
sounds.c sounds.h \
-s_sound.c s_sound.h
+s_sound.c s_sound.h
EXTRA_DIST= \
i_sound.c \
-i_ibm.c
+i_ibm.c
FEATURE_DEHACKED_SOURCE_FILES = \
deh_ammo.c \
diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c
index 2314a52b..e6fc1b13 100644
--- a/src/heretic/in_lude.c
+++ b/src/heretic/in_lude.c
@@ -1004,14 +1004,14 @@ void IN_DrawNumber(int val, int x, int y, int digits)
if (digits == 4)
{
patch = FontBNumbers[val / 1000];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12, y, patch);
}
if (digits > 2)
{
if (realdigits > 2)
{
patch = FontBNumbers[val / 100];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
}
xpos += 12;
}
@@ -1021,7 +1021,7 @@ void IN_DrawNumber(int val, int x, int y, int digits)
if (val > 9)
{
patch = FontBNumbers[val / 10];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
}
else if (digits == 2 || oldval > 99)
{
@@ -1031,11 +1031,11 @@ void IN_DrawNumber(int val, int x, int y, int digits)
}
val = val % 10;
patch = FontBNumbers[val];
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch);
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2, y, patch);
if (neg)
{
patch = FontBNegative;
- V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12 * (realdigits),
+ V_DrawShadowedPatch(xpos + 6 - SHORT(patch->width) / 2 - 12 * (realdigits),
y, patch);
}
}
@@ -1061,7 +1061,7 @@ void IN_DrTextB(char *text, int x, int y)
{
p = W_CacheLumpNum(FontBLump + c - 33, PU_CACHE);
V_DrawShadowedPatch(x, y, p);
- x += p->width - 1;
+ x += SHORT(p->width) - 1;
}
}
}
diff --git a/src/hexen/Makefile.am b/src/hexen/Makefile.am
index e8ca8b98..b3953ce6 100644
--- a/src/hexen/Makefile.am
+++ b/src/hexen/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS=-I.. @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS=-I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libhexen.a
@@ -58,10 +58,10 @@ sounds.c sounds.h \
st_start.c st_start.h \
sv_save.c \
textdefs.h \
- xddefs.h
+ xddefs.h
EXTRA_DIST= \
i_ibm.c \
-i_sound.c
+i_sound.c
libhexen_a_SOURCES=$(SOURCE_FILES)
diff --git a/src/resource.rc.in b/src/resource.rc.in
index ad81e1a5..51f16f43 100644
--- a/src/resource.rc.in
+++ b/src/resource.rc.in
@@ -1,6 +1,6 @@
-1 ICON "../data/doom.ico"
+1 ICON "@top_srcdir@/data/doom.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "@top_srcdir@/src/manifest.xml"
1 VERSIONINFO
PRODUCTVERSION @WINDOWS_RC_VERSION@
diff --git a/src/setup-res.rc.in b/src/setup-res.rc.in
index d82e136f..2be914f9 100644
--- a/src/setup-res.rc.in
+++ b/src/setup-res.rc.in
@@ -1,6 +1,6 @@
-1 ICON "../data/setup.ico"
+1 ICON "@top_srcdir@/data/setup.ico"
-1 24 MOVEABLE PURE "setup/setup-manifest.xml"
+1 24 MOVEABLE PURE "@top_builddir@/src/setup/setup-manifest.xml"
1 VERSIONINFO
PRODUCTVERSION @WINDOWS_RC_VERSION@
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index 1a1e1ccb..0adc90d7 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -3,7 +3,7 @@ gamesdir = $(prefix)/games
AM_CFLAGS = @SDL_CFLAGS@ \
@SDLMIXER_CFLAGS@ \
- -I$(top_builddir)/textscreen -I..
+ -I$(top_srcdir)/textscreen -I$(top_srcdir)/src
noinst_LIBRARIES = libsetup.a
diff --git a/src/strife/Makefile.am b/src/strife/Makefile.am
index df1f7bb0..271fcc20 100644
--- a/src/strife/Makefile.am
+++ b/src/strife/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I.. @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
noinst_LIBRARIES=libstrife.a
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 01:26:34 +0000