X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile;h=2fec8a09bd3fa93e2a2876322592a8d3872336ab;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hp=39eaad9f0e49e498455e767d993a7385f7ea6ac2;hpb=959794cfda1f83edc51512211ae5a9f6b1e0b179;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 39eaad9f..2fec8a09 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile (src)
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2006 Holger Schemel <info@artsoft.org>
+# (c) 1995-2014 by Artsoft Entertainment
+#     		    Holger Schemel
+#		    info@artsoft.org
+#		    http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# src/Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -14,13 +19,6 @@ ifndef PLATFORM				# unknown platform -- default to Unix
 PLATFORM = unix
 endif
 
-ifdef X11_PATH				# path to X11 from top level Makefile
-XINC_PATH = $(X11_PATH)/include
-XLIB_PATH = $(X11_PATH)/lib
-X11_INCL = -I$(XINC_PATH)
-X11_LIBS = -L$(XLIB_PATH) -lX11
-endif
-
 AR = ar
 RANLIB = ranlib
 ETAGS = etags
@@ -55,15 +53,6 @@ PLATFORM = unix
 TARGET = sdl
 endif
 
-ifeq ($(PLATFORM),os2)			# native compiling to OS/2
-RANLIB = echo
-PROGNAME = ../$(PROGBASE).exe
-EXTRA_CFLAGS = -Zbin-files -D__ST_MT_ERRNO__ -Zmtd -fomit-frame-pointer
-EXTRA_LDFLAGS = -lsocket
-PLATFORM = unix
-TARGET = x11
-endif
-
 ifeq ($(PLATFORM),unix)			# native compiling to Unix (generic)
 PROFILING_FLAGS = -pg
 endif
@@ -80,11 +69,6 @@ endif
 # configuring target
 # -----------------------------------------------------------------------------
 
-ifeq ($(TARGET),x11)			# compiling for X11 target
-SYS_CFLAGS = -DTARGET_X11 $(X11_INCL)
-SYS_LDFLAGS = $(X11_LIBS)
-endif
-
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
 SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
@@ -280,7 +264,8 @@ conf_snd.h: conf_snd.c
 conf_mus.h: conf_mus.c
 	@$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
+# $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) $(GAME_SP)
+$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
 	@date '+"%Y-%m-%d %H:%M"' \
 	| sed -e 's/^/#define COMPILE_DATE_STRING /' \
 	> $(TIMESTAMP_FILE)
@@ -298,9 +283,10 @@ clean-obj:
 	$(MAKE) -C $(GAME_EM_DIR) clean
 	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
-	$(RM) $(LIBGAME)
-	$(RM) $(GAME_EM)
-	$(RM) $(GAME_SP)
+	$(RM) $(RNDLIBS)
+#	$(RM) $(LIBGAME)
+#	$(RM) $(GAME_EM)
+#	$(RM) $(GAME_SP)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico