Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Specify CPU parameter for AppVeyor nmake builds

Browse Source 
Don't use DPI aware manifest with VC9.
Build minimal samples with msbuild and nmake.
This commit is contained in:
Maarten Bent
2019-11-30 23:27:43 +01:00
parent 7fd0b744a8
commit e36cdaddfd
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/tools/appveyor-test.bat
View File

@@ -15,9 +15,10 @@ goto :eof
:nmake
if "%BUILD%"=="debug" set debug_suffix=d
.\vc_mswu%debug_suffix%\test.exe
if "%ARCH%"=="amd64" set arch_suffix=_x64
.\vc_mswu%debug_suffix%%arch_suffix%\test.exe
if %errorlevel% NEQ 0 goto :error
.\vc_mswu%debug_suffix%\test_gui.exe
.\vc_mswu%debug_suffix%%arch_suffix%\test_gui.exe
goto :eof
:mingw

10
build/tools/appveyor.bat
View File

@@ -7,14 +7,20 @@ msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.
cd ..\..\tests
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc12.sln %MSBUILD_LOGGER%
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc12.sln %MSBUILD_LOGGER%
cd ..\samples\minimal
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" minimal_vc12.sln %MSBUILD_LOGGER%
goto :eof
:nmake
cd build\msw
call "C:\Program Files (x86)\Microsoft Visual Studio %VS%\VC\vcvarsall.bat" %ARCH%
nmake -f makefile.vc BUILD=%BUILD%
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%
cd ..\..\tests
nmake -f makefile.vc BUILD=%BUILD%
nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
cd ..\samples\minimal
nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
goto :eof
:mingw