Index: gui/gui.pro =================================================================== --- gui/gui.pro (revision 63) +++ gui/gui.pro (working copy) @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . build src ui -INCLUDEPATH += . src/QPropertyEditor ../proxy +INCLUDEPATH += . src/QPropertyEditor ../proxy/src DESTDIR = bin OBJECTS_DIR = build MOC_DIR = build @@ -9,25 +9,36 @@ QMAKE_LIBDIR += lib QT = gui core CONFIG += qt warn_on console debug + +# rule for creating the proxy dll file +proxy.commands = @$(MAKE) -C ../proxy shared +QMAKE_EXTRA_TARGETS += proxy +PRE_TARGETDEPS += proxy + HEADERS += src/wpsdrawer.h \ - ../proxy/api.h \ - ../proxy/defs.h \ + ../proxy/src/api.h \ + ../proxy/src/defs.h \ src/sliderimpl.h \ src/QMp3State.h \ src/QWpsState.h \ src/QWpsEditorWindow.h + FORMS += ui/mainwindow.ui ui/slider.ui + SOURCES += src/main.cpp \ src/wpsdrawer.cpp \ src/sliderimpl.cpp \ src/QMp3State.cpp \ src/QWpsState.cpp \ src/QWpsEditorWindow.cpp + LIBS += -Lbin -lproxy + CONFIG(debug, debug|release) { LIBS += -lQPropertyEditord TARGET = guid } + CONFIG(release, debug|release) { LIBS += -lQPropertyEditor TARGET = gui Index: gui/src/QMp3State.cpp =================================================================== --- gui/src/QMp3State.cpp (revision 63) +++ gui/src/QMp3State.cpp (working copy) @@ -1,6 +1,6 @@ #include "QMp3State.h" #include -#include "wpsstate.h" + // QMp3State::QMp3State( ) : QObject() Index: gui/src/wpsdrawer.h =================================================================== --- gui/src/wpsdrawer.h (revision 63) +++ gui/src/wpsdrawer.h (working copy) @@ -3,7 +3,7 @@ // #include #include -#include "../../proxy/api.h" +#include "api.h" #include "qmp3state.h" #include "qwpsstate.h" // Index: wpseditor.pro =================================================================== --- wpseditor.pro (revision 0) +++ wpseditor.pro (revision 0) @@ -0,0 +1,2 @@ +SUBDIRS = gui/src/QPropertyEditor gui +TEMPLATE = subdirs \ No newline at end of file