paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 20:29:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ allow {$apptype com} and {$apptype exe} to set the msdos binary format

Browse Source 
+ added extra check to ensure that {$apptype console} and {$apptype gui} produce a warning and do not change the binary format to .exe on msdos

git-svn-id: trunk@25547 -
This commit is contained in:
nickysn 2013-09-24 13:35:44 +00:00
parent 1a4a745993
commit 2afea8fc19
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/scandir.pas
View File

@ -237,7 +237,8 @@ unit scandir;
begin begin
if not (target_info.system in systems_all_windows + [system_i386_os2, if not (target_info.system in systems_all_windows + [system_i386_os2,
system_i386_emx, system_powerpc_macos, system_i386_emx, system_powerpc_macos,
system_arm_nds] + systems_nativent) then system_arm_nds, system_i8086_msdos] +
systems_nativent) then
begin begin
if m_delphi in current_settings.modeswitches then if m_delphi in current_settings.modeswitches then
Message(scan_n_app_type_not_support) Message(scan_n_app_type_not_support)
@ -252,9 +253,9 @@ unit scandir;
begin begin
current_scanner.skipspace; current_scanner.skipspace;
hs:=current_scanner.readid; hs:=current_scanner.readid;
if hs='GUI' then if (hs='GUI') and not (target_info.system in [system_i8086_msdos]) then
SetApptype(app_gui) SetApptype(app_gui)
else if hs='CONSOLE' then else if (hs='CONSOLE') and not (target_info.system in [system_i8086_msdos]) then
SetApptype(app_cui) SetApptype(app_cui)
else if (hs='NATIVE') and (target_info.system in systems_windows + systems_nativent) then else if (hs='NATIVE') and (target_info.system in systems_windows + systems_nativent) then
SetApptype(app_native) SetApptype(app_native)
@ -267,6 +268,10 @@ unit scandir;
SetApptype(app_arm9) SetApptype(app_arm9)
else if (hs='ARM7') and (target_info.system in [system_arm_nds]) then else if (hs='ARM7') and (target_info.system in [system_arm_nds]) then
SetApptype(app_arm7) SetApptype(app_arm7)
else if (hs='COM') and (target_info.system in [system_i8086_msdos]) then
SetApptype(app_com)
else if (hs='EXE') and (target_info.system in [system_i8086_msdos]) then
SetApptype(app_cui)
else else
Message1(scan_w_unsupported_app_type,hs); Message1(scan_w_unsupported_app_type,hs);
end; end;