X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=6e9bd2bc91b2c1e4197e02266a63895505703a08;hp=ea1325d8ef0a2ad6738063e6b9a70b0fe584569a;hb=f78f30b84a0345ea31b30c5bd95e338c9d9ebd4b;hpb=120fe36da3055f5b869d0a72307c6013fae865f7

diff --git a/src/Makefile b/src/Makefile
index ea1325d8..6e9bd2bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2014 by Artsoft Entertainment
+# (c) 1995-2015 by Artsoft Entertainment
 #                  Holger Schemel
 #                  info@artsoft.org
 #                  http://www.artsoft.org/
@@ -30,11 +30,6 @@ WINDRES = windres
 CONVERT_ICON_ARGS = -transparent black -background transparent
 
 PROGBASE = rocksndiamonds
-
-ifdef SPECIAL_EDITION			# create special edition
-PROGBASE = $(SPECIAL_EDITION)
-endif
-
 PROGNAME = ../$(PROGBASE)
 
 
@@ -42,11 +37,6 @@ PROGNAME = ../$(PROGBASE)
 # configuring platform
 # -----------------------------------------------------------------------------
 
-ifeq ($(PLATFORM),solaris)		# compiling on Solaris
-EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
-override PLATFORM = unix
-endif
-
 ifeq ($(PLATFORM),macosx)		# compiling on Mac OS X
 EXTRA_LDFLAGS = -lstdc++
 override PLATFORM = unix
@@ -80,36 +70,20 @@ ifndef TARGET				# auto-detect compiling for SDL or SDL2
   endif
 endif
 
-ifeq ($(STATIC),true)			# check for static linking
-override TARGET := $(TARGET)-static
-endif
-
 # $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)])
 
 ifeq ($(TARGET),sdl)			# compiling for SDL target
 SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg
+SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs)
 endif
 
 ifeq ($(TARGET),sdl2)			# compiling for SDL2 target
 SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
-SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2
+SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --libs)
 endif
 
-ifeq ($(TARGET),sdl-static)		# compiling for SDL target (static)
-SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags)
-SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
-SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
-endif
-
-ifeq ($(TARGET),sdl2-static)		# compiling for SDL2 target (static)
-SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags)
-SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net -lsmpeg2 -lmikmod
-SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl2-config --static-libs)
-endif
-
 
 # -----------------------------------------------------------------------------
 # configuring compile-time definitions
@@ -127,14 +101,8 @@ ifdef SCORE_ENTRIES			# number of score entries per player
 CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
 endif
 
-ifdef SPECIAL_EDITION
-ifeq ($(SPECIAL_EDITION),rnd_jue)	# create special edition
-CONFIG_SPECIAL = -DCREATE_SPECIAL_EDITION -DCREATE_SPECIAL_EDITION_RND_JUE
-endif
-endif
-
 CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
-CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
+CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES)
 
 CONFIG = $(CONFIG_GAME) $(JOYSTICK)
 DEBUG = -DDEBUG -g
@@ -147,9 +115,10 @@ OPTIONS = $(DEBUG) -Wall			# only for debugging purposes
 # OPTIONS = -O3 -Wall -ansi -pedantic
 # OPTIONS = -O3 -Wall
 # OPTIONS = -O3
-# OPTIONS = -DSYSV -Ae			# may be needed for HP-UX
 
 ifdef BUILD_DIST			# distribution build
+SYS_LDFLAGS := $(shell echo $(SYS_LDFLAGS) |	\
+		       sed -e "s%-rpath,[^ ]*%-rpath,'\$$ORIGIN/lib'%")
 OPTIONS = -O3 -Wall
 endif
 
@@ -229,15 +198,9 @@ AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
 ICON_BASEPATH = ../Special/Icons/windows_icons
+
 ifeq ($(PLATFORM),cross-win32)
-ifdef SPECIAL_EDITION
-# ICONSUFFIX = 32x32_$(SPECIAL_EDITION)
-ICON_PATH = $(ICON_BASEPATH)/$(SPECIAL_EDITION)
-else
-# ICONSUFFIX = 32x32
 ICON_PATH = $(ICON_BASEPATH)/default
-endif
-# ICON32X32 = ../graphics/$(ICONBASE)_$(ICONSUFFIX).bmp
 ICON = $(ICONBASE).o
 endif
 
@@ -252,6 +215,9 @@ all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) graphics_dir
 
 $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)
+ifdef BUILD_DIST
+	strip $(PROGNAME)
+endif
 
 libgame_dir:
 	@$(MAKE) -C $(LIBGAME_DIR)
@@ -304,7 +270,7 @@ $(ICON):
 	$(CC) $(PROFILING) $(CFLAGS) -c $*.c
 
 graphics_dir:
-	@$(MAKE) -C $(GRAPHICS_DIR)
+	@test -f $(GRAPHICS_DIR)/Makefile && $(MAKE) -C $(GRAPHICS_DIR) || true
 
 clean-obj:
 	$(MAKE) -C $(LIBGAME_DIR) clean
@@ -312,9 +278,6 @@ clean-obj:
 	$(MAKE) -C $(GAME_SP_DIR) clean
 	$(RM) $(OBJS)
 	$(RM) $(RNDLIBS)
-#	$(RM) $(LIBGAME)
-#	$(RM) $(GAME_EM)
-#	$(RM) $(GAME_SP)
 
 clean-ico:
 	$(RM) $(ICONBASE).ico
@@ -329,6 +292,8 @@ clean: clean-obj clean-ico clean-bin
 clean-git: clean auto-conf-clean
 	@$(MAKE) -C $(GRAPHICS_DIR) clean
 
+dist-clean: clean-obj clean-ico
+
 
 # -----------------------------------------------------------------------------
 # run and test targets
@@ -348,8 +313,6 @@ valgrind:
 # development only
 # -----------------------------------------------------------------------------
 
-dist-clean: clean-obj
-
 tags:
 	$(ETAGS) *.[ch] $(LIBGAME_DIR)/*.[ch] $(GAME_EM_DIR)/*.[ch] $(GAME_SP_DIR)/*.[ch]