fix qmake dependencies. still need to make clean before each build though.

diff --git a/WindEmu.pro b/WindEmu.pro
index 06d7ce5c5df44e2296bc085f0488f7ead387ba7a..2416460362e6161243b340224cf657e600b0c9ba 100644 (file)
--- a/WindEmu.pro
+++ b/WindEmu.pro
@@ -5,3 +5,5 @@ CONFIG += console
 SUBDIRS += \
     WindQt \
     WindCore
+
+WindQt.depends = WindCore
\ No newline at end of file

diff --git a/WindQt/WindQt.pro b/WindQt/WindQt.pro
index 9bab13161d84dacf17d5872830f575265776ecc0..a1b13fad56e35acb48983fd81ccab6b4edbe019f 100644 (file)
--- a/WindQt/WindQt.pro
+++ b/WindQt/WindQt.pro
@@ -46,9 +46,3 @@ else:unix: LIBS += -L$$OUT_PWD/../WindCore/ -lWindCore
 
 INCLUDEPATH += $$PWD/../WindCore
 DEPENDPATH += $$PWD/../WindCore
-
-win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../WindCore/release/libWindCore.a
-else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../WindCore/debug/libWindCore.a
-else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../WindCore/release/WindCore.lib
-else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../WindCore/debug/WindCore.lib
-else:unix: PRE_TARGETDEPS += $$OUT_PWD/../WindCore/libWindCore.a