X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=18efb9d99ddb5aca2cc28450dfceba27afba9d21;hb=998be01ad92a672b69b11e24d472f6c0c076817f;hp=cc8e1df0439b9abf95affa76278759f823248dc1;hpb=1150bdce04915bf329bd816307fb2507eba80e15;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index cc8e1df0..18efb9d9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,6 +3,8 @@
 # (c) 1995-2000 Holger Schemel, info@artsoft.org                              #
 #=============================================================================#
 
+.EXPORT_ALL_VARIABLES:
+
 ifndef PLATFORM			# platform not specified -- try auto detection
 ifdef COMSPEC
 PLATFORM = msdos
@@ -18,6 +20,8 @@ X11_INCL = -I$(XINC_PATH)
 X11_LIBS = -L$(XLIB_PATH)
 endif
 
+AR = ar
+RANLIB = ranlib
 
 ifeq ($(PLATFORM),msdos)	# MS-DOS native compiling
 
@@ -62,7 +66,7 @@ SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),allegro)
-SYS_CFLAGS = -DTARGET_X11 -I$(CROSS_PATH_MSDOS)/include
+SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
 SYS_LDFLAGS = -lalleg
 endif
 
@@ -98,66 +102,56 @@ OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
 CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
 LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 
+
 SRCS =	main.c		\
 	init.c		\
 	events.c	\
 	tools.c		\
 	screens.c	\
-	misc.c		\
 	game.c		\
 	editor.c	\
-	buttons.c	\
 	files.c		\
 	tape.c		\
-	sound.c		\
 	joystick.c	\
 	cartoons.c	\
-	random.c	\
-	pcx.c		\
-	image.c		\
 	network.c	\
-	netserv.c	\
-	msdos.c		\
-	system.c	\
-	x11.c		\
-	sdl.c
+	netserv.c
 
 OBJS =	main.o		\
 	init.o		\
 	events.o	\
 	tools.o		\
 	screens.o	\
-	misc.o		\
 	game.o		\
 	editor.o	\
-	buttons.o	\
 	files.o		\
 	tape.o		\
-	sound.o		\
 	joystick.o	\
 	cartoons.o	\
-	random.o	\
-	pcx.o		\
-	image.o		\
 	network.o	\
-	netserv.o	\
-	msdos.o		\
-	system.o	\
-	x11.o		\
-	sdl.o
+	netserv.o
+
+LIBDIR = libgame
+LIBGAME = $(LIBDIR)/libgame.a
+
 
-all:	$(PROGNAME)
+all: $(PROGNAME)
 
-$(PROGNAME):	$(OBJS)
-	$(CC) $(PROFILING) $(OBJS) $(LDFLAGS) -o $(PROGNAME)
+$(PROGNAME): $(LIBGAME) $(OBJS)
+	$(CC) $(PROFILING) $(OBJS) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+
+$(LIBGAME):
+	$(MAKE) -C $(LIBDIR)
 
 .c.o:
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 clean:
-	$(RM) *.o
-	$(RM) ../*.exe
+	$(MAKE) -C $(LIBDIR) clean
+	$(RM) $(OBJS)
+	$(RM) $(LIBGAME)
 	$(RM) $(PROGNAME)
+	$(RM) ../*.exe
 
 
 #-----------------------------------------------------------------------------#
@@ -165,6 +159,7 @@ clean:
 #-----------------------------------------------------------------------------#
 
 depend:
+	$(MAKE) -C $(LIBDIR) depend
 	for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
 
 ifeq (.depend,$(wildcard .depend))