Buildsystem fixes for mingw cross compiling

This commit is contained in:
David Sansome 2010-02-13 18:58:01 +00:00
parent f0ad94ce71
commit 9baf5483e7
2 changed files with 15 additions and 8 deletions

View File

@ -124,7 +124,7 @@ RESOURCES += ../data/data.qrc
OTHER_FILES += ../data/schema.sql \
../data/mainwindow.css
LIBS += -llastfm
!win32 {
!win32:!fedora-win32-cross {
mac {
QMAKE_CXXFLAGS += -I/usr/local/include
LIBS += -L/usr/local/lib \
@ -142,16 +142,16 @@ LIBS += -llastfm
LIBS += $$system(pkg-config --libs libnotify)
}
}
win32:LIBS += -ltag \
win32|fedora-win32-cross:LIBS += -ltag \
-lxine \
-lpthreadGC2
unix:!macx:SOURCES += osd_x11.cpp
unix:!macx:!fedora-win32-cross:SOURCES += osd_x11.cpp
macx:SOURCES += osd_mac.cpp
win32:SOURCES += osd_win.cpp
win32|fedora-win32-cross:SOURCES += osd_win.cpp
# QXT
INCLUDEPATH += ../3rdparty/qxt
unix:!macx: {
unix:!macx:!fedora-win32-cross: {
HEADERS += ../3rdparty/qxt/qxtglobalshortcut.h
HEADERS += ../3rdparty/qxt/qxtglobalshortcut_p.h
HEADERS += ../3rdparty/qxt/qxtglobal.h
@ -171,8 +171,15 @@ SOURCES += ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
SOURCES += ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
SOURCES += ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile.cpp
unix:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
win32:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_win.cpp
unix:!fedora-win32-cross:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
win32|fedora-win32-cross:SOURCES += ../3rdparty/qtsingleapplication/qtlockedfile_win.cpp
# Hide the console on windows
win32|fedora-win32-cross: {
CONFIG -= console
CONFIG += windows
LIBS += -Wl,-subsystem,windows
}
# Installs
target.path = $${install_prefix}/bin/

View File

@ -118,7 +118,7 @@ XineEngine::init()
qDebug() << "'Bringing joy to small mexican gerbils, a few weeks at a time.'";
#ifdef Q_OS_WIN32
putenv(QString("XINE_PLUGIN_PATH" + QCoreApplication::applicationDirPath() + "/xine/plugins").toAscii().constData());
putenv(QString("XINE_PLUGIN_PATH=" + QCoreApplication::applicationDirPath() + "/xine/plugins").toAscii().constData());
#endif // Q_OS_WIN32
#ifdef Q_OS_DARWIN