lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改windows上面的生成目录

This commit is contained in:
luoliangyi 2022-05-04 13:12:19 +08:00
parent 52198fc5d7
commit 6f6416f868
12 changed files with 88 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
################################################################################
# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
################################################################################
/third_party
/build
/build-qt

12
build-qt/windows/HGSolution/HGScanner.pro
View File

@ -21,17 +21,17 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
win32 { win32 {
contains(QT_ARCH, i386) { 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) { CONFIG(release, debug|release) {
DESTDIR = ../../../../Release/bin/windows/x86/ DESTDIR = ../../../../release/win/x86/Release/
} }
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
} }
} else { } 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) { CONFIG(release, debug|release) {
DESTDIR = ../../../../Release/bin/windows/x64/ DESTDIR = ../../../../release/win/x64/Release/
} }
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@ -41,8 +41,7 @@ contains(QT_ARCH, i386) {
INCLUDEPATH += $$PWD/../../../ui/ INCLUDEPATH += $$PWD/../../../ui/
INCLUDEPATH += $$PWD/../../../app/scanner/ INCLUDEPATH += $$PWD/../../../app/scanner/
INCLUDEPATH += $$PWD/../../../../Release/include/ INCLUDEPATH += $$PWD/../../../../sdk/include/
INCLUDEPATH += $$PWD/../../../../Release/include/sane/
SOURCES += \ SOURCES += \
../../../app/scanner/app_cfg.cpp \ ../../../app/scanner/app_cfg.cpp \
@ -146,6 +145,7 @@ FORMS += \
TRANSLATIONS += \ TRANSLATIONS += \
../../../app/scanner/Scanner_zh_CN.ts ../../../app/scanner/Scanner_zh_CN.ts
../../../app/scanner/qt_zh_CN.ts
RESOURCES += \ RESOURCES += \
../../../app/scanner/Scanner_resource.qrc ../../../app/scanner/Scanner_resource.qrc

2
build/uos/aarch64/default.workspace
View File

@ -4,8 +4,8 @@
<Project filename="HGBase/HGBase.cbp" /> <Project filename="HGBase/HGBase.cbp" />
<Project filename="HGImgFmt/HGImgFmt.cbp" /> <Project filename="HGImgFmt/HGImgFmt.cbp" />
<Project filename="HGImgProc/HGImgProc.cbp" /> <Project filename="HGImgProc/HGImgProc.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGSaneUser/HGSaneUser.cbp" /> <Project filename="HGSaneUser/HGSaneUser.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGWebService/HGWebService.cbp" /> <Project filename="HGWebService/HGWebService.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

2
build/uos/amd64/default.workspace
View File

@ -4,8 +4,8 @@
<Project filename="HGBase/HGBase.cbp" /> <Project filename="HGBase/HGBase.cbp" />
<Project filename="HGImgFmt/HGImgFmt.cbp" /> <Project filename="HGImgFmt/HGImgFmt.cbp" />
<Project filename="HGImgProc/HGImgProc.cbp" /> <Project filename="HGImgProc/HGImgProc.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGSaneUser/HGSaneUser.cbp" /> <Project filename="HGSaneUser/HGSaneUser.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGWebService/HGWebService.cbp" /> <Project filename="HGWebService/HGWebService.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

2
build/uos/mips64/default.workspace
View File

@ -4,8 +4,8 @@
<Project filename="HGBase/HGBase.cbp" /> <Project filename="HGBase/HGBase.cbp" />
<Project filename="HGImgFmt/HGImgFmt.cbp" /> <Project filename="HGImgFmt/HGImgFmt.cbp" />
<Project filename="HGImgProc/HGImgProc.cbp" /> <Project filename="HGImgProc/HGImgProc.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGSaneUser/HGSaneUser.cbp" /> <Project filename="HGSaneUser/HGSaneUser.cbp" />
<Project filename="HGTest/HGTest.cbp" />
<Project filename="HGWebService/HGWebService.cbp" /> <Project filename="HGWebService/HGWebService.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

18
build/windows/HGBase/HGBase.vcxproj
View File

@ -167,10 +167,11 @@
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\ <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGBase.a copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGBase.a
copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\ copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\</Command> copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -218,10 +219,11 @@ copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\</
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\ <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGBase.a copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGBase.a
copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\ copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\Release\include\base\</Command> copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

26
build/windows/HGImgFmt/HGImgFmt.vcxproj
View File

@ -126,7 +126,7 @@
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/ignore:4098,4075 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4098,4099,4075 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -150,13 +150,14 @@
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\ <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGImgFmt.a copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGImgFmt.a
copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\ copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfmt\</Command> copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -178,7 +179,7 @@ copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfm
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/ignore:4098,4075 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4098,4099,4075 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -202,13 +203,14 @@ copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfm
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile> <ModuleDefinitionFile>HGImgFmt.def</ModuleDefinitionFile>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\ <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGImgFmt.a copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGImgFmt.a
copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\ copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\Release\include\imgfmt\</Command> copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

18
build/windows/HGImgProc/HGImgProc.vcxproj
View File

@ -139,10 +139,11 @@
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\ <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGImgProc.a copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGImgProc.a
copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\ copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgproc\</Command> copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -189,10 +190,11 @@ copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgp
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\ <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGImgProc.a copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGImgProc.a
copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\ copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\Release\include\imgproc\</Command> copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

18
build/windows/HGSaneUser/HGSaneUser.vcxproj
View File

@ -137,10 +137,11 @@
<AdditionalDependencies>../Release/HGBase.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../Release/HGBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\ <Command>copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGSaneUser.a copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGSaneUser.a
copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\ copy $(OutDir)HGSaneUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sane_user\</Command> copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\sdk\include\sane_user\
copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -186,10 +187,11 @@ copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sa
<AdditionalDependencies>../x64/Release/HGBase.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>../x64/Release/HGBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\ <Command>copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGSaneUser.a copy $(OutDir)HGSaneUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGSaneUser.a
copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\ copy $(OutDir)HGSaneUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\Release\include\sane_user\</Command> copy $(SolutionDir)..\..\sane_user\*.h $(SolutionDir)..\..\..\sdk\include\sane_user\
copy $(OutDir)HGSaneUser.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

18
build/windows/HGTwainUser/HGTwainUser.vcxproj
View File

@ -138,10 +138,11 @@
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\ <Command>copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x86\libHGTwainUser.a copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\libHGTwainUser.a
copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x86\ copy $(OutDir)HGTwainUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\twain_user\</Command> copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\sdk\include\twain_user\
copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -187,10 +188,11 @@ copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\t
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\ <Command>copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\Release\lib\windows\x64\libHGTwainUser.a copy $(OutDir)HGTwainUser.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\libHGTwainUser.a
copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\Release\bin\windows\x64\ copy $(OutDir)HGTwainUser.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\Release\include\twain_user\</Command> copy $(SolutionDir)..\..\twain_user\*.h $(SolutionDir)..\..\..\sdk\include\twain_user\
copy $(OutDir)HGTwainUser.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

26
build/windows/HGWebService/HGWebService.vcxproj
View File

@ -119,13 +119,13 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/ignore:4098,4075 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4098,4099,4075 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -137,18 +137,18 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4099 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\Release\bin\windows\x86\</Command> <Command>copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -158,13 +158,13 @@
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../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)</AdditionalDependencies> <AdditionalDependencies>../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)</AdditionalDependencies>
<AdditionalOptions>/ignore:4098,4075 /LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/ignore:4098,4099,4075 /LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -176,18 +176,18 @@
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../Release/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/sane/;../../../third_party/libzip/windows/include;../../../../sdk/include/sane/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>../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)</AdditionalDependencies> <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)</AdditionalDependencies>
<AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\Release\bin\windows\x64\</Command> <Command>copy $(OutDir)HGWebService.exe $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

8
third_party/json/cJSON.c vendored
View File

@ -146,7 +146,7 @@ static int update(printbuffer *p)
char *str; char *str;
if (!p || !p->buffer) return 0; if (!p || !p->buffer) return 0;
str=p->buffer+p->offset; 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. */ /* 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; for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0;
if (!flag) if (!flag)
{ {
len=ptr-str; len=(int)(ptr-str);
if (p) out=ensure(p,len+3); if (p) out=ensure(p,len+3);
else out=(char*)cJSON_malloc(len+3); else out=(char*)cJSON_malloc(len+3);
if (!out) return 0; 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); ret=print_value(child,depth+1,fmt,0);
entries[i++]=ret; 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; 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); names[i]=str=print_string_ptr(child->string,0);
entries[i++]=ret=print_value(child,depth,fmt,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; child=child->next;
} }