rnd-20140515-1-src

[rocksndiamonds.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 018be6a502fd61653da5628014e69533bf27633b..39eaad9f0e49e498455e767d993a7385f7ea6ac2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,13 +10,9 @@
 
 .EXPORT_ALL_VARIABLES:
 
-ifndef PLATFORM                                # unknown platform -- try auto detection
-ifdef COMSPEC
-PLATFORM = msdos
-else
+ifndef PLATFORM                                # unknown platform -- default to Unix
 PLATFORM = unix
 endif
-endif
 
 ifdef X11_PATH                         # path to X11 from top level Makefile
 XINC_PATH = $(X11_PATH)/include
@@ -75,21 +71,8 @@ endif
 ifeq ($(PLATFORM),cross-win32)         # cross-compiling to Windows
 PROGNAME = ../$(PROGBASE).exe
 EXTRA_LDFLAGS = -lshfolder -lwsock32
-TARGET = sdl
-endif
-
-ifeq ($(PLATFORM),cross-msdos)         # cross-compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-TARGET = allegro
-endif
-
-ifeq ($(PLATFORM),msdos)               # native compiling to MS-DOS
-PROGBASE = rocks
-PROGNAME = ../$(PROGBASE).exe
-SYS_CFLAGS = -DTARGET_X11
-SYS_LDFLAGS = -s -lalleg
-RM = del
+# TARGET = sdl
+TARGET = sdl2
 endif
 
 
@@ -120,9 +103,10 @@ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg -lmikmod
 SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs)
 endif
 
-ifeq ($(TARGET),allegro)               # compiling for Allegro target
-SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include
-SYS_LDFLAGS = -lalleg
+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