some changes for win32 build

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@489 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/Makefile.mingw b/Makefile.mingw
index 3df73d6..c22c85e 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,6 +1,10 @@
 ###########################################################
 # global Makefile for MagicSmoke, MinGW flavour
-# (c) Konrad Rosenbaum, 2008-9
+# (c) Konrad Rosenbaum, 2008-2010
+#
+# this builds the client for windows;
+# it is currently not supported to build all the documentation on windows;
+# the server cannot run on windows
 ###########################################################
 
 ######
@@ -8,44 +12,52 @@
 
 #change this if Qt is not in your PATH
 QMAKE = qmake
-#eg:
+#e.g.:
 #QMAKE = C:/Qt-4.4.3/bin/qmake
-#if you want to use a non-standard spec use something like this:
-#QMAKE = qmake -spec win32-g++
 
-#change this if doxygen uses a different name or is not in your PATH
-DOXYGEN = doxygen
+#change this to introduce different options to qmake
+QOPT = CONFIG+=release
+#e.g.:
+#QOPT = CONFIG+=debug -spec win32-g++
+
+#this builds the installation package
+NSIS = makensis
+
+#set this to pass additional options to nsis
+NOPT = 
 
 ###########################################################
 # END OF CONFIGURATION
 # No editable content below this line
 ###########################################################
 
-all: server client
+all: dist
 
 wob: woc
-       cd wob ; ../pack/woc/woc magicsmoke.wolf
+       cd wob && ..\pack\woc\woc magicsmoke.wolf
 
 woc:
-       cd pack/woc ; $(QMAKE)
-       cd pack/woc ; $(MAKE)
+       cd pack/woc && $(QMAKE) $(QOPT)
+       cd pack/woc && $(MAKE)
 
 server: wob
 
-client: wob zip
-       cd src ; $(QMAKE)
-       cd src ; $(MAKE)
+client: wob zip qwbase
+       cd src && $(QMAKE) $(QOPT)
+       cd src && $(MAKE)
 
 zip:
-       cd zip ; $(QMAKE)
-       cd zip ; $(MAKE)
+       cd zip && $(QMAKE) $(QOPT)
+       cd zip && $(MAKE)
 
-dist:
-       @echo Distribution not implemented yet
+qwbase:
+       cd pack/qtbase && $(QMAKE) $(QOPT)
+       cd pack/qtbase && $(MAKE)
 
-sdoc:
-       $(DOXYGEN) Doxyfile-php
-       $(DOXYGEN) Doxyfile-cpp
+dist: client
+       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 sdoc zip
+.PHONY: woc wob server client zip

diff --git a/smoke.nsi b/smoke.nsi
index 09a0370..558b288 100644 (file)
--- a/smoke.nsi
+++ b/smoke.nsi
@@ -5,15 +5,15 @@
 ; HM NIS Edit Wizard helper defines\r
 !define SMOKEEXE "msmoke.exe"\r
 !define PRODUCT_NAME "MagicSmoke"\r
-!define PRODUCT_VERSION "0.1"\r
+!define PRODUCT_VERSION "2.0 beta"\r
 !define PRODUCT_PUBLISHER "MagicSmoke Project"\r
 !define PRODUCT_WEB_SITE "http://silmor.de"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${SMOKEEXE}"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"\r
-!define QTDIR "C:\krosenba\qt"\r
-!define MINGWDIR "C:\MinGW"\r
+!include "qtpath.nsh"\r
+!define MINGWDIR "$QTDIR\..\MinGW"\r
 \r
 ; MUI 1.67 compatible ------\r
 !include "MUI.nsh"\r