From: Holger Schemel Date: Tue, 14 Jul 2020 18:12:13 +0000 (+0200) Subject: removed obsolete targets and statements from Makefiles X-Git-Tag: 4.2.0.0~10 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=501680c0c919ce15ff8c33f46445659d4a534c35;p=rocksndiamonds.git removed obsolete targets and statements from Makefiles --- diff --git a/Makefile b/Makefile index 89218198..cd68f28a 100644 --- a/Makefile +++ b/Makefile @@ -63,15 +63,6 @@ MAKE_CMD_ANDROID = $(MAKE) -C $(ANDROID_DIR) all: @$(MAKE_CMD) -sdl: - @$(MAKE_CMD) TARGET=sdl - -sdl2: - @$(MAKE_CMD) TARGET=sdl2 - -mac: - @$(MAKE_CMD) PLATFORM=macosx - cross-win32: @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32 diff --git a/src/Makefile b/src/Makefile index b3a18b5e..da479a44 100644 --- a/src/Makefile +++ b/src/Makefile @@ -48,11 +48,6 @@ EDITION ?= default # configuring platform # ----------------------------------------------------------------------------- -ifeq ($(PLATFORM),macosx) # compiling on Mac OS X -EXTRA_LDFLAGS = -lstdc++ -override PLATFORM = unix -endif - ifeq ($(PLATFORM),unix) # compiling on Unix/Linux (generic) PROFILING_FLAGS = -pg endif @@ -78,10 +73,6 @@ endif # $(info Using SDL version $(SDL_VERSION) [TARGET == $(TARGET)]) -ifeq ($(TARGET),sdl) # compiling for SDL target - $(error SDL library version 1.2 not supported anymore) -endif - ifeq ($(TARGET),sdl2) # compiling for SDL2 target SYS_CFLAGS = -DTARGET_SDL2 $(shell sdl2-config --cflags) SDL_LIBS = -lSDL2_image -lSDL2_mixer -lSDL2_net