# HG changeset patch # User Chris Cannam # Date 1373910026 -3600 # Node ID ab10f175b4cbf52bb419a9a7bba613af7e6ae722 # Parent 6e01e3d649754da7c2fc5da8537bcd52486df1b9 Win32 build stuff diff -r 6e01e3d64975 -r ab10f175b4cb platform-dataquay.pri --- a/platform-dataquay.pri Sat Jul 13 17:01:19 2013 +0100 +++ b/platform-dataquay.pri Mon Jul 15 18:40:26 2013 +0100 @@ -1,5 +1,7 @@ -include(./config.pri) +exists(config.pri) { + include(./config.pri) +} CONFIG += staticlib @@ -9,3 +11,8 @@ DEFINES += USE_SORD # Libraries and paths should be added by config.pri + +win32-g++: { + INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include + LIBS += -L../../sv-dependency-builds/win32-mingw/lib +} diff -r 6e01e3d64975 -r ab10f175b4cb src/main.cpp --- a/src/main.cpp Sat Jul 13 17:01:19 2013 +0100 +++ b/src/main.cpp Mon Jul 15 18:40:26 2013 +0100 @@ -138,7 +138,7 @@ signal(SIGINT, signalHandler); signal(SIGTERM, signalHandler); -#ifndef Q_WS_WIN32 +#ifndef Q_OS_WIN32 signal(SIGHUP, signalHandler); signal(SIGQUIT, signalHandler); #endif diff -r 6e01e3d64975 -r ab10f175b4cb tonyapp.pro --- a/tonyapp.pro Sat Jul 13 17:01:19 2013 +0100 +++ b/tonyapp.pro Mon Jul 15 18:40:26 2013 +0100 @@ -1,7 +1,24 @@ TEMPLATE = app -include(config.pri) +win32-g++ { + INCLUDEPATH += sv-dependency-builds/win32-mingw/include + LIBS += -Lsv-dependency-builds/win32-mingw/lib +} +win32-msvc* { + INCLUDEPATH += sv-dependency-builds/win32-msvc/include + LIBS += -Lsv-dependency-builds/win32-msvc/lib +} + +exists(config.pri) { + include(config.pri) +} +win* { + !exists(config.pri) { + DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0 + LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32 + } +} CONFIG += qt thread warn_on stl rtti exceptions QT += network xml gui widgets @@ -24,14 +41,26 @@ MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic } +win* { +MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$MY_LIBS +} + LIBS = $$MY_LIBS $$LIBS -win* { +win32-msvc* { PRE_TARGETDEPS += svapp/svapp.lib \ svgui/svgui.lib \ svcore/svcore.lib \ dataquay/dataquay.lib } + +win32-g++ { +PRE_TARGETDEPS += svapp/release/libsvapp.a \ + svgui/release/libsvgui.a \ + svcore/release/libsvcore.a \ + dataquay/release/libdataquay.a +} + !win* { PRE_TARGETDEPS += svapp/libsvapp.a \ svgui/libsvgui.a \