Applied my "bidirectional dt scaling" patch. Accordingly, the game can

[neverball] / Makefile.mingw

diff --git a/Makefile.mingw b/Makefile.mingw
index ff067a8..90147a2 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,25 +1,29 @@
-#-----------------------------------------------------------------------------
+export EXT= .exe
 
-EXT= .exe
-WINE= wine
+#-----------------------------------------------------------------------------
 
 include Makefile
 
+#-----------------------------------------------------------------------------
+
+WINE= wine
+
 OGL_LIBS= -lm -lopengl32
-BASE_LIBS= $(LDFLAGS) -lSDL -lSDL_image -lintl
-LIBS= $(LDFLAGS) $(SDL_LIBS) -lSDL_image -lSDL_mixer -lSDL_ttf \
-       $(OGL_LIBS) $(PNG_LIBS) -lintl
+BASE_LIBS= -lSDL -lSDL_image -lintl
 
-.PHONY: native
-native:
-       $(MAKE) -f Makefile.mingw MAPC_EXEC=$(MAPC_TARG)
+LIBS= \
+       $(SDL_LIBS) -lSDL_image -lSDL_mixer -lSDL_ttf \
+       $(OGL_LIBS) $(PNG_LIBS) -lintl
 
 #-----------------------------------------------------------------------------
-# NSIS setup stuff
-#-----------------------------------------------------------------------------
+
+INSTALLER= ../neverball-$(VERSION)-setup.exe
 
 MAKENSIS= makensis
+MAKENSIS_FLAGS= -DVERSION=$(VERSION) -DOUTFILE=$(INSTALLER)
+
 TODOS= todos
+FROMDOS= fromdos
 CP= cp
 
 TEXT_DOCS= \
@@ -34,8 +38,18 @@ TXT_DOCS= $(TEXT_DOCS:%=%.txt)
 #-----------------------------------------------------------------------------
 
 .PHONY: setup
-setup: install-dlls convert-text-files all
-       $(MAKENSIS) -DVERSION=$(VERSION) -nocd scripts/neverball.nsi
+setup: $(INSTALLER)
+
+$(INSTALLER): install-dlls convert-text-files all tools
+       $(MAKENSIS) $(MAKENSIS_FLAGS) -nocd scripts/neverball.nsi
+
+$(INSTALLER): LDFLAGS := -s $(LDFLAGS)
+
+.PHONY: clean-setup
+clean-setup: clean
+       $(RM) install-dlls.sh *.dll $(TXT_DOCS)
+       find data -name "*.txt" -exec $(FROMDOS) {} \;
+       cd tools && $(MAKE) clean
 
 #-----------------------------------------------------------------------------
 
@@ -66,3 +80,8 @@ convert-text-files: $(TXT_DOCS)
 
 #-----------------------------------------------------------------------------
 
+.PHONY: tools
+tools:
+       cd tools && $(MAKE)
+
+#-----------------------------------------------------------------------------