diff --git a/build.bat b/build.bat index 4b43256..a7a6c87 100644 --- a/build.bat +++ b/build.bat @@ -84,6 +84,7 @@ if "%COMPILE_RANGE%"=="none" ( "%~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\lang.vcxproj" /p:Configuration=Release /p:Platform=%CPU% MSBuild.exe "%~dp0\device\scanner.vcxproj" /p:Configuration=Release /p:Platform=%CPU% MSBuild.exe "%~dp0\sane\sane.vcxproj" /p:Configuration=Release /p:Platform=%CPU% ) diff --git a/lang/lang.vcxproj b/lang/lang.vcxproj index 0c3888b..64e8b0f 100644 --- a/lang/lang.vcxproj +++ b/lang/lang.vcxproj @@ -76,7 +76,7 @@ $(SolutionDir)..\..\sdk\include;$(IncludePath) - $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\lang + $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\lang\ $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)..\..\sdk\include;$(IncludePath) @@ -86,7 +86,7 @@ $(SolutionDir)..\..\sdk\include;$(IncludePath) - $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\lang + $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\lang\ $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\ $(SolutionDir)..\..\sdk\include;$(IncludePath) @@ -111,7 +111,8 @@ mkdir %FINAL_DIR% move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" -copy "$(TargetPath)" "$(SystemRoot)\twain_32\HuagoTwain" /y + + @@ -137,13 +138,18 @@ copy "$(TargetPath)" "$(SystemRoot)\twain_32\HuagoTwain" /y set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration) +set FINAL_LANGDIR=$(SolutionDir)..\..\release\win\$(PlatformTarget)\Release mkdir %FINAL_DIR% move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" -copy $(OutDir)$(TargetName)$(TargetExt) "..\..\release\win\$(PlatformTarget)\Release" +copy $(OutDir)$(TargetName)$(TargetExt) "%FINAL_LANGDIR%" /y + + + + @@ -166,6 +172,7 @@ mkdir %FINAL_DIR% move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" + @@ -191,13 +198,19 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration) +set FINAL_LANGDIR=$(SolutionDir)..\..\release\win\$(PlatformTarget)\Release mkdir %FINAL_DIR% move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%" move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%" -copy $(OutDir)$(TargetName)$(TargetExt) "..\..\release\win\$(PlatformTarget)\Release" + + + + + +