From 05b9d27f5573ba03c27ad1c94d3c0957ae177a00 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 28 Sep 2017 21:48:36 +0300 Subject: compilation fix --- plugins/NotifyAnything/SendLog/compile.bat | 34 +++++++++----------------- tools/build_scripts/z1_ReBuild_Full.bat | 2 +- tools/build_scripts/z1_ReBuild_Full_Stable.bat | 2 +- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/plugins/NotifyAnything/SendLog/compile.bat b/plugins/NotifyAnything/SendLog/compile.bat index f5dc4d40f0..b49891dc8f 100644 --- a/plugins/NotifyAnything/SendLog/compile.bat +++ b/plugins/NotifyAnything/SendLog/compile.bat @@ -1,31 +1,19 @@ -rem @echo off -if not "%VS100COMNTOOLS%" == "" ( - call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" - "%VS100COMNTOOLS%\..\..\vc\bin\cl.exe" /MD /O2 /Os /EHsc SendLog.cpp SLImp.cpp /link ws2_32.lib user32.lib - "%VS100COMNTOOLS%\..\..\vc\bin\cl.exe" /MD /O2 /Os /EHsc SendLogWin.cpp SLImp.cpp /link ws2_32.lib user32.lib - call :ProcessFiles 10 -) +@echo off -if not "%VS110COMNTOOLS%" == "" ( - call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" - "%VS110COMNTOOLS%\..\..\vc\bin\cl.exe" /MD /O2 /Os /EHsc SendLog.cpp SLImp.cpp /link ws2_32.lib user32.lib - "%VS110COMNTOOLS%\..\..\vc\bin\cl.exe" /MD /O2 /Os /EHsc SendLogWin.cpp SLImp.cpp /link ws2_32.lib user32.lib - call :ProcessFiles 11 -) -goto :eof +cl.exe /MD /O2 /Os /EHsc SendLog.cpp SLImp.cpp /link ws2_32.lib user32.lib +cl.exe /MD /O2 /Os /EHsc SendLogWin.cpp SLImp.cpp /link ws2_32.lib user32.lib -:ProcessFiles -mkdir ..\..\..\bin%1\Debug 2>nul -copy /Y *.exe ..\..\..\bin%1\Debug >nul +mkdir ..\..\..\%1\Debug 2>nul +copy /Y *.exe ..\..\..\%1\Debug >nul -mkdir ..\..\..\bin%1\Debug64 2>nul -copy /Y *.exe ..\..\..\bin%1\Debug64 >nul +mkdir ..\..\..\%1\Debug64 2>nul +copy /Y *.exe ..\..\..\%1\Debug64 >nul -mkdir ..\..\..\bin%1\Release 2>nul -copy /Y *.exe ..\..\..\bin%1\Release >nul +mkdir ..\..\..\%1\Release 2>nul +copy /Y *.exe ..\..\..\%1\Release >nul -mkdir ..\..\..\bin%1\Release64 2>nul -copy /Y *.exe ..\..\..\bin%1\Release64 >nul +mkdir ..\..\..\%1\Release64 2>nul +copy /Y *.exe ..\..\..\%1\Release64 >nul del *.obj;*.exe >nul goto :eof diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 7c5911b63b..32442ac988 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -48,7 +48,7 @@ if "%comp%" == "bin10" ( ) call pascal%tp%.bat -pushd ..\plugins\NotifyAnything\SendLog +pushd ..\plugins\NotifyAnything\SendLog "%comp%" call compile%tp%.bat popd diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat index 1f236d75e8..1058e7dccb 100644 --- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat +++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat @@ -50,7 +50,7 @@ if "%comp%" == "bin10" ( ) call pascal%tp%.bat -pushd ..\plugins\NotifyAnything\SendLog +pushd ..\plugins\NotifyAnything\SendLog "%comp%" call compile%tp%.bat popd -- cgit v1.2.3