diff options
| -rw-r--r-- | src/qmmp/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/qmmp/constants.h | 4 | ||||
| -rw-r--r-- | src/qmmp/qmmp.pro | 26 | ||||
| -rw-r--r-- | src/qmmpui/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qmmpui/general.cpp | 1 | ||||
| -rw-r--r-- | src/qmmpui/qmmpui.pro | 32 | ||||
| -rw-r--r-- | src/ui/ui.pro | 2 |
7 files changed, 21 insertions, 62 deletions
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index ddabdb1f8..fe7cd30da 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -9,10 +9,10 @@ include(${QT_USE_FILE}) # qt lib ADD_DEFINITIONS( -Wall ) ADD_DEFINITIONS(${QT_DEFINITIONS}) -#ADD_DEFINITIONS(-DQT_PLUGIN) ADD_DEFINITIONS(-DQT_NO_DEBUG) ADD_DEFINITIONS(-DQT_SHARED) ADD_DEFINITIONS(-DQT_THREAD) +ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\") include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -55,14 +55,6 @@ QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES config.h) - -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#ifndef CONFIG_H\"" > ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define CONFIG_H\"" >> ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define LIB_DIR \\\"/${LIB_DIR}\\\"\"" >> ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#endif\"" >> ./config.h) - - ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) target_link_libraries(qmmp ${QT_LIBRARIES} curl) install(TARGETS qmmp LIBRARY DESTINATION ${LIB_DIR}) diff --git a/src/qmmp/constants.h b/src/qmmp/constants.h index ee558f3a9..caf9f91b8 100644 --- a/src/qmmp/constants.h +++ b/src/qmmp/constants.h @@ -1,10 +1,6 @@ #ifndef CONSTANTS_H #define CONSTANTS_H -#ifdef Q_OS_UNIX -#include "config.h" -#endif - #define VERSION "0.2.0" #ifndef LIB_DIR diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index a583cd45b..6c2bc3aa0 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -1,8 +1,3 @@ -# ???? ?????? ? KDevelop ?????????? qmake. -# ------------------------------------------- -# ?????????? ???????????? ???????? ???????? ???????: ./libs -# ???? - ??????????: nnp - include(../../qmmp.pri) HEADERS += recycler.h \ @@ -21,8 +16,8 @@ HEADERS += recycler.h \ downloader.h \ visual.h \ visualfactory.h \ - effect.h \ - effectfactory.h + effect.h \ + effectfactory.h SOURCES += recycler.cpp \ decoder.cpp \ output.cpp \ @@ -34,7 +29,7 @@ SOURCES += recycler.cpp \ downloader.cpp \ filetag.cpp \ visual.cpp \ - effect.cpp + effect.cpp TARGET = ../../lib/qmmp CONFIG += release \ @@ -46,21 +41,12 @@ link_pkgconfig TEMPLATE = lib PKGCONFIG += libcurl -isEmpty(LIB_DIR){ +unix:isEmpty(LIB_DIR){ LIB_DIR = /lib } -unix { - LINE1 = $$sprintf(echo \"%1ifndef CONFIG_H\" > ./config.h, $$LITERAL_HASH) - LINE2 = $$sprintf(echo \"%1define CONFIG_H\" >> ./config.h, $$LITERAL_HASH) - LINE3 = $$sprintf(echo \"%1define LIB_DIR \\\"%2\\\"\" >> ./config.h, $$LITERAL_HASH, $$LIB_DIR) - LINE4 = $$sprintf(echo \"%1endif\" >> ./config.h, $$LITERAL_HASH) - system($$LINE1) - system($$LINE2) - system($$LINE3) - system($$LINE4) - QMAKE_CLEAN = ./config.h -} +unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\" target.path = $$LIB_DIR INSTALLS += target +DESTDIR = . diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index adf003264..613b67c5f 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -12,6 +12,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(-DQT_NO_DEBUG) ADD_DEFINITIONS(-DQT_SHARED) ADD_DEFINITIONS(-DQT_THREAD) +ADD_DEFINITIONS(-DLIB_DIR=\\\"\\/${LIB_DIR}\\\") include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -34,13 +35,6 @@ QT4_WRAP_CPP(libqmmpui_MOC_SRCS ${libqmmpui_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES config.h) - -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#ifndef CONFIG_H\"" > ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define CONFIG_H\"" >> ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#define LIB_DIR \\\"/${LIB_DIR}\\\"\"" >> ./config.h) -EXEC_PROGRAM(echo ${CMAKE_CURRENT_BINARY_DIR} ARGS "\"#endif\"" >> ./config.h) - ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_MOC_SRCS}) target_link_libraries(qmmpui ${QT_LIBRARIES}) diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp index fed8221b4..e3153c534 100644 --- a/src/qmmpui/general.cpp +++ b/src/qmmpui/general.cpp @@ -23,7 +23,6 @@ #include <QList> #include <QApplication> -#include "config.h" #include "general.h" diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro index 79f1d285b..db64c7198 100644 --- a/src/qmmpui/qmmpui.pro +++ b/src/qmmpui/qmmpui.pro @@ -4,37 +4,29 @@ TARGET = ../../lib/qmmpui CONFIG += release \ warn_on \ qt \ -thread +thread TEMPLATE = lib -isEmpty(LIB_DIR){ +unix:isEmpty(LIB_DIR){ LIB_DIR = /lib } -unix { - LINE1 = $$sprintf(echo \"%1ifndef CONFIG_H\" > ./config.h, $$LITERAL_HASH) - LINE2 = $$sprintf(echo \"%1define CONFIG_H\" >> ./config.h, $$LITERAL_HASH) - LINE3 = $$sprintf(echo \"%1define LIB_DIR \\\"%2\\\"\" >> ./config.h, $$LITERAL_HASH, $$LIB_DIR) - LINE4 = $$sprintf(echo \"%1endif\" >> ./config.h, $$LITERAL_HASH) - system($$LINE1) - system($$LINE2) - system($$LINE3) - system($$LINE4) - QMAKE_CLEAN = ./config.h -} +unix:DEFINES += LIB_DIR=\\\"$$LIB_DIR\\\" target.path = $$LIB_DIR INSTALLS += target HEADERS += general.h \ -generalfactory.h \ - generalhandler.h \ - songinfo.h \ - control.h + generalfactory.h \ + generalhandler.h \ + songinfo.h \ + control.h SOURCES += general.cpp \ - generalhandler.cpp \ - songinfo.cpp \ - control.cpp + generalhandler.cpp \ + songinfo.cpp \ + control.cpp + +DESTDIR = . diff --git a/src/ui/ui.pro b/src/ui/ui.pro index 51cc45a05..7163b2846 100644 --- a/src/ui/ui.pro +++ b/src/ui/ui.pro @@ -139,7 +139,7 @@ target.path = /bin INSTALLS += target -#RESOURCES += translations/qmmp_locales.qrc +RESOURCES += translations/qmmp_locales.qrc TRANSLATIONS = translations/qmmp_ru.ts \ translations/qmmp_tr.ts \ |