From 09e742f243d782cbffd5af1700c915dd523fb5d0 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 4 May 2013 21:25:36 +0000 Subject: [PATCH] * add a -dfpc define to the resource compiler commandlines, which allows to make FPC specific exceptions in resource scripts. Mantis #24044 git-svn-id: trunk@24438 - --- compiler/rescmn.pas | 6 +++--- compiler/systems/i_bsd.pas | 4 ++-- compiler/systems/i_emx.pas | 2 +- compiler/systems/i_os2.pas | 2 +- compiler/systems/t_win.pas | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/rescmn.pas b/compiler/rescmn.pas index de2172d538..60de2d28a6 100644 --- a/compiler/rescmn.pas +++ b/compiler/rescmn.pas @@ -37,7 +37,7 @@ uses rescmd : '-o $OBJ -a $ARCH -of elf $DBG'; { cross compiled windres can be used to compile .rc files on linux } rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : []; ); @@ -49,7 +49,7 @@ uses rescmd : '-o $OBJ -a $ARCH -of xcoff $DBG'; { cross compiled windres can be used to compile .rc files on other platforms } rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : []; ); @@ -60,7 +60,7 @@ uses resbin : 'fpcres'; rescmd : '-o $OBJ -a $ENDIAN -of external $DBG'; rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : [res_external_file]; ); diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas index 4d3f78547f..2ae42aee9a 100644 --- a/compiler/systems/i_bsd.pas +++ b/compiler/systems/i_bsd.pas @@ -39,7 +39,7 @@ unit i_bsd; resbin : 'fpcres'; rescmd : '-o $OBJ -a $ARCH -s $SUBARCH -of mach-o $DBG'; rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : []; ); @@ -49,7 +49,7 @@ unit i_bsd; resbin : 'fpcres'; rescmd : '-o $OBJ -a $ENDIAN -of external $DBG'; rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : [res_external_file,res_arch_in_file_name]; ); diff --git a/compiler/systems/i_emx.pas b/compiler/systems/i_emx.pas index cce75e5280..14c36da39d 100644 --- a/compiler/systems/i_emx.pas +++ b/compiler/systems/i_emx.pas @@ -35,7 +35,7 @@ unit i_emx; resbin : ''; rescmd : ''; rcbin : 'wrc'; - rccmd : '-r -zm -q -bt=os2 -fo=$RES $RC'; + rccmd : '-r -zm -q -bt=os2 -dFPC -fo=$RES $RC'; resourcefileclass : nil; resflags : [res_single_file]; ); diff --git a/compiler/systems/i_os2.pas b/compiler/systems/i_os2.pas index 21e854cdca..af957609ff 100644 --- a/compiler/systems/i_os2.pas +++ b/compiler/systems/i_os2.pas @@ -35,7 +35,7 @@ unit i_os2; resbin : ''; rescmd : ''; rcbin : 'wrc'; - rccmd : '-r -zm -q -bt=os2 -fo=$RES $RC'; + rccmd : '-r -zm -q -bt=os2 -dFPC -fo=$RES $RC'; resourcefileclass : nil; resflags : [res_single_file]; ); diff --git a/compiler/systems/t_win.pas b/compiler/systems/t_win.pas index e341d0c891..972adece8d 100644 --- a/compiler/systems/t_win.pas +++ b/compiler/systems/t_win.pas @@ -108,7 +108,7 @@ implementation resbin : 'fpcres'; rescmd : '-o $OBJ -a $ARCH -of coff $DBG'; rcbin : 'windres'; - rccmd : '--include $INC -O res -o $RES $RC'; + rccmd : '--include $INC -O res -D FPC -o $RES $RC'; resourcefileclass : nil; resflags : []; ); @@ -119,7 +119,7 @@ implementation resbin : 'fpcres'; rescmd : '-o $OBJ -a $ARCH -of coff $DBG'; rcbin : 'gorc'; - rccmd : '/machine x64 /nw /ni /r /fo $RES $RC'; + rccmd : '/machine x64 /nw /ni /r /d FPC /fo $RES $RC'; resourcefileclass : nil; resflags : []; );