添加x64编译配置及组件
This commit is contained in:
parent
a849f32f62
commit
efbc07917c
11
build.bat
11
build.bat
|
@ -106,7 +106,7 @@ echo oem=%OEM%
|
|||
echo cpu=%CPU%
|
||||
echo pid=%PID%
|
||||
|
||||
if "%COMPILE_RANGE%"=="none" (
|
||||
if "%COMPILE_RANGE%"=="none" (
|
||||
set dev=""
|
||||
for /f "tokens=1,2,* " %%i in ('reg QUERY "HKEY_CLASSES_ROOT\CLSID\{2E1517DA-87BF-4443-984A-D2BF18F5A908}\LocalServer32" /ve') do set dev=%%k
|
||||
echo dev=%dev%
|
||||
|
@ -119,10 +119,11 @@ call %dev%\..\..\..\vc\auxiliary\build\vcvars32.bat
|
|||
)
|
||||
|
||||
"%~dp0\sln\release\hgsetver.exe" "%~dp0\..\sdk\include\huagao\brand.h" -oem %OEM% -cpu %CPU% -pid %PID% %COMPILE_RANGE% %NOT_INCREASE_VER%
|
||||
if %COMPILE_RANGE%=="none" (
|
||||
MSBuild.exe "%~dp0\device\scanner.vcxproj" /p:Configuration=Release /p:Platform=x86
|
||||
MSBuild.exe "%~dp0\sane\sane.vcxproj" /p:Configuration=Release /p:Platform=x86
|
||||
if %COMPILE_RANGE%=="none" (
|
||||
MSBuild.exe "%~dp0\device\scanner.vcxproj" /p:Configuration=Release /p:Platform=%CPU%
|
||||
MSBuild.exe "%~dp0\sane\sane.vcxproj" /p:Configuration=Release /p:Platform=%CPU%
|
||||
)
|
||||
MSBuild.exe "%~dp0\twain\twain.vcxproj" /p:Configuration=Release /p:Platform=x86
|
||||
MSBuild.exe "%~dp0\twain\twain.vcxproj" /p:Configuration=Release /p:Platform=%CPU%
|
||||
|
||||
|
||||
:end
|
||||
|
|
|
@ -1,39 +1,73 @@
|
|||
echo off
|
||||
set CPU=x86
|
||||
set OEM=""
|
||||
set NOV=""
|
||||
|
||||
if "%1"=="x86" (
|
||||
set CPU=x86
|
||||
) else if "%1"=="x64" (
|
||||
set CPU=x64
|
||||
) else if "%2"=="x86" (
|
||||
set CPU=x86
|
||||
) else if "%2"=="x64" (
|
||||
set CPU=x64
|
||||
) else if "%3"=="x86" (
|
||||
set CPU=x86
|
||||
) else if "%3"=="x64" (
|
||||
set CPU=x64
|
||||
)
|
||||
if "%1"=="hw" (
|
||||
set OEM=%1
|
||||
) else if "%1"=="lsc" (
|
||||
set OEM=%1
|
||||
) else if "%2"=="hw" (
|
||||
set OEM=%2
|
||||
) else if "%2"=="lsc" (
|
||||
set OEM=%2
|
||||
) else if "%3"=="hw" (
|
||||
set OEM=%3
|
||||
) else if "%3"=="lsc" (
|
||||
set OEM=%3
|
||||
)
|
||||
if "%1"=="nov" (
|
||||
set NOV=%1
|
||||
set OEM=%2
|
||||
) else (
|
||||
set OEM=%1
|
||||
set NOV=%2
|
||||
set NOV=%1
|
||||
) else if "%2"=="nov" (
|
||||
set NOV=%2
|
||||
) else if "%3"=="nov" (
|
||||
set NOV=%3
|
||||
)
|
||||
|
||||
if "%OEM%"=="hw" (
|
||||
build.bat hw x86 0x1000 %NOV%
|
||||
build.bat hw onlytwain 0x1002 nov
|
||||
build.bat hw onlytwain 0x7000 nov
|
||||
build.bat hw onlytwain 0x7002 nov
|
||||
build.bat hw onlytwain 0x7039 nov
|
||||
build.bat hw onlytwain 0x8000 nov
|
||||
build.bat hw onlytwain 0x9000 nov
|
||||
) else if "%OEM%" == "lsc" (
|
||||
build.bat lsc x86 0x8200 %NOV%
|
||||
build.bat lsc onlytwain 0x8420 nov
|
||||
build.bat lsc onlytwain 0x8429 nov
|
||||
build.bat lsc onlytwain 0x8520 nov
|
||||
build.bat lsc onlytwain 0x8529 nov
|
||||
build.bat lsc onlytwain 0x8620 nov
|
||||
build.bat lsc onlytwain 0x8629 nov
|
||||
build.bat lsc onlytwain 0x8730 nov
|
||||
build.bat lsc onlytwain 0x8739 nov
|
||||
) else (
|
||||
build.bat x86 0x100 %NOV%
|
||||
build.bat onlytwain 0x200 nov
|
||||
build.bat onlytwain 0x300 nov
|
||||
build.bat onlytwain 0x400 nov
|
||||
build.bat onlytwain 0x139 nov
|
||||
build.bat onlytwain 0x239 nov
|
||||
build.bat onlytwain 0x439 nov
|
||||
build.bat onlytwain 0x402 nov
|
||||
if "%CPU%"=="" (
|
||||
set CPU=x86
|
||||
)
|
||||
|
||||
echo build -cpu %CPU% -oem %OEM% %NOV%
|
||||
|
||||
if "%OEM%"=="hw" (
|
||||
build.bat hw %CPU% 0x1000 %NOV%
|
||||
build.bat hw %CPU% onlytwain 0x1002 nov
|
||||
build.bat hw %CPU% onlytwain 0x7000 nov
|
||||
build.bat hw %CPU% onlytwain 0x7002 nov
|
||||
build.bat hw %CPU% onlytwain 0x7039 nov
|
||||
build.bat hw %CPU% onlytwain 0x8000 nov
|
||||
build.bat hw %CPU% onlytwain 0x9000 nov
|
||||
) else if "%OEM%" == "lsc" (
|
||||
build.bat lsc %CPU% 0x8200 %NOV%
|
||||
build.bat lsc %CPU% onlytwain 0x8420 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8429 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8520 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8529 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8620 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8629 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8730 nov
|
||||
build.bat lsc %CPU% onlytwain 0x8739 nov
|
||||
) else (
|
||||
build.bat %CPU% 0x100 %NOV%
|
||||
build.bat %CPU% onlytwain 0x200 nov
|
||||
build.bat %CPU% onlytwain 0x300 nov
|
||||
build.bat %CPU% onlytwain 0x400 nov
|
||||
build.bat %CPU% onlytwain 0x139 nov
|
||||
build.bat %CPU% onlytwain 0x239 nov
|
||||
build.bat %CPU% onlytwain 0x439 nov
|
||||
build.bat %CPU% onlytwain 0x402 nov
|
||||
)
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -51,8 +51,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 4,15,10000,22217
|
||||
PRODUCTVERSION 4,15,10000,22217
|
||||
FILEVERSION 4,15,10100,22217
|
||||
PRODUCTVERSION 4,15,10100,22217
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -69,12 +69,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "宁波华高信息科技有限公司"
|
||||
VALUE "FileDescription", "华高扫描仪应用程序"
|
||||
VALUE "FileVersion", "4.15.10000.22217"
|
||||
VALUE "FileVersion", "4.15.10100.22217"
|
||||
VALUE "InternalName", "scanner.dll"
|
||||
VALUE "LegalCopyright", "Copyright (C) 10000"
|
||||
VALUE "LegalCopyright", "Copyright (C) 10100"
|
||||
VALUE "OriginalFilename", "scanner.dll"
|
||||
VALUE "ProductName", "HUAGOScan"
|
||||
VALUE "ProductVersion", "4.15.10000.22217"
|
||||
VALUE "ProductVersion", "4.15.10100.22217"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
@ -164,16 +164,17 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
|
|||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DIRECT_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<DisableSpecificWarnings>4996;</DisableSpecificWarnings>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<IgnoreSpecificDefaultLibraries>
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib</AdditionalDependencies>
|
||||
<IgnoreSpecificDefaultLibraries>msvcprtd.lib;</IgnoreSpecificDefaultLibraries>
|
||||
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;zlib.lib;user32.lib</AdditionalDependencies>
|
||||
<ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
|
@ -191,9 +192,10 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
|
|||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;NDEBUG;_CONSOLE;_DIRECT_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<DisableSpecificWarnings>4996;</DisableSpecificWarnings>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
@ -202,7 +204,8 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
|
|||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<IgnoreSpecificDefaultLibraries>
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib</AdditionalDependencies>
|
||||
<AdditionalDependencies>opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;zlib.lib;user32.lib</AdditionalDependencies>
|
||||
<ModuleDefinitionFile>$(ProjectDir)device.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
|
|
|
@ -302,7 +302,13 @@ void dlg_area::clear_area(void)
|
|||
void dlg_area::drag_blocks(std::vector<DRAGRECT>& blocks)
|
||||
{
|
||||
int l = 5;
|
||||
DRAGRECT r = { user_sel_.left, user_sel_.top, user_sel_.left + l, user_sel_.top + l, DRAG_POS_LT };
|
||||
DRAGRECT r;
|
||||
|
||||
r.left = user_sel_.left;
|
||||
r.top = user_sel_.top;
|
||||
r.right = r.left + 1;
|
||||
r.bottom = r.top + 1;
|
||||
r.pos = DRAG_POS_LT;
|
||||
|
||||
blocks.clear();
|
||||
blocks.push_back(r);
|
||||
|
|
|
@ -131,7 +131,7 @@ void dlg_base::on_font_changed(void)
|
|||
}
|
||||
void dlg_base::create(void)
|
||||
{
|
||||
hwnd_ = CreateDialogParamW(g_my_inst, MAKEINTRESOURCE(idd_), parent_, &dlg_base::dlg_proc, (LPARAM)this);
|
||||
hwnd_ = CreateDialogParamW(g_my_inst, MAKEINTRESOURCE(idd_), parent_, (DLGPROC)&dlg_base::dlg_proc, (LPARAM)this);
|
||||
}
|
||||
void dlg_base::notify_ui_event(int ev)
|
||||
{
|
||||
|
|
10
sane/sane.rc
10
sane/sane.rc
|
@ -248,8 +248,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 4,15,10000,22217
|
||||
PRODUCTVERSION 4,15,10000,22217
|
||||
FILEVERSION 4,15,10100,22217
|
||||
PRODUCTVERSION 4,15,10100,22217
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
@ -266,12 +266,12 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "宁波华高信息科技有限公司"
|
||||
VALUE "FileDescription", "华高扫描仪应用程序"
|
||||
VALUE "FileVersion", "4.15.10000.22217"
|
||||
VALUE "FileVersion", "4.15.10100.22217"
|
||||
VALUE "InternalName", "sane.dll"
|
||||
VALUE "LegalCopyright", "Copyright (C) 10000"
|
||||
VALUE "LegalCopyright", "Copyright (C) 10100"
|
||||
VALUE "OriginalFilename", "sane.dll"
|
||||
VALUE "ProductName", "HUAGOScan"
|
||||
VALUE "ProductVersion", "4.15.10000.22217"
|
||||
VALUE "ProductVersion", "4.15.10100.22217"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
@ -41,13 +41,13 @@
|
|||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
|
@ -156,12 +156,15 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
|
|||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BACKEND_NAME=hgsane;TWPP_IS_DS;EXPORT_SANE_API;OEM_NONE</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>scanner.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ModuleDefinitionFile>$(ProjectDir)sane.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
|
@ -179,14 +182,17 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
|
|||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);BACKEND_NAME=hgsane;TWPP_IS_DS;EXPORT_SANE_API;OEM_NONE</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>scanner.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ModuleDefinitionFile>$(ProjectDir)sane.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
|
|
|
@ -273,8 +273,8 @@ bool mapping_buf::save(const void* data, size_t* bytes, unsigned long long off)
|
|||
}
|
||||
bool mapping_buf::save(unsigned long long off, mapping_buf* mbuf, unsigned long long src_off)
|
||||
{
|
||||
unsigned int len = (unsigned int)(mbuf->bytes() - src_off);
|
||||
unsigned char* buf = mbuf->buffer(src_off, &len);
|
||||
size_t len = (unsigned int)(mbuf->bytes() - src_off);
|
||||
unsigned char* buf = mbuf->buffer(src_off, (unsigned int*)&len);
|
||||
bool ret = false;
|
||||
|
||||
while (buf && save(buf, &len, off))
|
||||
|
@ -287,7 +287,7 @@ bool mapping_buf::save(unsigned long long off, mapping_buf* mbuf, unsigned long
|
|||
break;
|
||||
}
|
||||
len = (unsigned int)(mbuf->bytes() - src_off);
|
||||
buf = mbuf->buffer(src_off, &len);
|
||||
buf = mbuf->buffer(src_off, (unsigned int*)&len);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
|
@ -37,10 +37,12 @@ Global
|
|||
{9ED4B425-73E0-423E-9712-455E777481B4}.Release|x64.Build.0 = Release|x64
|
||||
{9ED4B425-73E0-423E-9712-455E777481B4}.Release|x86.ActiveCfg = Release|Win32
|
||||
{9ED4B425-73E0-423E-9712-455E777481B4}.Release|x86.Build.0 = Release|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Debug|x64.Build.0 = Debug|x64
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Debug|x86.Build.0 = Debug|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.ActiveCfg = Release|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.ActiveCfg = Release|x64
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32
|
||||
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32
|
||||
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
|
@ -5,10 +5,18 @@
|
|||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{c3b47ce2-27ce-4509-ab59-3c0f194f0fce}</ProjectGuid>
|
||||
|
@ -25,6 +33,13 @@
|
|||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
|
@ -33,15 +48,29 @@
|
|||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<UseOfMfc>Static</UseOfMfc>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
|
@ -51,6 +80,14 @@
|
|||
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||
<TargetName>huagaotwain402.ds</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||
<TargetName>huagaotwain402.ds</TargetName>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)..\..\sdk\include\;$(IncludePath)</IncludePath>
|
||||
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
|
||||
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)..\..\sdk\include\;$(IncludePath)</IncludePath>
|
||||
|
@ -59,6 +96,14 @@
|
|||
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||
<TargetName>huagaotwain402.ds</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||
<TargetName>huagaotwain402.ds</TargetName>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)..\..\sdk\include\;$(IncludePath)</IncludePath>
|
||||
<OutDir>$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\</OutDir>
|
||||
<IntDir>$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
|
@ -84,6 +129,35 @@ move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
|
|||
move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
|
||||
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
|
||||
copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ModuleDefinitionFile>$(ProjectDir)twain.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>
|
||||
</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
mkdir "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
|
||||
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
|
||||
copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
|
@ -114,6 +188,37 @@ mkdir "%FINAL_DIR%"
|
|||
move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
|
||||
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<ModuleDefinitionFile>$(ProjectDir)twain.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>
|
||||
</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
|
||||
mkdir "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
|
||||
move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
|
||||
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"</Command>
|
||||
</PostBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
|
@ -171,11 +276,15 @@ move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"</Command>
|
|||
<ClCompile Include="load_sane.cpp" />
|
||||
<ClCompile Include="pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="twain\huagaods.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
Loading…
Reference in New Issue