ref: 222de35cb34603c9d81375978d5e91821126b2c3
parent: 070e0f8e85666982a9a34e1f605065ebcbae0f5b
author: Juan Manuel Borges Caño <[email protected]>
date: Thu Aug 1 00:00:38 EDT 2013
Drop residual enet dep
--- a/Engine/src/Makefile
+++ b/Engine/src/Makefile
@@ -2,7 +2,7 @@
OBJECTS=cache.o display.o draw.o dummy_multi.o engine.o filesystem.o fixedPoint_math.o mmulti.o network.o tiles.o
../../libEngine.a: $(SOURCES)
- gcc -DPLATFORM_UNIX -DBYTE_ORDER=LITTLE_ENDIAN -D_XOPEN_SOURCE=500 -I /usr/include/SDL -I /usr/include/enet -c $(SOURCES)
+ gcc -DPLATFORM_UNIX -DBYTE_ORDER=LITTLE_ENDIAN -D_XOPEN_SOURCE=500 -I /usr/include/SDL -I enet/include -c $(SOURCES)
ar cru ../../libEngine.a $(OBJECTS)
ranlib ../../libEngine.a
--- a/Game/src/Makefile
+++ b/Game/src/Makefile
@@ -2,7 +2,7 @@
OBJECTS=actors.o animlib.o config.o console.o control.o cvar_defs.o cvars.o dummy_audiolib.o game.o gamedef.o global.o keyboard.o menues.o player.o premap.o rts.o scriplib.o sector.o sounds.o
../../libGame.a: audiolib.a libmidi.a $(SOURCES)
- gcc -DPLATFORM_UNIX -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -I /usr/include/SDL/ -I enet/include -I ../../Engine/src/ -c $(SOURCES)
+ gcc -DPLATFORM_UNIX -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -I /usr/include/SDL/ -I ../../Engine/src/ -c $(SOURCES)
ar cru ../../libGame.a $(OBJECTS) audiolib/*.o midi/*.o
ranlib ../../libGame.a
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
all:
cd Engine/src && make
cd Game/src && make
- gcc libGame.a libEngine.a `pkg-config --cflags --libs sdl SDL_mixer` -lenet -o chocolate-duke3d
+ gcc libGame.a libEngine.a `pkg-config --cflags --libs sdl SDL_mixer` -o chocolate-duke3d
clean:
cd Game/src && make clean
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
Requirements
============
-[SDL](http://libsdl.org), SDL_mixer and [enet](http://enet.bespin.org) to compile and run the code.
+[SDL](http://libsdl.org) and SDL_mixer to compile and run the code.
An original copy of Duke Nukem 3D (specifically the DUKE3D.GRP file from the original CD).