Fixing windows compilation for test VS/MinGW

nuttyartist · Jun 3, 2016 · 73c671b · 73c671b
1 parent e731eb5
commit 73c671b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 31 deletions.
diff --git a/src/Notes.pro b/src/Notes.pro
@@ -21,8 +21,8 @@ SOURCES += \
     notemodel.cpp \
     noteview.cpp \
     singleinstance.cpp \
-    ../3rdParty/qxt/qxtglobalshortcut.cpp \
-    ../3rdParty/qxt/qxtglobal.cpp
+    ../3rdParty/qxt/qxtglobal.cpp \
+    ../3rdParty/qxt/qxtglobalshortcut.cpp
 
 HEADERS  += \
     mainwindow.h \
@@ -31,9 +31,9 @@ HEADERS  += \
     notemodel.h \
     noteview.h \
     singleinstance.h \
-    ../3rdParty/qxt/qxtglobalshortcut_p.h \
+    ../3rdParty/qxt/qxtglobal.h \
     ../3rdParty/qxt/qxtglobalshortcut.h \
-    ../3rdParty/qxt/qxtglobal.h
+    ../3rdParty/qxt/qxtglobalshortcut_p.h
 
 FORMS    += mainwindow.ui
 
@@ -67,6 +67,7 @@ macx{
 
 win32 {
     SOURCES += ../3rdParty/qxt/qxtglobalshortcut_win.cpp
+    LIBS+= -luser32
     DESTDIR = ../bin
     RC_FILE = images\notes.rc
     DEFINES += QXT_STATIC

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -13,35 +13,10 @@ CONFIG   -= app_bundle
 TEMPLATE = app
 
 unix:!mac{
-LIBS += \
-        ../src/OBJ/qxtglobalshortcut_x11.o      \
-        -lX11
+LIBS += -lX11
 }
 
-macx{
-LIBS += \
-        ../src/OBJ/qxtglobalshortcut_mac.o
-}
-
-win32{
-LIBS += \
-        ../src/OBJ/qxtglobalshortcut_win.o
-}
-
-LIBS += ../src/OBJ/qxtglobal.o                  \
-        ../src/OBJ/qxtglobalshortcut.o          \
-        ../src/OBJ/moc_qxtglobalshortcut.o      \
-        ../src/OBJ/moc_singleinstance.o         \
-        ../src/OBJ/singleinstance.o             \
-        ../src/OBJ/moc_notedata.o               \
-        ../src/OBJ/notedata.o                   \
-        ../src/OBJ/moc_noteview.o               \
-        ../src/OBJ/noteview.o                   \
-        ../src/OBJ/notemodel.o                  \
-        ../src/OBJ/moc_notewidgetdelegate.o     \
-        ../src/OBJ/notewidgetdelegate.o         \
-        ../src/OBJ/mainwindow.o                 \
-        ../src/OBJ/moc_mainwindow.o
+DEPENDPATH += ../src/OBJ
 
 HEADERS += \
     tst_mainwindow.h \