add scripting external

add scripting to default makefiles

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

diff --git a/Makefile.mingw b/Makefile.mingw
index c22c85e..ae0ef46 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,6 +31,9 @@ NOPT =
 # No editable content below this line
 ###########################################################
 
+QTDIR=$(shell $(QMAKE) -query QT_INSTALL_PREFIX)
+QTBIN=$(shell $(QMAKE) -query QT_INSTALL_BINS)
+
 all: dist
 
 wob: woc
@@ -54,7 +57,16 @@ qwbase:
        cd pack/qtbase && $(QMAKE) $(QOPT)
        cd pack/qtbase && $(MAKE)
 
-dist: client
+#script stuff: depends on generated CPP files
+script: qtscript/generated_cpp
+       cd qtscript/qtbindings && $(QMAKE) && $(MAKE) release
+
+#generated script plugins: depend on Qt version
+qtscript/generated_cpp: $(QTBIN)/qmake.exe
+       cd qtscript/generator && $(QMAKE) && $(MAKE)
+       cd qtscript/generator && set QTDIR=$(QTDIR) && ./generator
+
+dist: script client
        echo !define QTDIR \ >qtpath.nsh
        $(QMAKE) -query QT_INSTALL_PREFIX >>qtpath.nsh
        $(NSIS) $(NOPT) smoke.nsi

diff --git a/Makefile.unix b/Makefile.unix
index cb7157e..fdb9d0e 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -21,7 +21,10 @@ DOXYGEN = doxygen
 # No editable content below this line
 ###########################################################
 
-all: server client
+QTDIR=$(shell $(QMAKE) -query QT_INSTALL_PREFIX)
+QTBIN=$(shell $(QMAKE) -query QT_INSTALL_BINS)
+
+all: script server client
 
 wob: woc
        cd wob ; ../pack/woc/woc magicsmoke.wolf
@@ -40,6 +43,15 @@ client: wob zip wbase
 zip:
        cd zip ; $(QMAKE) && $(MAKE)
 
+#script stuff: depends on generated CPP files
+script: qtscript/generated_cpp
+       cd qtscript/qtbindings && $(QMAKE) && $(MAKE)
+
+#generated script plugins: depend on Qt version
+qtscript/generated_cpp: $(QTBIN)/qmake
+       cd qtscript/generator && $(QMAKE) && $(MAKE)
+       cd qtscript/generator && QTDIR=$(QTDIR) ./generator
+
 dist:
        @echo Distribution not implemented yet
 
@@ -58,4 +70,4 @@ clean:
 distclean: clean
 
 #tell Make that the rules above are symbolic:
-.PHONY: woc wob server client sdoc zip wbase clean distclean
+.PHONY: script woc wob server client sdoc zip wbase clean distclean