Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
27d40d543e
|
@ -127,37 +127,6 @@ message(MOC_DIR: $$MOC_DIR)
|
|||
message(OBJECTS_DIR: $$OBJECTS_DIR)
|
||||
message(RCC_DIR: $$RCC_DIR)
|
||||
|
||||
win32 {
|
||||
|
||||
CONFIG(release, debug|release) {
|
||||
DESTLIB_PATH = $${PWD}/../../../../sdk/lib/win/$${MY_ARCH}/$${MY_CONFIGURE}/
|
||||
DESTLIB_PATH = $$replace(DESTLIB_PATH, /, \\)
|
||||
message(DESTLIB_PATH: $$DESTLIB_PATH)
|
||||
DESTDLL_PATH = $${PWD}/../../../../release/win/$${MY_ARCH}/$${MY_CONFIGURE}/
|
||||
DESTDLL_PATH = $$replace(DESTDLL_PATH, /, \\)
|
||||
message(DESTDLL_PATH: $$DESTDLL_PATH)
|
||||
DESTHEADER_PATH = $${PWD}/../../../../sdk/include/saneui/
|
||||
DESTHEADER_PATH = $$replace(DESTHEADER_PATH, /, \\)
|
||||
message(DESTHEADER_PATH: $$DESTHEADER_PATH)
|
||||
|
||||
SRCLIB_FILE = $${DESTDIR}/$${TARGET}.lib
|
||||
SRCLIB_FILE = $$replace(SRCLIB_FILE, /, \\)
|
||||
message(SRCLIB_FILE: $$SRCLIB_FILE)
|
||||
SRCDLL_FILE = $${DESTDIR}/$${TARGET}.dll
|
||||
SRCDLL_FILE = $$replace(SRCDLL_FILE, /, \\)
|
||||
message(SRCDLL_FILE: $$SRCDLL_FILE)
|
||||
SRCHEADER_FILE = $${PWD}/../../../modules/saneui/HGSaneUI.h
|
||||
SRCHEADER_FILE = $$replace(SRCHEADER_FILE, /, \\)
|
||||
message(SRCHEADER_FILE: $$SRCHEADER_FILE)
|
||||
SRCPDB_FILE = $${DESTDIR}/$${TARGET}.pdb
|
||||
SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\)
|
||||
message(SRCPDB_FILE: $$SRCPDB_FILE)
|
||||
|
||||
QMAKE_POST_LINK += xcopy /y $$SRCLIB_FILE $$DESTLIB_PATH && xcopy /y $$SRCDLL_FILE $$DESTDLL_PATH \
|
||||
&& xcopy /y $$SRCHEADER_FILE $$DESTHEADER_PATH && xcopy /y $$SRCPDB_FILE $$DESTDLL_PATH
|
||||
}
|
||||
}
|
||||
|
||||
unix {
|
||||
|
||||
CONFIG(release, debug|release) {
|
||||
|
|
|
@ -133,9 +133,6 @@ win32 {
|
|||
DESTDLL_PATH = $${PWD}/../../../../release/win/$${MY_ARCH}/$${MY_CONFIGURE}/
|
||||
DESTDLL_PATH = $$replace(DESTDLL_PATH, /, \\)
|
||||
message(DESTDLL_PATH: $$DESTDLL_PATH)
|
||||
DESTHEADER_PATH = $${PWD}/../../../../sdk/include/twain_user/
|
||||
DESTHEADER_PATH = $$replace(DESTHEADER_PATH, /, \\)
|
||||
message(DESTHEADER_PATH: $$DESTHEADER_PATH)
|
||||
|
||||
SRCLIB_FILE = $${DESTDIR}/$${TARGET}.lib
|
||||
SRCLIB_FILE = $$replace(SRCLIB_FILE, /, \\)
|
||||
|
@ -143,14 +140,11 @@ win32 {
|
|||
SRCDLL_FILE = $${DESTDIR}/$${TARGET}.dll
|
||||
SRCDLL_FILE = $$replace(SRCDLL_FILE, /, \\)
|
||||
message(SRCDLL_FILE: $$SRCDLL_FILE)
|
||||
SRCHEADER_FILE = $${PWD}/../../../modules/twain_user/*.h
|
||||
SRCHEADER_FILE = $$replace(SRCHEADER_FILE, /, \\)
|
||||
message(SRCHEADER_FILE: $$SRCHEADER_FILE)
|
||||
SRCPDB_FILE = $${DESTDIR}/$${TARGET}.pdb
|
||||
SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\)
|
||||
message(SRCPDB_FILE: $$SRCPDB_FILE)
|
||||
|
||||
QMAKE_POST_LINK += xcopy /y $$SRCLIB_FILE $$DESTLIB_PATH && xcopy /y $$SRCDLL_FILE $$DESTDLL_PATH \
|
||||
&& xcopy /y $$SRCHEADER_FILE $$DESTHEADER_PATH && xcopy /y $$SRCPDB_FILE $$DESTDLL_PATH
|
||||
&& xcopy /y $$SRCPDB_FILE $$DESTDLL_PATH
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue