X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=044e136ddff7e86355652ad288bee9477a1de087;hp=f9c1e232a04432d805a85ce34c5ba5ed78372b95;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=c8dd3c1abd6a1daf4f7431a59db721ae7fba3d17 diff --git a/src/Makefile b/src/Makefile index f9c1e232..044e136d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,8 +34,11 @@ ifeq ($(PLATFORM),solaris) EXTRA_LIBS = -lnsl -lsocket -R$(XLIB_PATH) endif +SDL_CFLAGS := -DUSE_SDL_LIBRARY $(shell sdl-config --cflags) +SDL_LDFLAGS := -lIMG $(shell sdl-config --libs) + INCL = $(X11_INCL) -LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS) +LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS) $(SDL_LDFLAGS) endif @@ -65,7 +68,7 @@ OPTIONS = -DDEBUG -g -Wall # only for debugging purposes # SYSTEM = -DSYSV -Ae # may be needed for HP-UX -CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG) +CFLAGS = $(OPTIONS) $(SDL_CFLAGS) $(SYSTEM) $(INCL) $(CONFIG) SRCS = main.c \ init.c \ @@ -86,7 +89,8 @@ SRCS = main.c \ image.c \ network.c \ netserv.c \ - msdos.c + msdos.c \ + sdl.c OBJS = main.o \ init.o \ @@ -107,7 +111,8 @@ OBJS = main.o \ image.o \ network.o \ netserv.o \ - msdos.o + msdos.o \ + sdl.o all: $(PROGNAME) @@ -120,15 +125,3 @@ $(PROGNAME): $(OBJS) clean: $(RM) *.o $(RM) $(PROGNAME) - - -#-----------------------------------------------------------------------------# -# development only stuff # -#-----------------------------------------------------------------------------# - -depend: - for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend - -ifeq (.depend,$(wildcard .depend)) -include .depend -endif