Skip to content

Made some changes to make DOOM work on Ubuntu #2

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
wants to merge 3 commits into from
Closed

Made some changes to make DOOM work on Ubuntu #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20d2526
fix for errno.h reference issue while building for Ubuntu
sanilrocks Feb 3, 2012
b73ef24
Fix for colormap problem. Force installation of color map onto display
sanilrocks Feb 3, 2012
73a0064
Makefile changes to make the make command work as is
sanilrocks Feb 3, 2012
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
13 changes: 10 additions & 3 deletions linuxdoom-1.10/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,18 @@ OBJS= \
$(O)/info.o \
$(O)/sounds.o

all: $(O)/linuxxdoom
all: makedir build


clean:
rm -f *.o *~ *.flc
rm -f linux/*
rm -f $(O)/*
rmdir $(O)

makedir:
mkdir -p $(O)

build: $(O)/linuxxdoom

$(O)/linuxxdoom: $(OBJS) $(O)/i_main.o
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(O)/i_main.o \
Expand All @@ -92,4 +99,4 @@ $(O)/%.o: %.c

#############################################################
#
#############################################################
#############################################################
2 changes: 2 additions & 0 deletions linuxdoom-1.10/i_sound.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ rcsid[] = "$Id: i_unix.c,v 1.5 1997/02/03 22:45:10 b1 Exp $";
#include <unistd.h>
#include <sys/ioctl.h>

#include <errno.h>

// Linux voxware output.
#include <linux/soundcard.h>

Expand Down
3 changes: 2 additions & 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 Expand Up @@ -817,6 +817,7 @@ void I_InitGraphics(void)
attribmask,
&attribs );

XInstallColormap( X_display, X_cmap );
XDefineCursor(X_display, X_mainWindow,
createnullcursor( X_display, X_mainWindow ) );

Expand Down