X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=0512cf8029a2f6a23bdc9091624273c6b5cd8f23;hb=942ec4881e3b21c130df9ae105d06c2c633fa192;hp=2aa08a2e4ecfabea77daa109f4e6df4ccd58a40c;hpb=92989af5d5884cbc8a1a9a62c9d05e109eaf78d0;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index 2aa08a2e..0512cf80 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,6 +41,7 @@ PROGNAME = ../$(PROGBASE).exe SYS_CFLAGS = -DTARGET_X11 SYS_LDFLAGS = -s -lalleg + else # Unix or cross-compiling for MS-DOS and Win32 RM = rm -f @@ -76,7 +77,8 @@ endif ifeq ($(TARGET),x11) SYS_CFLAGS = -DTARGET_X11 $(X11_INCL) -SYS_LDFLAGS = $(X11_LIBS) -lX11 +# SYS_LDFLAGS = $(X11_LIBS) -lX11 +SYS_LDFLAGS = $(XLIB_PATH)/libX11.a endif ifeq ($(TARGET),sdl) @@ -136,6 +138,7 @@ SRCS = main.c \ conf_gfx.c \ conf_snd.c \ conf_mus.c \ + conf_dem.c \ init.c \ config.c \ events.c \ @@ -153,6 +156,7 @@ OBJS = main.o \ conf_gfx.o \ conf_snd.o \ conf_mus.o \ + conf_dem.o \ init.o \ config.o \ events.o \