pascal compilation fixes (may need adjustment)

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

6 files changed, 57 insertions, 40 deletions

diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat
index 3e448f046c..c4737cd44f 100644
--- a/plugins/Actman/make.bat
+++ b/plugins/Actman/make.bat
@@ -1,20 +1,22 @@
-@echo off

-set myopts=-dMiranda

+rem @echo off

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

+if not exist %OUTDIR% mkdir %OUTDIR%

+md tmp

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

 set dprname=actman.dpr

 

-..\delphi\brcc32.exe %myopts% options.rc     -fooptions.res

-..\delphi\brcc32.exe %myopts% hooks\hooks.rc -fohooks\hooks.res

-..\delphi\brcc32.exe %myopts% tasks\tasks.rc -fotasks\tasks.res

-..\delphi\brcc32.exe %myopts% ua\ua.rc       -foua\ua.res

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

+rem brcc32.exe %myopts% hooks\hooks.rc -fohooks\hooks.res

+rem brcc32.exe %myopts% tasks\tasks.rc -fotasks\tasks.res

+rem brcc32.exe %myopts% ua\ua.rc       -foua\ua.res

 

 if /i '%1' == 'fpc' (

-  ..\FPC\bin\fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

+  fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 ) else if /i '%1' == 'fpc64' (

-  ..\FPC\bin64\ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe2' (

-  ..\XE2\BIN\dcc32.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe64' (

-  ..\XE2\BIN\dcc64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else (

-  ..\delphi\dcc32 %myopts% %dprname% %1 %2 %3 %4 %5 %6 %7 %8 %9

+  ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 )

+

+move tmp\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 c518eb4499..a0da80f43f 100644
--- a/plugins/ImportTXT/make.bat
+++ b/plugins/ImportTXT/make.bat
@@ -1,3 +1,4 @@
+rem @echo off

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

 if not exist %OUTDIR% mkdir %OUTDIR%

 

@@ -9,4 +10,6 @@ brcc32 -foImpTxt_Ver.res ImpTxt_Ver.rc
 brcc32 -foImpTxtDlg.res ImpTxtDlg.rc

 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%
\ No newline at end of file
+rd /q /s %DCUDIR%

+

+move /y ..\..\bin10\Release\Plugins\importtxt.dll ..\..\bin10\Release\Plugins\ImportTXT.dll
\ No newline at end of file
diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat
index 36de9c338c..5f1b7ae598 100644
--- a/plugins/QuickSearch/make.bat
+++ b/plugins/QuickSearch/make.bat
@@ -1,17 +1,19 @@
-@echo off

-set myopts=-dMiranda

+rem @echo off

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

+if not exist %OUTDIR% mkdir %OUTDIR%

+md tmp

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

 set dprname=quicksearch.dpr

 

-..\delphi\brcc32.exe qs.rc -foqs.res

+rem brcc32.exe qs.rc -foqs.res

 

 if /i '%1' == 'fpc' (

-  ..\FPC\bin\fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

+  fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 ) else if /i '%1' == 'fpc64' (

-  ..\FPC\bin64\ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe2' (

-  ..\XE2\BIN\dcc32.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe64' (

-  ..\XE2\BIN\dcc64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else (

-  ..\delphi\dcc32 %myopts% %dprname% %1 %2 %3 %4 %5 %6 %7 %8 %9

+  ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 )

+

+move tmp\quicksearch.dll .

+del /Q tmp\*

+rd tmp

+move /y quicksearch.dll ..\..\bin10\Release\Plugins\QuickSearch.dll
\ No newline at end of file
diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat
index a9cd86087c..fb24a024ec 100644
--- a/plugins/ShlExt/make.bat
+++ b/plugins/ShlExt/make.bat
@@ -1,4 +1,4 @@
-@echo off

+rem @echo off

 REM -Fi/u are for include/unit dirs

 REM -Mdelphi is delphi mode

 REM -WG - graphical app

@@ -6,8 +6,13 @@ REM -v0 turn off warnings
 REM -O2 -Os // optimise

 REM -Rintel (intel style asm)

 REM -WB (relocatable) -WR (relocate)

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

+if not exist %OUTDIR% mkdir %OUTDIR%

 md out

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

+

 move out\shlext.dll .

 del /Q out\*

-rd /Q out
\ No newline at end of file
+rd /Q out

+

+move /y shlext.dll ..\..\bin10\Release\Plugins\ShlExt.dll
\ No newline at end of file
diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat
index da4f09f131..47446398bf 100644
--- a/plugins/Watrack/make.bat
+++ b/plugins/Watrack/make.bat
@@ -1,4 +1,6 @@
 rem @echo off

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

+if not exist %OUTDIR% mkdir %OUTDIR%

 md tmp

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

 set dprname=watrack.dpr

@@ -23,3 +25,4 @@ if /i '%1' == 'fpc' (
 move tmp\watrack.dll .

 del /Q tmp\*

 rd tmp

+move /y watrack.dll ..\..\bin10\Release\Plugins\Watrack.dll
\ No newline at end of file
diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat
index d77976f0b3..2156c943da 100644
--- a/plugins/mRadio/make.bat
+++ b/plugins/mRadio/make.bat
@@ -1,17 +1,19 @@
-@echo off

-set myopts=-dMiranda

+rem @echo off

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

+if not exist %OUTDIR% mkdir %OUTDIR%

+md tmp

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

 set dprname=mradio.dpr

 

-..\delphi\brcc32.exe mradio.rc -fomradio.res

+rem brcc32.exe mradio.rc -fomradio.res

 

 if /i '%1' == 'fpc' (

-  ..\FPC\bin\fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

+  fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

 ) else if /i '%1' == 'fpc64' (

-  ..\FPC\bin64\ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe2' (

-  ..\XE2\BIN\dcc32.exe -b -dUNICODE_CTRLS -dKOL_MCK %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else if /i '%1' == 'xe64' (

-  ..\XE2\BIN\dcc64.exe -b -dUNICODE_CTRLS -dKOL_MCK %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

-) else (

-  ..\delphi\dcc32 -b -dUNICODE_CTRLS -dKOL_MCK %myopts% %dprname% %1 %2 %3 %4 %5 %6 %7 %8 %9

-)
\ No newline at end of file
+  ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9

+)

+

+move tmp\mradio.dll .

+del /Q tmp\*

+rd tmp

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