aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmmpui')
-rw-r--r--src/qmmpui/CMakeLists.txt8
-rw-r--r--src/qmmpui/general.cpp1
-rw-r--r--src/qmmpui/qmmpui.pro32
3 files changed, 13 insertions, 28 deletions
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 = .