From: Holger Schemel <info@artsoft.org>
Date: Tue, 13 Oct 2015 18:40:52 +0000 (+0200)
Subject: removed deprecated stuff from Makefiles
X-Git-Tag: 4.0.0.0-rc1~147
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=b80c9b0941d4e06e9de27e8cf81d45c2f3752714

removed deprecated stuff from Makefiles
---

diff --git a/Makefile b/Makefile
index d5a21886..a30bf9ce 100644
--- a/Makefile
+++ b/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/
@@ -46,9 +46,6 @@ MAKE = make
 # path for cross-compiling (only needed for non-native Windows build)
 CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 
-# compile special edition of R'n'D instead of the normal (classic) version
-# SPECIAL_EDITION = rnd_jue
-
 
 # -----------------------------------------------------------------------------
 # there should be no need to change anything below
@@ -76,9 +73,6 @@ sdl2:
 mac:
 	@$(MAKE_CMD) PLATFORM=macosx
 
-mac-static:
-	@$(MAKE_CMD) PLATFORM=macosx STATIC=true
-
 cross-win32:
 	@PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
@@ -140,12 +134,6 @@ backup_gfx:
 # prerelease:
 #	./Scripts/make_prerelease.sh
 
-jue:
-	@$(MAKE) SPECIAL_EDITION=rnd_jue all
-
-jue-win:
-	@$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
-
 dist-clean:
 	@$(MAKE_CMD) dist-clean
 
diff --git a/src/Makefile b/src/Makefile
index ea1325d8..0f8c0997 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,7 +115,6 @@ 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
 OPTIONS = -O3 -Wall
@@ -229,15 +196,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