add ELAM to libs

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

diff --git a/Makefile.mingw b/Makefile.mingw
index da785e6..70179b1 100644 (file)
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -45,7 +45,7 @@ woc:
 
 server: wob
 
-client: wob zip qwbase tzone
+client: wob zip qwbase tzone elam
        cd src && $(QMAKE) $(QOPT)
        cd src && $(MAKE)
 
@@ -61,6 +61,10 @@ tzone:
        cd tzone && $(QMAKE) $(QOPT)
        cd tzone && $(MAKE)
 
+elam:
+       cd elam/src && $(QMAKE) $(QOPT)
+       cd elam/src && $(MAKE)
+
 #script stuff: depends on generated CPP files
 script: qtscript/generated_cpp
        cd qtscript/qtbindings && $(QMAKE) && $(MAKE) release

diff --git a/Makefile.unix b/Makefile.unix
index 13e9e86..d3bfa31 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -41,9 +41,12 @@ woc:
 wbase:
        cd pack/qtbase; $(QMAKE) && $(MAKE)
 
+elam:
+       cd elam/src; $(QMAKE) && $(MAKE)
+
 server: wob
 
-client: wob zip wbase tzone
+client: wob zip wbase tzone elam
        cd src ; $(QMAKE) && $(MAKE)
 
 zip:

diff --git a/src/libs.pri b/src/libs.pri
index cba5f01..d2ec1d8 100644 (file)
--- a/src/libs.pri
+++ b/src/libs.pri
@@ -11,3 +11,7 @@ INCLUDEPATH += ../pack/qtbase/include
 # Time Zone DB library
 LIBS += -L../tzone -ltzdata
 INCLUDEPATH += ../tzone/include
+
+# ELAM library
+LIBS += -L../elam -lelam
+INCLUDEPATH += ../elam/src