X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Main%2FMakefile;h=f60c695f5718c99895f5978748b0b1a1fcbddc0d;hb=80713ee20581fe2026b9cc4c96558c19056e8bcc;hp=3b8e0a0bcb492c1dfa5b33d7c983d249b0942e63;hpb=189c638b346b05d6eb000b304bd166f4d208fe19;p=flightgear.git diff --git a/Main/Makefile b/Main/Makefile index 3b8e0a0bc..f60c695f5 100644 --- a/Main/Makefile +++ b/Main/Makefile @@ -53,12 +53,12 @@ INTERFACE_FILES = GLUTkey.c #--------------------------------------------------------------------------- # For OpenGL -# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11 +GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11 # For Mesa -MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL -X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) +# MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL +# X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 +# GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) CFLAGS = $(STD_CFLAGS) $(INTERFACE_FLAGS) @@ -83,7 +83,7 @@ $(TARGET): $(OFILES) $(AFILES) all: $(TARGET) clean: - rm -f *.o $(TARGET) *~ core + rm -f *.o $(TARGET) lib*.a *~ core #--------------------------------------------------------------------------- @@ -106,6 +106,9 @@ mesh2GL.o: mesh2GL.c ../Scenery/mesh.h #--------------------------------------------------------------------------- # $Log$ +# Revision 1.15 1997/06/25 15:39:47 curt +# Minor changes to compile with rsxnt/win32. +# # Revision 1.14 1997/06/21 17:52:23 curt # Continue directory shuffling ... everything should be compilable/runnable # again.