Localised the different mapc invocations.
authorparasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Mon, 31 Dec 2007 00:20:29 +0000 (00:20 +0000)
committerparasti <parasti@78b8d119-cf0a-0410-b17c-f493084dd1d7>
Mon, 31 Dec 2007 00:20:29 +0000 (00:20 +0000)
git-svn-id: https://s.snth.net/svn/neverball/trunk@1337 78b8d119-cf0a-0410-b17c-f493084dd1d7

Makefile

index d916399..36980a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,16 +78,20 @@ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(INTL_LIBS) -lSDL_ttf \
 #------------------------------------------------------------------------------
 
 ifdef MINGW
-    EXT  := .exe
-    WINE := wine
+    EXT := .exe
 endif
 
-#------------------------------------------------------------------------------
-
 MAPC_TARG := mapc$(EXT)
 BALL_TARG := neverball$(EXT)
 PUTT_TARG := neverputt$(EXT)
 
+ifdef MINGW
+    MAPC := wine ./$(MAPC_TARG)
+else
+    MAPC := ./$(MAPC_TARG)
+endif
+
+
 #------------------------------------------------------------------------------
 
 MAPC_OBJS := \
@@ -182,7 +186,7 @@ SOLS := $(MAPS:%.map=%.sol)
        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -o $@ -c $<
 
 %.sol : %.map $(MAPC_TARG)
-       $(WINE) ./$(MAPC_TARG) $< data
+       $(MAPC) $< data
 
 #------------------------------------------------------------------------------