Skip to content

Make it run in x86_64, fix build and compilation issues #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 4 commits into from
Closed

Make it run in x86_64, fix build and compilation issues #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bdc65f
Fix build
Apr 17, 2020
08425ff
Fix compiling errors on x86_64
Apr 17, 2020
0d197bf
Game executes and shows menu
Apr 18, 2020
c877c7c
Fix crash when a new game starts
Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions linuxdoom-1.10/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
CC= gcc # gcc or g++

CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM
CFLAGS=-g -Wall -DNORMALUNIX -DLINUX -DSNDSERV -DSNDSRV # -DUSEASM
LDFLAGS=-L/usr/X11R6/lib
LIBS=-lXext -lX11 -lnsl -lm

Expand Down Expand Up @@ -81,15 +81,18 @@ all: $(O)/linuxxdoom

clean:
rm -f *.o *~ *.flc
rm -f linux/*
rm -rf linux

$(O)/linuxxdoom: $(OBJS) $(O)/i_main.o
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(O)/i_main.o \
-o $(O)/linuxxdoom $(LIBS)

$(O)/%.o: %.c
$(O)/%.o: %.c | object
$(CC) $(CFLAGS) -c $< -o $@

object:
mkdir -p $(O)

#############################################################
#
#############################################################
#############################################################
3 changes: 1 addition & 2 deletions linuxdoom-1.10/i_sound.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/03 22:45:10 b1 Exp $";
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>

#include <errno.h>
#include <math.h>

#include <sys/time.h>
Expand Down Expand Up @@ -163,7 +163,6 @@ myioctl
int* arg )
{
int rc;
extern int errno;

rc = ioctl(fd, command, arg);
if (rc < 0)
Expand Down
2 changes: 1 addition & 1 deletion linuxdoom-1.10/i_video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ int XShmGetEventBase( Display* dpy ); // problems with g++?
#include <sys/socket.h>

#include <netinet/in.h>
#include <errnos.h>
#include <errno.h>
#include <signal.h>

#include "doomstat.h"
Expand Down
28 changes: 14 additions & 14 deletions linuxdoom-1.10/m_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ typedef struct
{
char* name;
int* location;
int defaultvalue;
long long defaultvalue;
int scantranslate; // PC scan code hack
int untranslated; // lousy hack
} default_t;
Expand Down Expand Up @@ -254,15 +254,15 @@ default_t defaults[] =

// UNIX hack, to be removed.
#ifdef SNDSERV
{"sndserver", (int *) &sndserver_filename, (int) "sndserver"},
{"sndserver", (int *) &sndserver_filename, (long long int) "sndserver"},
{"mb_used", &mb_used, 2},
#endif

#endif

#ifdef LINUX
{"mousedev", (int*)&mousedev, (int)"/dev/ttyS0"},
{"mousetype", (int*)&mousetype, (int)"microsoft"},
{"mousedev", (int*)&mousedev, (long long int)"/dev/ttyS0"},
{"mousetype", (int*)&mousetype, (long long int)"microsoft"},
#endif

{"use_mouse",&usemouse, 1},
Expand All @@ -285,16 +285,16 @@ default_t defaults[] =

{"usegamma",&usegamma, 0},

{"chatmacro0", (int *) &chat_macros[0], (int) HUSTR_CHATMACRO0 },
{"chatmacro1", (int *) &chat_macros[1], (int) HUSTR_CHATMACRO1 },
{"chatmacro2", (int *) &chat_macros[2], (int) HUSTR_CHATMACRO2 },
{"chatmacro3", (int *) &chat_macros[3], (int) HUSTR_CHATMACRO3 },
{"chatmacro4", (int *) &chat_macros[4], (int) HUSTR_CHATMACRO4 },
{"chatmacro5", (int *) &chat_macros[5], (int) HUSTR_CHATMACRO5 },
{"chatmacro6", (int *) &chat_macros[6], (int) HUSTR_CHATMACRO6 },
{"chatmacro7", (int *) &chat_macros[7], (int) HUSTR_CHATMACRO7 },
{"chatmacro8", (int *) &chat_macros[8], (int) HUSTR_CHATMACRO8 },
{"chatmacro9", (int *) &chat_macros[9], (int) HUSTR_CHATMACRO9 }
{"chatmacro0", (int *) &chat_macros[0], (long long int) HUSTR_CHATMACRO0 },
{"chatmacro1", (int *) &chat_macros[1], (long long int) HUSTR_CHATMACRO1 },
{"chatmacro2", (int *) &chat_macros[2], (long long int) HUSTR_CHATMACRO2 },
{"chatmacro3", (int *) &chat_macros[3], (long long int) HUSTR_CHATMACRO3 },
{"chatmacro4", (int *) &chat_macros[4], (long long int) HUSTR_CHATMACRO4 },
{"chatmacro5", (int *) &chat_macros[5], (long long int) HUSTR_CHATMACRO5 },
{"chatmacro6", (int *) &chat_macros[6], (long long int) HUSTR_CHATMACRO6 },
{"chatmacro7", (int *) &chat_macros[7], (long long int) HUSTR_CHATMACRO7 },
{"chatmacro8", (int *) &chat_macros[8], (long long int) HUSTR_CHATMACRO8 },
{"chatmacro9", (int *) &chat_macros[9], (long long int) HUSTR_CHATMACRO9 }

};

Expand Down
2 changes: 1 addition & 1 deletion linuxdoom-1.10/p_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ void P_GroupLines (void)
}

// build line tables for each sector
linebuffer = Z_Malloc (total*4, PU_LEVEL, 0);
linebuffer = Z_Malloc (total*sizeof(*linebuffer), PU_LEVEL, 0);
sector = sectors;
for (i=0 ; i<numsectors ; i++, sector++)
{
Expand Down
14 changes: 8 additions & 6 deletions linuxdoom-1.10/r_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
static const char
rcsid[] = "$Id: r_data.c,v 1.4 1997/02/03 16:47:55 b1 Exp $";

#include <stdint.h>

#include "i_system.h"
#include "z_zone.h"

Expand Down Expand Up @@ -87,7 +89,7 @@ typedef struct
boolean masked;
short width;
short height;
void **columndirectory; // OBSOLETE
int columndirectory; // OBSOLETE
short patchcount;
mappatch_t patches[1];
} maptexture_t;
Expand Down Expand Up @@ -479,10 +481,10 @@ void R_InitTextures (void)
}
numtextures = numtextures1 + numtextures2;

textures = Z_Malloc (numtextures*4, PU_STATIC, 0);
texturecolumnlump = Z_Malloc (numtextures*4, PU_STATIC, 0);
texturecolumnofs = Z_Malloc (numtextures*4, PU_STATIC, 0);
texturecomposite = Z_Malloc (numtextures*4, PU_STATIC, 0);
textures = Z_Malloc (numtextures*sizeof(*textures), PU_STATIC, 0);
texturecolumnlump = Z_Malloc (numtextures*sizeof(*texturecolumnlump), PU_STATIC, 0);
texturecolumnofs = Z_Malloc (numtextures*sizeof(*texturecolumnofs), PU_STATIC, 0);
texturecomposite = Z_Malloc (numtextures*sizeof(*texturecomposite), PU_STATIC, 0);
texturecompositesize = Z_Malloc (numtextures*4, PU_STATIC, 0);
texturewidthmask = Z_Malloc (numtextures*4, PU_STATIC, 0);
textureheight = Z_Malloc (numtextures*4, PU_STATIC, 0);
Expand Down Expand Up @@ -639,7 +641,7 @@ void R_InitColormaps (void)
lump = W_GetNumForName("COLORMAP");
length = W_LumpLength (lump) + 255;
colormaps = Z_Malloc (length, PU_STATIC, 0);
colormaps = (byte *)( ((int)colormaps + 255)&~0xff);
colormaps = (byte *)( ((intptr_t)colormaps + 255)&~0xff);
W_ReadLump (lump,colormaps);
}

Expand Down
3 changes: 2 additions & 1 deletion linuxdoom-1.10/r_draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
static const char
rcsid[] = "$Id: r_draw.c,v 1.4 1997/02/03 16:47:55 b1 Exp $";

#include <stdint.h>

#include "doomdef.h"

Expand Down Expand Up @@ -461,7 +462,7 @@ void R_InitTranslationTables (void)
int i;

translationtables = Z_Malloc (256*3+255, PU_STATIC, 0);
translationtables = (byte *)(( (int)translationtables + 255 )& ~255);
translationtables = (byte *)(( (intptr_t)translationtables + 255 )& ~255);

// translate just the 16 green colors
for (i=0 ; i<256 ; i++)
Expand Down