X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=ea1325d8ef0a2ad6738063e6b9a70b0fe584569a;hb=4145364edf9ddec790b586344f9570145ae39896;hp=2a1afc908ceb0be4d268c3149edd2f8177c95147;hpb=b05bf3dca0ec7d951f1113066093843804e5be06;p=rocksndiamonds.git

diff --git a/src/Makefile b/src/Makefile
index 2a1afc90..ea1325d8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,26 +42,23 @@ PROGNAME = ../$(PROGBASE)
 # configuring platform
 # -----------------------------------------------------------------------------
 
-ifeq ($(PLATFORM),solaris)		# native compiling to Solaris
+ifeq ($(PLATFORM),solaris)		# compiling on Solaris
 EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
-PLATFORM = unix
+override PLATFORM = unix
 endif
 
-ifeq ($(PLATFORM),macosx)		# native compiling to Mac OS X
+ifeq ($(PLATFORM),macosx)		# compiling on Mac OS X
 EXTRA_LDFLAGS = -lstdc++
-PLATFORM = unix
-TARGET = sdl
+override PLATFORM = unix
 endif
 
-ifeq ($(PLATFORM),unix)			# native compiling to Unix (generic)
+ifeq ($(PLATFORM),unix)			# compiling on Unix/Linux (generic)
 PROFILING_FLAGS = -pg
 endif
 
 ifeq ($(PLATFORM),cross-win32)		# cross-compiling to Windows
 PROGNAME = ../$(PROGBASE).exe
 EXTRA_LDFLAGS = -lshfolder -lwsock32
-# TARGET = sdl
-TARGET = sdl2
 endif
 
 
@@ -69,6 +66,26 @@ endif
 # configuring target
 # -----------------------------------------------------------------------------
 
+ifndef TARGET				# auto-detect compiling for SDL or SDL2
+  SDL_VERSION := $(shell sdl2-config --version 2> /dev/null)
+  ifdef SDL_VERSION
+    TARGET = sdl2
+  else
+    SDL_VERSION := $(shell sdl-config --version 2> /dev/null)
+    ifdef SDL_VERSION
+      TARGET = sdl
+    else
+      $(error SDL/SDL2 library not found)
+    endif
+  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