diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-04-09 11:36:24 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-04-09 11:36:24 +0000 |
| commit | 8bfea81fde39d1c54123473e6254f28cc61a940c (patch) | |
| tree | 632071b4b66f9abd7627625605324f79dd9feeec | |
| parent | d9ad753e7fd489a4e34760ff61ad1a7d957a29b3 (diff) | |
| download | qmmp-8bfea81fde39d1c54123473e6254f28cc61a940c.tar.gz qmmp-8bfea81fde39d1c54123473e6254f28cc61a940c.tar.bz2 qmmp-8bfea81fde39d1c54123473e6254f28cc61a940c.zip | |
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@897 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | clear_qmake.cmd | 2 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/qmmp.pro | 15 |
3 files changed, 14 insertions, 5 deletions
diff --git a/clear_qmake.cmd b/clear_qmake.cmd index 34c753fa3..d3ff5a409 100644 --- a/clear_qmake.cmd +++ b/clear_qmake.cmd @@ -1,2 +1,4 @@ make distclean
for /r %%B in (*.qm) do del /s /q %%B
+for /r %%B in (*.dll) do del /s /q %%B
+for /r %%B in (*.a) do del /s /q %%B
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index a9916887b..28b5dd0f8 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -27,7 +27,7 @@ #endif #ifndef LIB_DIR -#define "/lib" +#define LIB_DIR "/lib" #endif #include "qmmp.h" diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index 139b3825b..f88868c3f 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -1,4 +1,5 @@ -include(../../qmmp.pri) +unix:include(../../qmmp.pri) +win32:include(../../qmmp.pri) HEADERS += recycler.h \ buffer.h \ @@ -37,8 +38,10 @@ SOURCES += recycler.cpp \ fileinfo.cpp \ volumecontrol.cpp -TARGET = ../../lib/qmmp +unix:TARGET = ../../lib/qmmp +win32:TARGET = ../../../bin/qmmp CONFIG += release \ +shared \ warn_on \ qt \ thread \ @@ -46,7 +49,8 @@ link_pkgconfig TEMPLATE = lib VERSION = $$QMMP_VERSION -PKGCONFIG += libcurl +unix:PKGCONFIG += libcurl +win32:LIBS += -lcurldll unix : isEmpty(LIB_DIR){ LIB_DIR = /lib @@ -57,9 +61,11 @@ DEFINES += QMMP_VERSION=$$QMMP_VERSION DEFINES += QMMP_STR_VERSION=\\\"$$QMMP_VERSION\\\" contains(CONFIG, SVN_VERSION){ - DEFINES += SVN_REVISION=\\\"$$system(./svn_revision.sh)\\\" + unix:DEFINES += SVN_REVISION=\\\"$$system(./svn_revision.sh)\\\" + win32:DEFINES += SVN_REVISION=\\\"svn\\\" } +unix { target.path = $$LIB_DIR devel.files += buffer.h \ @@ -83,3 +89,4 @@ devel.path = /include/qmmp INSTALLS += target devel DESTDIR = . +} |