Merge branch 'master' of http://192.168.100.140:8099/sane/code_app
This commit is contained in:
commit
a11f9c864d
|
@ -26,7 +26,7 @@ win32 {
|
|||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
contains(QT_ARCH, i386) {
|
||||
LIBS += -L../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
|
||||
LIBS += -L../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc -lsane
|
||||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../release/win/x86/Release/
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ win32 {
|
|||
}
|
||||
}
|
||||
else {
|
||||
LIBS += -L../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
|
||||
LIBS += -L../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc -lsane
|
||||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../../../release/win/x64/Release/
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue