From: konrad Date: Sun, 16 Jan 2011 21:31:29 +0000 (+0000) Subject: make win32 makefile compatible with msys X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1d5660821321b61097b0e11d1449a3b1a9555b9f;p=web%2Fkonrad%2Fsmoke.git make win32 makefile compatible with msys git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@708 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- diff --git a/Makefile.mingw b/Makefile.mingw index 70179b1..4308ea6 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -37,7 +37,7 @@ QTBIN=$(shell $(QMAKE) -query QT_INSTALL_BINS) all: dist wob: woc - cd wob && ..\pack\woc\woc magicsmoke.wolf + cd wob && ../pack/woc/woc magicsmoke.wolf woc: cd pack/woc && $(QMAKE) $(QOPT) @@ -75,9 +75,9 @@ qtscript/generated_cpp: $(QTBIN)/qmake.exe cd qtscript/generator && set QTDIR=$(QTDIR) && ./generator dist: script client - echo !define QTDIR \ >qtpath.nsh + echo !define QTDIR / >qtpath.nsh $(QMAKE) -query QT_INSTALL_PREFIX >>qtpath.nsh $(NSIS) $(NOPT) smoke.nsi #tell Make that the rules above are symbolic: -.PHONY: woc wob server client zip +.PHONY: woc wob server client zip elam tzone