Makefile.mingw mods: removed the native target ("make mingw-all WINE="

does the same);  made install-dlls a prerequisite of SOLs (fails anyway,
but in a more informative manner);  added a crude clean-setup target to
undo the mess created by setup.

Simplified WINE invocation a bit.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1039 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/Makefile b/Makefile
index 0a5ec06..b7778c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,6 @@ MAPC_TARG= mapc$(EXT)
 BALL_TARG= neverball$(EXT)
 PUTT_TARG= neverputt$(EXT)
 
-MAPC_EXEC= $(WINE) ./$(MAPC_TARG)
-
 LOCALEDIR= locale
 LOCALEDOM= neverball
 
@@ -140,7 +138,7 @@ LINGUAS= $(POS:po/%.po=%)
        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 
 %.sol : %.map $(MAPC_TARG)
-       $(MAPC_EXEC) $< data
+       $(WINE) ./$(MAPC_TARG) $< data
 
 $(LOCALEDIR)/%$(MESSAGEPART) : po/%.po
        mkdir -p `dirname $@`

diff --git a/Makefile.mingw b/Makefile.mingw
index ff067a8..5cbec30 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -10,16 +10,15 @@ BASE_LIBS= $(LDFLAGS) -lSDL -lSDL_image -lintl
 LIBS= $(LDFLAGS) $(SDL_LIBS) -lSDL_image -lSDL_mixer -lSDL_ttf \
        $(OGL_LIBS) $(PNG_LIBS) -lintl
 
-.PHONY: native
-native:
-       $(MAKE) -f Makefile.mingw MAPC_EXEC=$(MAPC_TARG)
-
 #-----------------------------------------------------------------------------
-# NSIS setup stuff
+
+$(SOLS) : install-dlls
+
 #-----------------------------------------------------------------------------
 
 MAKENSIS= makensis
 TODOS= todos
+FROMDOS= fromdos
 CP= cp
 
 TEXT_DOCS= \
@@ -37,6 +36,11 @@ TXT_DOCS= $(TEXT_DOCS:%=%.txt)
 setup: install-dlls convert-text-files all
        $(MAKENSIS) -DVERSION=$(VERSION) -nocd scripts/neverball.nsi
 
+.PHONY: clean-setup
+clean-setup: clean
+       $(RM) install-dlls.sh *.dll $(TXT_DOCS)
+       find data -name "*.txt" -exec $(FROMDOS) {} \;
+
 #-----------------------------------------------------------------------------
 
 .PHONY: install-dlls