scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-10-30 02:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PLATFORMSW settings versus Win32/x86

Browse Source 
Signed-off-by: Francis ANDRE <francis.andre.kampbell@orange.fr>
This commit is contained in:
Francis ANDRE
2019-07-10 09:25:16 +02:00
parent 60405ec93a
commit a0a5b454ec
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
buildwin.cmd
View File

@@ -43,8 +43,8 @@ if %VS_VERSION%==vs160 (
) else (
if %VS_VERSION%==vs150 (
set "VSWHERE='build\exe\vswhere.exe -property installationPath -version ^[15.0^,16.0^)'"
)
)
))
for /f " delims=" %%a in (%VSWHERE%) do @set "VSCOMNTOOLS=%%a"
if %VS_VERSION%==vs160 (
@@ -208,6 +208,7 @@ if "%VS_VERSION%"=="vs160" (set BUILD_TOOL=msbuild)
:use_custom
if "%BUILD_TOOL%"=="msbuild" (
if "%PLATFORM%"=="Win32" (set PLATFORMSW=/p:Platform=Win32) else (
if "%PLATFORM%"=="x86" (set PLATFORMSW=/p:Platform=Win32) else (
if "%PLATFORM%"=="x64" (set PLATFORMSW=/p:Platform=x64))
set ACTIONSW=/t:
@@ -416,8 +417,8 @@ echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo.
if %DEBUG_SHARED%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !PROJECT_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !PROJECT_FILE!
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared !PLATFORMSW! !PROJECT_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared !PLATFORMSW! !PROJECT_FILE!
if ERRORLEVEL 1 exit /b 1
echo. && echo.
if %TESTS%==tests (
@@ -436,7 +437,7 @@ if %DEBUG_SHARED%==1 (
)
)
if %RELEASE_SHARED%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !PROJECT_FILE!
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !PROJECT_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !PROJECT_FILE!
if ERRORLEVEL 1 exit /b 1
@@ -562,31 +563,37 @@ for /f %%G in ('findstr /R "." components') do (
set SOLUTION_FILE=samples%PLATFORM_SUFFIX%_%VS_VERSION%.sln
if %DEBUG_SHARED%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.
)
if %RELEASE_SHARED%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.
)
if %DEBUG_STATIC_MT%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.
)
if %RELEASE_STATIC_MT%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.
)
if %DEBUG_STATIC_MD%==1 (
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !SOLUTION_FILE!
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.
)
if %RELEASE_STATIC_MD%==1 (
echo !BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !SOLUTION_FILE!
!BUILD_TOOL! !BUILD_TOOL_FLAGS! !USEENVP! %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !SOLUTION_FILE!
if ERRORLEVEL 1 goto buildfailed
echo. && echo.