diff --git a/Makefile b/Makefile index 0a853d3..169841b 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,14 @@ NASM = nasm CFLAGS = -g -Wall -pipe -O2 -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets #CFLAGS = -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentiumpro -mcpu=pentiumpro -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets CXXFLAGS = $(CFLAGS) -LDLIBS = -lm CFLAGS += `sdl-config --cflags` -LDLIBS += -L/usr/X11R6/lib -lX11 -lXext -lGL `sdl-config --libs` -lopenal -lm +LDLIBS = -L/usr/X11R6/lib -lX11 -lXext -lGL `sdl-config --libs` -lopenal + +# Debian SDL+NVIDIA workaround (change /usr/lib to the real location of the files) +#LDLIBS = -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libGL.so.1 `sdl-config` --libs -lopenal -lm + +# required for gcc-3.0 #LDLIBS += -lstdc++ AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow diff --git a/README b/README index edbde0d..1f73e75 100644 --- a/README +++ b/README @@ -53,6 +53,9 @@ If you get "Aborted" after starting a new game the second time or so, try recompiling with gcc-3.0.2. It seems to have fixed it for me, but I'll try to find a workaround that works with gcc-2.95. +If you have Debian, the Debian SDL package, and an NVIDIA card, you will +have to uncomment a LDLIBS line in the Makefile. + relnev:~/avp/AvP Demo 3 - Alien$ ls aenglish.txt alienavp_huds/ alienfastfile/ avp_rifs/ MPConfig/