Merge branch 'pmdpi-build' of git://github.com/MaartenBent/wxWidgets

Improve DPI aware builds with .vc and .vcproj files.

See https://github.com/wxWidgets/wxWidgets/pull/1769
This commit is contained in:
Vadim Zeitlin
2020-03-28 14:10:17 +01:00
550 changed files with 22579 additions and 4523 deletions

View File

@@ -14,13 +14,11 @@ goto :eof
:nmake
cd build\msw
call "C:\Program Files (x86)\Microsoft Visual Studio %VS%\VC\vcvarsall.bat" %ARCH%
if "%ARCH%"=="amd64" set CPUARG=CPU=%X64
if "%VS%"=="9.0" set DPIARG=USE_DPI_AWARE_MANIFEST=0
nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
nmake -f makefile.vc BUILD=%BUILD%
cd ..\..\tests
nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
nmake -f makefile.vc BUILD=%BUILD%
cd ..\samples\minimal
nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
nmake -f makefile.vc BUILD=%BUILD%
goto :eof
:mingw