fix: correct windows build depends path

Change-Id: If4c37fff25c45b5e997f1cb316422bf28bc75cd0
linuxdeepin · Sep 14, 2017 · 2c63323 · 2c63323
1 parent fcbab6f
commit 2c63323
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/app/app.pro b/src/app/app.pro
@@ -4,7 +4,7 @@ TEMPLATE  = app
 
 TARGET = deepin-boot-maker
 
-QT += core gui widgets concurrent network
+QT += core gui widgets concurrent network svg
 
 CONFIG += c++11
 

diff --git a/src/app/view/usbselectview.cpp b/src/app/view/usbselectview.cpp
@@ -14,7 +14,6 @@
 #include "widgetutil.h"
 #include "deviceinfoitem.h"
 #include "devicelistwidget.h"
-#include "dwaterprogress.h"
 
 #include <bminterface.h>
 

diff --git a/src/vendor/env.pri b/src/vendor/env.pri
@@ -14,9 +14,9 @@ DEFINES += STATIC_LIB
 INCLUDEPATH += $$PWD
 
 # Deepin tool kit
-DTK_INCLUDE = D:\Develop\Library\include\libdtk-1.2
-DTK_DEPEND  = D:\Develop\Library\include\libdtk-1.2
-DTK_LIBRARY = D:\Develop\Library\lib
+DTK_INCLUDE = $${INCLUDE_INSTALL_DIR}\libdtk-2.0
+DTK_DEPEND  = $${INCLUDE_INSTALL_DIR}\libdtk-2.0
+DTK_LIBRARY = $${LIB_INSTALL_DIR}
 }
 
 NO_BOOTLOADER=FALSE

diff --git a/src/vendor/src/libxsys/libxsys.pro b/src/vendor/src/libxsys/libxsys.pro
@@ -12,21 +12,26 @@ CONFIG += staticlib
 
 DEFINES += QT_MESSAGELOGCONTEXT
 
-SOURCES += DiskUtil/DiskUtil.cpp \
+SOURCES += \
+    DiskUtil/DiskUtil.cpp \
     Common/Result.cpp \
     Cmd/Cmd.cpp \
     FileSystem/FileSystem.cpp \
     DiskUtil/Syslinux.cpp
 
-HEADERS +=     XSys \
+HEADERS += \
+    XSys \
     DiskUtil/DiskUtil.h \
     Common/Result.h \
     Cmd/Cmd.h \
     FileSystem/FileSystem.h \
     DiskUtil/Syslinux.h
 
 unix {
-    target.path = /usr/lib
+isEmpty(PREFIX){
+    PREFIX = /usr
+}
+target.path = $${PREFIX}/lib/
 }