From 66c5aac8dd6212228c1ea29bea4b3fc3430e7032 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 9 Oct 2012 13:57:53 +0000 Subject: Even more correct FPC compilation git-svn-id: http://svn.miranda-ng.org/main/trunk@1843 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Actman/make.bat | 5 ++--- plugins/ImportTXT/make.bat | 4 +--- plugins/QuickSearch/make.bat | 5 ++--- plugins/ShlExt/make.bat | 3 +-- plugins/Watrack/make.bat | 5 ++--- plugins/mRadio/make.bat | 5 ++--- 6 files changed, 10 insertions(+), 17 deletions(-) (limited to 'plugins') diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat index a336c0c0f8..7d3385454f 100644 --- a/plugins/Actman/make.bat +++ b/plugins/Actman/make.bat @@ -2,8 +2,8 @@ rem @echo off set OUTDIR="..\..\bin10\Release\Plugins" if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 +set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -FU.\tmp -FE%OUTDIR% -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 rem brcc32.exe %myopts% hooks\hooks.rc -fohooks\hooks.res @@ -16,6 +16,5 @@ if /i '%1' == 'fpc' ( ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 ) -move /y tmp\actman.dll %OUTDIR%\Actman.dll del /Q tmp\* rd tmp diff --git a/plugins/ImportTXT/make.bat b/plugins/ImportTXT/make.bat index a50e5437b3..f9136ac2d4 100644 --- a/plugins/ImportTXT/make.bat +++ b/plugins/ImportTXT/make.bat @@ -9,7 +9,5 @@ md %DCUDIR% 2>nul 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 +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 %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 bab465dbc3..aaa96bd225 100644 --- a/plugins/QuickSearch/make.bat +++ b/plugins/QuickSearch/make.bat @@ -2,8 +2,8 @@ rem @echo off set OUTDIR="..\..\bin10\Release\Plugins" if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 +set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -FU.\tmp -FE%OUTDIR% -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,6 +13,5 @@ if /i '%1' == 'fpc' ( ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 ) -move /y tmp\quicksearch.dll %OUTDIR%\QuickSearch.dll del /Q tmp\* rd tmp \ No newline at end of file diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat index aa5fd44feb..aac4417820 100644 --- a/plugins/ShlExt/make.bat +++ b/plugins/ShlExt/make.bat @@ -9,8 +9,7 @@ REM -WB (relocatable) -WR (relocate) set OUTDIR="..\..\bin10\Release\Plugins" if not exist %OUTDIR% mkdir %OUTDIR% 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 +fpc ShlExt.dpr -FE.\tmp -FU.\tmp -FE%OUTDIR% -Fi..\..\include;..\..\include\delphi -Fi..\ExternalAPI\delphi -Fu..\..\include;..\..\include\delphi -Mdelphi -WG -O2 -Os -Rintel -WR -WB49ac0000 -v0 -move /y tmp\shlext.dll %OUTDIR%\ShlExt.dll del /Q tmp\* rd tmp \ No newline at end of file diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat index 679d87422b..21e7dbb6d7 100644 --- a/plugins/Watrack/make.bat +++ b/plugins/Watrack/make.bat @@ -2,8 +2,8 @@ rem @echo off set OUTDIR="..\..\bin10\Release\Plugins" if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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=watrack.dpr +set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -FU.\tmp -FE%OUTDIR% -Fi..\Utils.pas -Fi..\ExternalAPI\delphi -Fu..\Utils.pas -Fu..\..\include\delphi -Fu..\ExternalAPI\delphi +set dprname=Watrack.dpr rem brcc32.exe res\watrack.rc -fores\watrack.res rem brcc32.exe lastfm\lastfm.rc -folastfm\lastfm.res @@ -22,6 +22,5 @@ if /i '%1' == 'fpc' ( ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 ) -move /y tmp\watrack.dll %OUTDIR%\Watrack.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 8aca99d531..94ca3abb60 100644 --- a/plugins/mRadio/make.bat +++ b/plugins/mRadio/make.bat @@ -2,8 +2,8 @@ rem @echo off set OUTDIR="..\..\bin10\Release\Plugins" if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 +set myopts=-O3 -Xs -Sd -dMiranda -FE.\tmp -FU.\tmp -FE%OUTDIR% -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,6 +13,5 @@ if /i '%1' == 'fpc' ( ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 ) -move /y tmp\mradio.dll %OUTDIR%\mRadio.dll del /Q tmp\* rd tmp \ No newline at end of file -- cgit v1.2.3