X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=a6ab699696ebb7356b22370b2e205af465a34d1a;hp=6dc3a1a2480e7645034ce1ae99dbfa051f5ff3dd;hb=833cc59e0cc1802432f21ddbaa763c99e541fafe;hpb=89987a00158f6655e3475053d3f52aa256f0768b diff --git a/src/Makefile b/src/Makefile index 6dc3a1a2..a6ab6996 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,10 +11,11 @@ CC = gcc # on Solaris and similar systems, you'll need to uncomment this -# EXTRA_LIBS = -lnsl -lsocket +EXTRA_LIBS = -lnsl -lsocket -# specify X11 library path on your system -XLIB_PATH = /usr/X11/lib +# specify path to X11 on your system +# X11_PATH = /usr/X11 +X11_PATH = /local/X11 # change this to the directory where you want to install game data like levels GAME_DIR = . @@ -72,7 +73,12 @@ DEBUG = -DDEBUG -g -Wall # LIBS = -L/usr/X11R6/lib -lX11 -lm # LIBS = -L/usr/X11R6/lib $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) -LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) + +XINC_PATH = $(X11_PATH)/include +XLIB_PATH = $(X11_PATH)/lib + +INCL = -I$(XINC_PATH) +LIBS = -L$(XLIB_PATH) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS) -R$(XLIB_PATH) # CFLAGS = -O2 $(CONFIG) $(SYSTEM) CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL) @@ -130,10 +136,3 @@ clean: backup: ./make_backup.sh - -depend: - for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend - -ifeq (.depend,$(wildcard .depend)) -include .depend -endif