Pascal 32-bit final compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@1842 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 20 insertions, 25 deletions

diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat
index 4e974ba94d..a336c0c0f8 100644
--- a/plugins/Actman/make.bat
+++ b/plugins/Actman/make.bat
@@ -1,8 +1,8 @@
 rem @echo off

-set OUTDIR="..\..\bin10\Release\Plugins" 

+set OUTDIR="..\..\bin10\Release\Plugins"

 if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

-set myopts=-O3 -Xs -Sd -dMiranda -FEtmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi

+set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi

 set dprname=actman.dpr

 

 rem brcc32.exe %myopts% options.rc     -fooptions.res

@@ -16,7 +16,6 @@ if /i '%1' == 'fpc' (
   ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 )

 

-move tmp\actman.dll .

+move /y tmp\actman.dll %OUTDIR%\Actman.dll

 del /Q tmp\*

 rd tmp

-move /y actman.dll ..\..\bin10\Release\Plugins\Actman.dll

diff --git a/plugins/ImportTXT/make.bat b/plugins/ImportTXT/make.bat
index a0da80f43f..a50e5437b3 100644
--- a/plugins/ImportTXT/make.bat
+++ b/plugins/ImportTXT/make.bat
@@ -1,9 +1,9 @@
 rem @echo off

-set OUTDIR="..\..\bin10\Release\Plugins" 

+set OUTDIR="..\..\bin10\Release\Plugins"

 if not exist %OUTDIR% mkdir %OUTDIR%

 

 set COMPDIR=-$A8 -$D- -$J+ -$L- -$O+ -$Q- -$R- -$Y- -$C-

-set INCDIR=".\kol;..\..\include\delphi;"

+set INCDIR=".\kol;..\..\include\delphi;..\ExternalAPI\delphi"

 set DCUDIR="tmp"

 md %DCUDIR% 2>nul

 brcc32 -foImpTxt_Ver.res ImpTxt_Ver.rc

@@ -12,4 +12,4 @@ brcc32 -foImpTxtWiz.res ImpTxtWiz.rc
 dcc32 -B -CG -U%INCDIR% -R%INCDIR% -I%INCDIR% -E%OUTDIR% -LE%DCUDIR% -LN%DCUDIR% -N%DCUDIR% %COMPDIR% importtxt.dpr

 rd /q /s %DCUDIR%

 

-move /y ..\..\bin10\Release\Plugins\importtxt.dll ..\..\bin10\Release\Plugins\ImportTXT.dll
\ No newline at end of file
+move /y %OUTDIR%\importtxt.dll %OUTDIR%\ImportTXT.dll
\ No newline at end of file
diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat
index 64fc690140..bab465dbc3 100644
--- a/plugins/QuickSearch/make.bat
+++ b/plugins/QuickSearch/make.bat
@@ -1,8 +1,8 @@
 rem @echo off

-set OUTDIR="..\..\bin10\Release\Plugins" 

+set OUTDIR="..\..\bin10\Release\Plugins"

 if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

-set myopts=-O3 -Xs -Sd -dMiranda -FEtmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi

+set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi

 set dprname=quicksearch.dpr

 

 rem brcc32.exe qs.rc -foqs.res

@@ -13,7 +13,6 @@ if /i '%1' == 'fpc' (
   ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 )

 

-move tmp\quicksearch.dll .

+move /y tmp\quicksearch.dll %OUTDIR%\QuickSearch.dll

 del /Q tmp\*

-rd tmp

-move /y quicksearch.dll ..\..\bin10\Release\Plugins\QuickSearch.dll
\ No newline at end of file
+rd tmp
\ No newline at end of file
diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat
index 78c8ca27d8..aa5fd44feb 100644
--- a/plugins/ShlExt/make.bat
+++ b/plugins/ShlExt/make.bat
@@ -6,13 +6,11 @@ REM -v0 turn off warnings
 REM -O2 -Os // optimise

 REM -Rintel (intel style asm)

 REM -WB (relocatable) -WR (relocate)

-set OUTDIR="..\..\bin10\Release\Plugins" 

+set OUTDIR="..\..\bin10\Release\Plugins"

 if not exist %OUTDIR% mkdir %OUTDIR%

-md out

-fpc shlext.dpr -FEout -Fi..\..\include;..\..\include\delphi -Fi..\ExternalAPI\delphi -Fu..\..\include;..\..\include\delphi -Mdelphi -WG -O2 -Os -Rintel -WR -WB49ac0000 -v0

+md tmp

+fpc shlext.dpr -FE.\tmp -Fi..\..\include;..\..\include\delphi -Fi..\ExternalAPI\delphi -Fu..\..\include;..\..\include\delphi -Mdelphi -WG -O2 -Os -Rintel -WR -WB49ac0000 -v0

 

-move out\shlext.dll .

-del /Q out\*

-rd /Q out

-

-move /y shlext.dll ..\..\bin10\Release\Plugins\ShlExt.dll
\ No newline at end of file
+move /y tmp\shlext.dll %OUTDIR%\ShlExt.dll

+del /Q tmp\*

+rd tmp
\ No newline at end of file
diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat
index adfa1af64c..8aca99d531 100644
--- a/plugins/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
@@ -1,8 +1,8 @@
 rem @echo off

-set OUTDIR="..\..\bin10\Release\Plugins" 

+set OUTDIR="..\..\bin10\Release\Plugins"

 if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

-set myopts=-O3 -Xs -Sd -dMiranda -FEtmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi -Fu..\Libs

+set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi -Fu..\Libs

 set dprname=mradio.dpr

 

 rem brcc32.exe mradio.rc -fomradio.res

@@ -13,7 +13,6 @@ if /i '%1' == 'fpc' (
   ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 )

 

-move tmp\mradio.dll .

+move /y tmp\mradio.dll %OUTDIR%\mRadio.dll

 del /Q tmp\*

-rd tmp

-move /y mradio.dll ..\..\bin10\Release\Plugins\mRadio.dll
\ No newline at end of file
+rd tmp
\ No newline at end of file