X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=e03e8af1e0a681b9b88eab6ea2922e683e20b881;hp=b3a18b5e8376783f38f370f7d6a6201ae2cdd656;hb=51d5e483a5d8b50e0c0956053e0e264c20382928;hpb=79d9ea719f6a44c452f394600c6076063d4c73de

diff --git a/src/Makefile b/src/Makefile
index b3a18b5e..e03e8af1 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
@@ -62,6 +57,16 @@ PROGNAME = ../$(PROGBASE).exe
 EXTRA_LDFLAGS = -lshfolder -lwsock32
 endif
 
+ifdef BUILD_DIST			# distribution build
+ifeq ($(shell uname -s),Darwin)		# compiling on Mac OS X
+MAC_TARGET_VERSION_MIN = 10.7
+EXTRA_FLAGS_MAC = -mmacosx-version-min=$(MAC_TARGET_VERSION_MIN)
+EXTRA_CFLAGS = $(EXTRA_FLAGS_MAC)
+EXTRA_LDFLAGS = $(EXTRA_FLAGS_MAC)
+MACOSX_DEPLOYMENT_TARGET = $MAC_TARGET_VERSION_MIN
+endif
+endif
+
 
 # -----------------------------------------------------------------------------
 # configuring target
@@ -78,10 +83,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
@@ -270,10 +271,13 @@ conf_snd.h: conf_snd.c $(CNFS_CMD)
 conf_mus.h: conf_mus.c $(CNFS_CMD)
 	@$(MAKE) auto-conf
 
-$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
+conf-time:
 	@echo '#define SOURCE_DATE_STRING "$(SOURCE_DATE_STRING)"' \
 	> $(TIMESTAMP_FILE)
 
+$(TIMESTAMP_FILE): $(SRCS) $(RNDLIBS)
+	@$(MAKE) conf-time
+
 $(ICON):
 #	$(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico