pidgin/quail/quail-redux

Improve the project file for windows

2013-10-09, Phil Hannent
41ce47a8e50b
Parents e1ecfdd3c20a
Children 12e52b5b1d53
Improve the project file for windows
4 files changed, 23 insertions(+), 28 deletions(-)
  • +21 -23
    Quail-redux.pro
  • +1 -1
    src/QuailWinGlibEventLoop.h
  • +1 -1
    src/qsystemlibrary.h
  • +0 -3
    version.h
    • --- a/Quail-redux.pro Thu Oct 03 16:26:22 2013 +0100
    +++ b/Quail-redux.pro Wed Oct 09 11:53:08 2013 +0100
    @@ -7,7 +7,6 @@
    TEMPLATE = app
    TARGET = Quail
    -VERSION = $${APP_DISPLAY_VERSION}
    DEFINES += APP_NAME=\\\"Quail\\\"
    DEFINES += QUAIL_PREFS_ROOT=\\\"/quail\\\"
    @@ -24,16 +23,7 @@
    # DEFINES += BUILDTIME=\\\"$$system(date '+%H:%M.%s')\\\"
    # DEFINES += BUILDDATE=\\\"$$system(date '+%d/%m/%y')\\\"
    #}
    -QT += core gui
    -!android-g++ {
    - QT += webkit
    - greaterThan(QT_MAJOR_VERSION, 4) {
    - message("Using QT5")
    - DEFINES += USE_QT5
    - QT += widgets
    - QT += webkitwidgets
    - }
    -} else {
    +android-g++ {
    QT += widgets
    INCLUDEPATH += $(LIBPURPLE_ROOT)/../glib/glib
    INCLUDEPATH += $(LIBPURPLE_ROOT)/../glib
    @@ -43,10 +33,16 @@
    #INCLUDEPATH += $(LIBPURPLE_ROOT)/../win32-dev/gtk_2_0-2.14/include/glib-2.0/include
    #INCLUDEPATH += $(LIBPURPLE_ROOT)/../win32-dev/gtk_2_0-2.14/lib/glib-2.0/include
    INCLUDEPATH += $(LIBPURPLE_ROOT)
    +} else {
    + QT += webkit
    + greaterThan(QT_MAJOR_VERSION, 4) {
    + message("Using QT5")
    + DEFINES += USE_QT5
    + QT += widgets
    + QT += webkitwidgets
    + }
    }
    -CONFIG = qt warn_on debug_and_release
    -
    DISTFILES = \
    AUTHORS \
    ChangeLog \
    @@ -56,13 +52,16 @@
    linux-g++* {
    message("Using unix")
    + CONFIG += debug_and_release
    CONFIG += link_pkgconfig
    PKGCONFIG += purple glib-2.0 gmodule-2.0
    +
    }
    win32-g++* {
    message("Using win32")
    - HEADERS += src/quailtimerinfolist.h \
    + HEADERS += version.h \
    + src/quailtimerinfolist.h \
    src/qsystemlibrary.h \
    src/QuailWinGlibEventLoop.h \
    src/quailglibthread.h
    @@ -72,17 +71,16 @@
    src/QuailWinGlibEventLoop.cpp \
    src/quailglibthread.cpp
    - RC_FILE = resource.rc
    + #RC_FILE = resource.rc
    - LIBS += -llibpurple -lglib-2.0 -lgmodule-2.0
    - INCLUDEPATH += $(LIBPURPLE_ROOT)/../win32-dev/gtk_2_0-2.14/include/glib-2.0
    - INCLUDEPATH += $(LIBPURPLE_ROOT)/../win32-dev/gtk_2_0-2.14/include/glib-2.0/include
    - INCLUDEPATH += $(LIBPURPLE_ROOT)/../win32-dev/gtk_2_0-2.14/lib/glib-2.0/include
    - INCLUDEPATH += $(LIBPURPLE_ROOT)
    + INCLUDEPATH += "C:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0"
    + INCLUDEPATH += "C:/dev/win32-dev/gtk_2_0-2.14/include/glib-2.0/include"
    + INCLUDEPATH += "C:/dev/win32-dev/gtk_2_0-2.14/lib/glib-2.0/include"
    + INCLUDEPATH += "$(LIBPURPLE_ROOT)"
    INCLUDEPATH += $(QTDIR)/include
    - LIBS += -L"$(LIBPURPLE_ROOT)/../win32-dev/gtk-2.24.10/lib"
    - LIBS += -L"$(LIBPURPLE_ROOT)/libpurple"
    - LIBS += -L"$(QTDIR)/lib"
    + LIBS += -L"$(LIBPURPLE_ROOT)/../win32-dev/gtk-2.24.10/lib" -lglib-2.0 -lgmodule-2.0
    + LIBS += -L"$(LIBPURPLE_ROOT)/libpurple" -llibpurple
    + #LIBS += -L"$(QTDIR)/lib"
    LIBS += -lws2_32
    TARGET = bin/Quail
    }
    --- a/src/QuailWinGlibEventLoop.h Thu Oct 03 16:26:22 2013 +0100
    +++ b/src/QuailWinGlibEventLoop.h Wed Oct 09 11:53:08 2013 +0100
    @@ -2,7 +2,7 @@
    #define QUAILWINGLIBEVENTLOOP_H
    #include <winsock2.h>
    -#include "QtCore/qt_windows.h"
    +//#include "QtCore/qt_windows.h"
    //#include "QtCore/qcoreevent.h"
    #include <QAbstractEventDispatcher>
    #include <QCoreApplication>
    --- a/src/qsystemlibrary.h Thu Oct 03 16:26:22 2013 +0100
    +++ b/src/qsystemlibrary.h Wed Oct 09 11:53:08 2013 +0100
    @@ -42,7 +42,7 @@
    #ifndef QSYSTEMLIBRARY_P_H
    #define QSYSTEMLIBRARY_P_H
    -#include <QtCore/qglobal.h>
    +//#include <QtCore/qglobal.h>
    #ifdef Q_OS_WIN
    # include <QtCore/qstring.h>
    # include <qt_windows.h>
    --- a/version.h Thu Oct 03 16:26:22 2013 +0100
    +++ b/version.h Wed Oct 09 11:53:08 2013 +0100
    @@ -2,10 +2,7 @@
    #define VERSION_H
    #define VER_FILEVERSION 0,1,0,0
    -#define VER_FILEVERSION_STR "0.1.0.0\0"
    -
    #define VER_PRODUCTVERSION 0,1,0,0
    -#define VER_PRODUCTVERSION_STR "0.1.0\0"
    #define VER_COMPANYNAME_STR "Phil Hannent"
    #define VER_FILEDESCRIPTION_STR "Instant Messaging Software"