diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..4ee5378d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+################################################################################
+# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+################################################################################
+
+
+/third_party
+/build
+/build-qt
\ No newline at end of file
diff --git a/build-qt/windows/HGSolution/HGScanner.pro b/build-qt/windows/HGSolution/HGScanner.pro
index 47c6af58..ef12549b 100644
--- a/build-qt/windows/HGSolution/HGScanner.pro
+++ b/build-qt/windows/HGSolution/HGScanner.pro
@@ -21,17 +21,17 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
win32 {
contains(QT_ARCH, i386) {
- LIBS += -L../../../../Release/lib/windows/x86 -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
+ LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
CONFIG(release, debug|release) {
- DESTDIR = ../../../../Release/bin/windows/x86/
+ DESTDIR = ../../../../release/win/x86/Release/
}
CONFIG(debug, debug|release) {
}
} else {
- LIBS += -L../../../../Release/lib/windows/x64 -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
+ LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc -lhgsane
CONFIG(release, debug|release) {
- DESTDIR = ../../../../Release/bin/windows/x64/
+ DESTDIR = ../../../../release/win/x64/Release/
}
CONFIG(debug, debug|release) {
@@ -41,8 +41,7 @@ contains(QT_ARCH, i386) {
INCLUDEPATH += $$PWD/../../../ui/
INCLUDEPATH += $$PWD/../../../app/scanner/
-INCLUDEPATH += $$PWD/../../../../Release/include/
-INCLUDEPATH += $$PWD/../../../../Release/include/sane/
+INCLUDEPATH += $$PWD/../../../../sdk/include/
SOURCES += \
../../../app/scanner/app_cfg.cpp \
@@ -146,6 +145,7 @@ FORMS += \
TRANSLATIONS += \
../../../app/scanner/Scanner_zh_CN.ts
+ ../../../app/scanner/qt_zh_CN.ts
RESOURCES += \
../../../app/scanner/Scanner_resource.qrc
diff --git a/build/uos/aarch64/default.workspace b/build/uos/aarch64/default.workspace
index b15b522d..9c4f7129 100644
--- a/build/uos/aarch64/default.workspace
+++ b/build/uos/aarch64/default.workspace
@@ -4,8 +4,8 @@
-
+
diff --git a/build/uos/amd64/default.workspace b/build/uos/amd64/default.workspace
index b15b522d..9c4f7129 100644
--- a/build/uos/amd64/default.workspace
+++ b/build/uos/amd64/default.workspace
@@ -4,8 +4,8 @@
-
+
diff --git a/build/uos/mips64/default.workspace b/build/uos/mips64/default.workspace
index b15b522d..9c4f7129 100644
--- a/build/uos/mips64/default.workspace
+++ b/build/uos/mips64/default.workspace
@@ -4,8 +4,8 @@
-
+
diff --git a/build/windows/HGBase/HGBase.vcxproj b/build/windows/HGBase/HGBase.vcxproj
index 09c5dc83..8fa259d2 100644
--- a/build/windows/HGBase/HGBase.vcxproj
+++ b/build/windows/HGBase/HGBase.vcxproj
@@ -167,10 +167,11 @@
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\
-copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGBase.a
-copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\
+ copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGBase.a
+copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -218,10 +219,11 @@ copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\/LTCG %(AdditionalOptions)
- copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\
-copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGBase.a
-copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\
+ copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGBase.a
+copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/build/windows/HGImgFmt/HGImgFmt.vcxproj b/build/windows/HGImgFmt/HGImgFmt.vcxproj
index 1040ee48..863401b8 100644
--- a/build/windows/HGImgFmt/HGImgFmt.vcxproj
+++ b/build/windows/HGImgFmt/HGImgFmt.vcxproj
@@ -126,7 +126,7 @@
false
HGImgFmt.def
../Debug/HGBase.lib;../../../third_party/libjpeg/windows/lib/x86/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x86/libnsbmp.lib;../../../third_party/libpng/windows/lib/x86/libpng16.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libtiff/windows/lib/x86/tiff.lib;../../../third_party/mupdf/windows/lib/x86/libmupdf.lib;../../../third_party/pdflib/windows/lib/x86/pdflib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/tinyxml2/windows/lib/x86/tinyxml2d.lib;%(AdditionalDependencies)
- /ignore:4098,4075 /LTCG %(AdditionalOptions)
+ /ignore:4098,4099,4075 /LTCG %(AdditionalOptions)
@@ -150,13 +150,14 @@
false
HGImgFmt.def
../Release/HGBase.lib;../../../third_party/libjpeg/windows/lib/x86/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x86/libnsbmp.lib;../../../third_party/libpng/windows/lib/x86/libpng16.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libtiff/windows/lib/x86/tiff.lib;../../../third_party/mupdf/windows/lib/x86/libmupdf.lib;../../../third_party/pdflib/windows/lib/x86/pdflib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;../../../third_party/tinyxml2/windows/lib/x86/tinyxml2.lib;%(AdditionalDependencies)
- /LTCG %(AdditionalOptions)
+ /ignore:4099 /LTCG %(AdditionalOptions)
- copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\
-copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGImgFmt.a
-copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfmt\
+ copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGImgFmt.a
+copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -178,7 +179,7 @@ copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfm
false
HGImgFmt.def
../x64/Debug/HGBase.lib;../../../third_party/libjpeg/windows/lib/x64/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x64/libnsbmp.lib;../../../third_party/libpng/windows/lib/x64/libpng16.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libtiff/windows/lib/x64/tiff.lib;../../../third_party/mupdf/windows/lib/x64/libmupdf.lib;../../../third_party/pdflib/windows/lib/x64/pdflib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/tinyxml2/windows/lib/x64/tinyxml2d.lib;%(AdditionalDependencies)
- /ignore:4098,4075 /LTCG %(AdditionalOptions)
+ /ignore:4098,4099,4075 /LTCG %(AdditionalOptions)
@@ -202,13 +203,14 @@ copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfm
false
HGImgFmt.def
../x64/Release/HGBase.lib;../../../third_party/libjpeg/windows/lib/x64/jpeg.lib;../../../third_party/libnsbmp/windows/lib/x64/libnsbmp.lib;../../../third_party/libpng/windows/lib/x64/libpng16.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libtiff/windows/lib/x64/tiff.lib;../../../third_party/mupdf/windows/lib/x64/libmupdf.lib;../../../third_party/pdflib/windows/lib/x64/pdflib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;../../../third_party/tinyxml2/windows/lib/x64/tinyxml2.lib;%(AdditionalDependencies)
- /LTCG %(AdditionalOptions)
+ /ignore:4099 /LTCG %(AdditionalOptions)
- copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\
-copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGImgFmt.a
-copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfmt\
+ copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGImgFmt.a
+copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/build/windows/HGImgProc/HGImgProc.vcxproj b/build/windows/HGImgProc/HGImgProc.vcxproj
index 327c1af2..1b72707d 100644
--- a/build/windows/HGImgProc/HGImgProc.vcxproj
+++ b/build/windows/HGImgProc/HGImgProc.vcxproj
@@ -139,10 +139,11 @@
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\
-copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGImgProc.a
-copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgproc\
+ copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGImgProc.a
+copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -189,10 +190,11 @@ copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgp
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\
-copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGImgProc.a
-copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgproc\
+ copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGImgProc.a
+copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/build/windows/HGSaneUser/HGSaneUser.vcxproj b/build/windows/HGSaneUser/HGSaneUser.vcxproj
index 18e8b4bf..05c5b3b3 100644
--- a/build/windows/HGSaneUser/HGSaneUser.vcxproj
+++ b/build/windows/HGSaneUser/HGSaneUser.vcxproj
@@ -137,10 +137,11 @@
../Release/HGBase.lib;%(AdditionalDependencies)
- copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\
-copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGSaneUser.a
-copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\
-copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sane_user\
+ copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGSaneUser.a
+copy $(OutDir)HGSaneUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\sdk\include\sane_user\
+copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -186,10 +187,11 @@ copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sa
../x64/Release/HGBase.lib;%(AdditionalDependencies)
- copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\
-copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGSaneUser.a
-copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\
-copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sane_user\
+ copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGSaneUser.a
+copy $(OutDir)HGSaneUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\sdk\include\sane_user\
+copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/build/windows/HGTwainUser/HGTwainUser.vcxproj b/build/windows/HGTwainUser/HGTwainUser.vcxproj
index bb6c4f75..35c222d4 100644
--- a/build/windows/HGTwainUser/HGTwainUser.vcxproj
+++ b/build/windows/HGTwainUser/HGTwainUser.vcxproj
@@ -138,10 +138,11 @@
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\
-copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGTwainUser.a
-copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\
-copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\twain_user\
+ copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGTwainUser.a
+copy $(OutDir)HGTwainUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
+copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\sdk\include\twain_user\
+copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -187,10 +188,11 @@ copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\t
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\
-copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGTwainUser.a
-copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\
-copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\twain_user\
+ copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGTwainUser.a
+copy $(OutDir)HGTwainUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
+copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\sdk\include\twain_user\
+copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj
index 526d8894..102f23a6 100644
--- a/build/windows/HGWebService/HGWebService.vcxproj
+++ b/build/windows/HGWebService/HGWebService.vcxproj
@@ -119,13 +119,13 @@
WIN32;_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
MultiThreadedDebug
- ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)
+ ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)
Windows
true
- ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../../../../Release/lib/windows/x86/hgsane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;ws2_32.lib;%(AdditionalDependencies)
- /ignore:4098,4075 /LTCG %(AdditionalOptions)
+ ../Debug/HGBase.lib;../Debug/HGImgFmt.lib;../../../../sdk/lib/win/x86/Debug/hgsane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;ws2_32.lib;%(AdditionalDependencies)
+ /ignore:4098,4099,4075 /LTCG %(AdditionalOptions)
@@ -137,18 +137,18 @@
WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
MultiThreaded
- ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)
+ ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)
Windows
true
true
true
- ../Release/HGBase.lib;../Release/HGImgFmt.lib;../../../../Release/lib/windows/x86/hgsane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;ws2_32.lib;%(AdditionalDependencies)
- /LTCG %(AdditionalOptions)
+ ../Release/HGBase.lib;../Release/HGImgFmt.lib;../../../../sdk/lib/win/x86/Release/hgsane.lib;../../../third_party/zlib/windows/lib/x86/zlib.lib;../../../third_party/libzip/windows/lib/x86/zip.lib;ws2_32.lib;%(AdditionalDependencies)
+ /ignore:4099 /LTCG %(AdditionalOptions)
- copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\Release\bin\windows\x86\
+ copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\release\win\x86\Release\
@@ -158,13 +158,13 @@
_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
MultiThreadedDebug
- ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)
+ ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)
Windows
true
- ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../../../../Release/lib/windows/x64/hgsane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies)
- /ignore:4098,4075 /LTCG %(AdditionalOptions)
+ ../x64/Debug/HGBase.lib;../x64/Debug/HGImgFmt.lib;../../../../sdk/lib/win/x64/Debug/hgsane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies)
+ /ignore:4098,4099,4075 /LTCG %(AdditionalOptions)
@@ -176,18 +176,18 @@
NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
MultiThreaded
- ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)
+ ../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)
Windows
true
true
true
- ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../../../../Release/lib/windows/x64/hgsane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies)
+ ../x64/Release/HGBase.lib;../x64/Release/HGImgFmt.lib;../../../../sdk/lib/win/x64/Release/hgsane.lib;../../../third_party/zlib/windows/lib/x64/zlib.lib;../../../third_party/libzip/windows/lib/x64/zip.lib;ws2_32.lib;%(AdditionalDependencies)
/LTCG %(AdditionalOptions)
- copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\Release\bin\windows\x64\
+ copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\
diff --git a/third_party/json/cJSON.c b/third_party/json/cJSON.c
index f3dc5bcd..ccacb7ac 100644
--- a/third_party/json/cJSON.c
+++ b/third_party/json/cJSON.c
@@ -146,7 +146,7 @@ static int update(printbuffer *p)
char *str;
if (!p || !p->buffer) return 0;
str=p->buffer+p->offset;
- return p->offset+strlen(str);
+ return p->offset+(int)strlen(str);
}
/* Render the number nicely from the given item into a string. */
@@ -262,7 +262,7 @@ static char *print_string_ptr(const char *str,printbuffer *p)
for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0;
if (!flag)
{
- len=ptr-str;
+ len=(int)(ptr-str);
if (p) out=ensure(p,len+3);
else out=(char*)cJSON_malloc(len+3);
if (!out) return 0;
@@ -484,7 +484,7 @@ static char *print_array(cJSON *item,int depth,int fmt,printbuffer *p)
{
ret=print_value(child,depth+1,fmt,0);
entries[i++]=ret;
- if (ret) len+=strlen(ret)+2+(fmt?1:0); else fail=1;
+ if (ret) len+=(int)strlen(ret)+2+(fmt?1:0); else fail=1;
child=child->next;
}
@@ -627,7 +627,7 @@ static char *print_object(cJSON *item,int depth,int fmt,printbuffer *p)
{
names[i]=str=print_string_ptr(child->string,0);
entries[i++]=ret=print_value(child,depth,fmt,0);
- if (str && ret) len+=strlen(ret)+strlen(str)+2+(fmt?2+depth:0); else fail=1;
+ if (str && ret) len+=(int)strlen(ret)+(int)strlen(str)+2+(fmt?2+depth:0); else fail=1;
child=child->next;
}