X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=a0d7cfa2cce5c5e06e0866b334cd3f523bd38773;hb=df11f4a529251a285f3a33946da81623044fef3f;hp=46a9ddd29df4b9bc7fbe225afb15fa1913ef2c5e;hpb=a2c9a458aaa4ac568f07ecd25b19fbca3f766e6b;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index 46a9ddd2..a0d7cfa2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -76,7 +76,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) @@ -135,6 +136,8 @@ LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm SRCS = main.c \ conf_gfx.c \ conf_snd.c \ + conf_mus.c \ + conf_hlp.c \ init.c \ config.c \ events.c \ @@ -151,6 +154,8 @@ SRCS = main.c \ OBJS = main.o \ conf_gfx.o \ conf_snd.o \ + conf_mus.o \ + conf_hlp.o \ init.o \ config.o \ events.o \ @@ -166,14 +171,19 @@ OBJS = main.o \ CNFS = conf_gfx.h \ conf_snd.h \ + conf_mus.h \ conf_chr.c \ conf_chr.h \ conf_cus.c \ conf_cus.h \ + conf_grp.c \ + conf_grp.h \ conf_e2g.c \ conf_esg.c \ conf_e2s.c \ - conf_fnt.c + conf_fnt.c \ + conf_g2s.c \ + conf_g2m.c CNFS_CMD = ../Scripts/create_element_defs.pl @@ -215,6 +225,9 @@ conf_gfx.h: conf_gfx.c conf_snd.h: conf_snd.c @$(MAKE) auto-conf +conf_mus.h: conf_mus.c + @$(MAKE) auto-conf + $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) @date '+"[%Y-%m-%d %H:%M]"' \ | sed -e 's/^/#define COMPILE_DATE_STRING /' \