projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040119-B-src
[rocksndiamonds.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index dd6896bf53b9e7fee6491fe1431495fd3a87f080..a0d7cfa2cce5c5e06e0866b334cd3f523bd38773 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-76,7
+76,8
@@
endif
ifeq ($(TARGET),x11)
SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
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)
endif
ifeq ($(TARGET),sdl)
@@
-136,6
+137,7
@@
SRCS = main.c \
conf_gfx.c \
conf_snd.c \
conf_mus.c \
conf_gfx.c \
conf_snd.c \
conf_mus.c \
+ conf_hlp.c \
init.c \
config.c \
events.c \
init.c \
config.c \
events.c \
@@
-153,6
+155,7
@@
OBJS = main.o \
conf_gfx.o \
conf_snd.o \
conf_mus.o \
conf_gfx.o \
conf_snd.o \
conf_mus.o \
+ conf_hlp.o \
init.o \
config.o \
events.o \
init.o \
config.o \
events.o \
@@
-173,10
+176,14
@@
CNFS = conf_gfx.h \
conf_chr.h \
conf_cus.c \
conf_cus.h \
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_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
CNFS_CMD = ../Scripts/create_element_defs.pl