adjust to libs being shared

diff --git a/.gitignore b/.gitignore
index c735a7f..0a64ccf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.kdev*
-libQZip.*
+libQtZip*.*
 Makefile*
 msmoke
 msmoke.exe

diff --git a/Makefile b/Makefile
index 14bb437..a9eff52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ client: wob zip tzone elam
        cd src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
 
 zip:
-       cd zip/src && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
+       cd zip && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
 
 tzone:
        cd tzone && $(QMAKE) $(QMAKEFLAGS) && $(MYMAKE)
@@ -150,11 +150,11 @@ install-doc: sdoc
        -rm -rf `find $(SPREFIX) -name .svn`
 
 clean:
-       -rm -rf zip/Makefile* zip/libQZip* zip/src/.ctmp
+       -rm -rf zip/Makefile* zip/libQZip* zip/.ctmp
        -rm -rf src/.ctmp src/Makefile* src/msmoke
        -rm -rf src/wob www/inc/wob doc/wob wob/core*
        $(MAKE) -C pack clean
-       -rm -rf tzone/zoneinfo* tzone/libtzdata* tzone/Makefile* tzone/.ctmp
+       -rm -rf tzone/zoneinfo* tzone/libQtTzData* tzone/Makefile* tzone/.ctmp
        -rm -rf doc/source-php doc/source-cpp
        -rm -rf `find . -name '*~'`
        -rm -rf `find . -name '*.bak'`
@@ -198,6 +198,10 @@ tgz-client: install-client
        cp -a $(QTDIR)/lib/libQtGui.s* dist-cli/lib/magicsmoke2
        cp -a $(QTDIR)/lib/libQtNetwork.s* dist-cli/lib/magicsmoke2
        cp -a $(QTDIR)/lib/libQtXml.s* dist-cli/lib/magicsmoke2
+       cp -a tzone/libQtTzData.s* dist-cli/lib/magicsmoke2
+       cp -a zip/libQtZipHelper.s* dist-cli/lib/magicsmoke2
+       cp -a elam/libelam.s* dist-cli/lib/magicsmoke2
+       cp -a pack/qtbase/libqwbase.s* dist-cli/lib/magicsmoke2
        cd dist-cli ; tar c . |gzip >../magicsmoke2-client.tar.gz
 
 tgz-doc: PREFIX=dist-srv

diff --git a/pack b/pack
index f1dbce1..53c34c1 160000 (submodule)
--- a/pack
+++ b/pack
@@ -1 +1 @@
-Subproject commit f1dbce1c0c2acf1dcd2eeea036b67064ae62ccd8
+Subproject commit 53c34c16932383dcd020fb3ec899820fc093fcd3

diff --git a/src/libs.pri b/src/libs.pri
index db1d9ef..2af4a63 100644 (file)
--- a/src/libs.pri
+++ b/src/libs.pri
@@ -1,7 +1,7 @@
 # Libraries for Magic Smoke by (c) Konrad Rosenbaum, 2007-2010
 
 # ZIP library
-LIBS += -L../zip -lQZip
+LIBS += -L../zip -lQtZipHelper
 INCLUDEPATH += ../zip/include
 
 # PACK library
@@ -9,7 +9,7 @@ LIBS += -L../pack/qtbase -lqwbase
 INCLUDEPATH += ../pack/qtbase/include
 
 # Time Zone DB library
-LIBS += -L../tzone -ltzdata
+LIBS += -L../tzone -lQtTzData
 INCLUDEPATH += ../tzone/include
 
 # ELAM library

diff --git a/src/main.cpp b/src/main.cpp
index db654a9..e215d1d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -129,7 +129,7 @@ void MApplication::versionDlg()
                        "<tr><td>Qt:<td>%11</tr>"
                        "<tr><td>ELAM:<td>%12</tr>"
                        "<tr><td>Time&nbsp;Zone&nbsp;Default:<td>%13 in directory %14<br/>version %15</tr>"
-                       "<tr><td>Time&nbsp;Zone&nbsp;Built-In:<td>%16</tr>"
+                       "<tr><td>Time&nbsp;Zone&nbsp;Built-In:<td>%16 (library: %17)</tr>"
                        "</table>"
                        )
                        .arg(htmlize(MSInterface::staticVersionInfo(WOb::VersionRootURL))) // %1
@@ -148,6 +148,7 @@ void MApplication::versionDlg()
                        .arg(unknown(tzf.dirName()))
                        .arg(unknown(tzf.version()))
                        .arg(TimeZoneLib::TZFile::builtinVersion()) //%16
+                       .arg(TimeZoneLib::TZFile::libraryVersion()) //%17
                );
        mb.setStandardButtons(QMessageBox::Ok);
        mb.exec();

diff --git a/src/msmoke.sh b/src/msmoke.sh
new file mode 100755 (executable)
index 0000000..4c987bc
--- /dev/null
+++ b/src/msmoke.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+#helper script that makes sure the correct libs are included
+
+echo "MagicSmoke development wrapper at work..."
+
+#detect Qt
+#test "x$QTDIR" == x && {
+#      which qmake >/dev/null && QTLIB=`qmake -query QT_INSTALL_LIBS` || QTLIB=/usr/local/Trolltech/Qt/lib
+#} || {
+#      QTLIB=$QTDIR/lib
+#}
+#echo "Using Qt from $QTLIB"
+
+#export path...
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}../elam:../zip:../tzone:../pack/qtbase
+
+echo "Lib path: $LD_LIBRARY_PATH"
+
+exec ./msmoke "$@"

diff --git a/src/smoke.pro b/src/smoke.pro
index af7e047..77ef006 100644 (file)
--- a/src/smoke.pro
+++ b/src/smoke.pro
@@ -8,12 +8,20 @@ TARGET = ../src/msmoke
 #CONFIG += release
 CONFIG += debug
 
+#Localization
+TRANSLATIONS = \
+       smoke_de.ts \
+       smoke_de_SAX.ts \
+       smoke_en.ts
+
+#make sure the correct Qt DLLs are used
 CONFIG += qt thread link_prl
 QT += xml network script scripttools
 contains(QT_MAJOR_VERSION,"5") {
  QT += widgets printsupport
 }
 
+#add the icon for windoze
 win32-* {
  #RC-File containing the icon:
  RC_FILE += win.rc
@@ -25,19 +33,15 @@ OBJECTS_DIR = .ctmp
 MOC_DIR = .ctmp
 RCC_DIR = .ctmp
 
-
+#main source files
 SOURCES = main.cpp
 HEADERS = main.h
 INCLUDEPATH += .
 
+#images
 RESOURCES += images/files.qrc
 
-TRANSLATIONS = \
-       smoke_de.ts \
-       smoke_de_SAX.ts \
-       smoke_en.ts
-
-
+#libraries, modules, stuff...
 include(libs.pri)
 include(widgets/widgets.pri)
 include(templates/templates.pri)

diff --git a/tzone b/tzone
index b0c0a26..968c00c 160000 (submodule)
--- a/tzone
+++ b/tzone
@@ -1 +1 @@
-Subproject commit b0c0a26fa8b498f2375c3bb20493e561be6aca36
+Subproject commit 968c00cf87fb14ec04c687ac8746cbefa8d9fb1a