From 72b525d697709532a4e2256607de3a7bdaa3066c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 9 Oct 2012 18:32:29 +0000 Subject: single config for FPC git-svn-id: http://svn.miranda-ng.org/main/trunk@1847 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Actman/make.bat | 15 +++++++-------- plugins/QuickSearch/make.bat | 17 ++++++++--------- plugins/ShlExt/make.bat | 18 ++++++++---------- plugins/Utils.pas/fpc.cfg | 12 ++++++++++++ plugins/Watrack/make.bat | 19 +++++++++---------- plugins/mRadio/make.bat | 17 ++++++++--------- 6 files changed, 52 insertions(+), 46 deletions(-) create mode 100644 plugins/Utils.pas/fpc.cfg (limited to 'plugins') diff --git a/plugins/Actman/make.bat b/plugins/Actman/make.bat index 4b844abeaa..eba7c585c9 100644 --- a/plugins/Actman/make.bat +++ b/plugins/Actman/make.bat @@ -1,24 +1,23 @@ -rem @echo off +@echo off if /i '%1' == 'fpc' ( set OUTDIR="..\..\bin10\Release\Plugins" + set FPCBIN=fpc.exe ) else if /i '%1' == 'fpc64' ( set OUTDIR="..\..\bin10\Release64\Plugins" + set FPCBIN=ppcrossx64.exe ) +set PROJECT=Actman + if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 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.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) else if /i '%1' == 'fpc64' ( - ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) +%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9 +move .\tmp\%PROJECT%.dll %OUTDIR% del /Q tmp\* rd tmp diff --git a/plugins/QuickSearch/make.bat b/plugins/QuickSearch/make.bat index 03fe8963be..ed975f6975 100644 --- a/plugins/QuickSearch/make.bat +++ b/plugins/QuickSearch/make.bat @@ -1,21 +1,20 @@ -rem @echo off +@echo off if /i '%1' == 'fpc' ( set OUTDIR="..\..\bin10\Release\Plugins" + set FPCBIN=fpc.exe ) else if /i '%1' == 'fpc64' ( set OUTDIR="..\..\bin10\Release64\Plugins" + set FPCBIN=ppcrossx64.exe ) +set PROJECT=QuickSearch + if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 -if /i '%1' == 'fpc' ( - fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) else if /i '%1' == 'fpc64' ( - ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) +%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9 +move .\tmp\%PROJECT%.dll %OUTDIR% del /Q tmp\* -rd tmp \ No newline at end of file +rd tmp diff --git a/plugins/ShlExt/make.bat b/plugins/ShlExt/make.bat index c700ee9466..a90728e3c7 100644 --- a/plugins/ShlExt/make.bat +++ b/plugins/ShlExt/make.bat @@ -1,20 +1,18 @@ -rem @echo off +@echo off if /i '%1' == 'fpc' ( set OUTDIR="..\..\bin10\Release\Plugins" + set FPCBIN=fpc.exe ) else if /i '%1' == 'fpc64' ( set OUTDIR="..\..\bin10\Release64\Plugins" + set FPCBIN=ppcrossx64.exe ) +set PROJECT=ShlExt + if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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=ShlExt.dpr -md tmp -if /i '%1' == 'fpc' ( - fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) else if /i '%1' == 'fpc64' ( - ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) +%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9 +move .\tmp\%PROJECT%.dll %OUTDIR% del /Q tmp\* -rd tmp \ No newline at end of file +rd tmp diff --git a/plugins/Utils.pas/fpc.cfg b/plugins/Utils.pas/fpc.cfg new file mode 100644 index 0000000000..a4eb2f8c24 --- /dev/null +++ b/plugins/Utils.pas/fpc.cfg @@ -0,0 +1,12 @@ +-O3 +-Xs +-Sd +-dMiranda +-FE.\tmp +-FU.\tmp +-Fi..\Utils.pas +-Fi..\..\include\delphi +-Fi..\ExternalAPI\delphi +-Fu..\Utils.pas +-Fu..\..\include\delphi +-Fu..\ExternalAPI\delphi diff --git a/plugins/Watrack/make.bat b/plugins/Watrack/make.bat index 043349424b..0c4a6650de 100644 --- a/plugins/Watrack/make.bat +++ b/plugins/Watrack/make.bat @@ -1,13 +1,15 @@ -rem @echo off +@echo off if /i '%1' == 'fpc' ( set OUTDIR="..\..\bin10\Release\Plugins" + set FPCBIN=fpc.exe ) else if /i '%1' == 'fpc64' ( set OUTDIR="..\..\bin10\Release64\Plugins" + set FPCBIN=ppcrossx64.exe ) +set PROJECT=Watrack + if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 @@ -20,11 +22,8 @@ rem brcc32.exe stat\stat.rc -fostat\stat.res rem brcc32.exe status\status.rc -fostatus\status.res rem brcc32.exe templates\templates.rc -fotemplates\templates.res -if /i '%1' == 'fpc' ( - fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) else if /i '%1' == 'fpc64' ( - ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) +%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9 -del /Q tmp\* -rd tmp \ No newline at end of file +move .\tmp\%PROJECT%.dll %OUTDIR% +del /Q .\tmp\* +rd tmp diff --git a/plugins/mRadio/make.bat b/plugins/mRadio/make.bat index dc7ebf7fe4..dd8fca64a6 100644 --- a/plugins/mRadio/make.bat +++ b/plugins/mRadio/make.bat @@ -1,21 +1,20 @@ -rem @echo off +@echo off if /i '%1' == 'fpc' ( set OUTDIR="..\..\bin10\Release\Plugins" + set FPCBIN=fpc.exe ) else if /i '%1' == 'fpc64' ( set OUTDIR="..\..\bin10\Release64\Plugins" + set FPCBIN=ppcrossx64.exe ) +set PROJECT=mRadio + if not exist %OUTDIR% mkdir %OUTDIR% md tmp -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 -if /i '%1' == 'fpc' ( - fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) else if /i '%1' == 'fpc64' ( - ppcrossx64.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9 -) +%FPCBIN% @..\Utils.pas\fpc.cfg %PROJECT%.dpr %2 %3 %4 %5 %6 %7 %8 %9 +move .\tmp\%PROJECT%.dll %OUTDIR% del /Q tmp\* -rd tmp \ No newline at end of file +rd tmp -- cgit v1.2.3