diff --git a/compiler/globals.pas b/compiler/globals.pas index a09bfacb5a..bd93560fbc 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -253,8 +253,11 @@ interface do_build, do_release, do_make : boolean; + { Path to ppc } + exepath : TPathStr; + { Path to unicode charmap/collation binaries } + unicodepath : TPathStr; { path for searching units, different paths can be seperated by ; } - exepath : TPathStr; { Path to ppc } librarysearchpath, unitsearchpath, objectsearchpath, @@ -1361,6 +1364,7 @@ implementation sysrootpath:=''; { Search Paths } + unicodepath:=''; librarysearchpath:=TSearchPathList.Create; unitsearchpath:=TSearchPathList.Create; includesearchpath:=TSearchPathList.Create; diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index ba92d5d3b6..a9c674b5a5 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -3469,6 +3469,7 @@ J*2Cv_Var/out parameter copy-out checking **2Fl_Add to library path **2FL_Use as dynamic linker **2Fm_Load unicode conversion table from .txt in the compiler dir +**2FM_Set the directory where to search for unicode binary files **2Fo_Add to object path **2Fr_Load error message file **2FR_Set resource (.res) linker to diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index b31d298cf1..b70277d75e 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -977,7 +977,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 70076; + MsgTxtSize = 70144; MsgIdxMax : array[1..20] of longint=( 26,95,335,121,88,56,126,27,202,64, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index eb3a3119bd..83470b666c 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const msgtxt : array[0..000291] of string[240]=( +const msgtxt : array[0..000292] of string[240]=( {$else Delphi} -const msgtxt : array[0..000291,1..240] of char=( +const msgtxt : array[0..000292,1..240] of char=( {$endif Delphi} '01000_T_Compiler: $1'#000+ '01001_D_Compiler OS: $1'#000+ @@ -1353,133 +1353,134 @@ const msgtxt : array[0..000291,1..240] of char=( '**2FL_Use a','s dynamic linker'#010+ '**2Fm_Load unicode conversion table from .txt in the compiler di'+ 'r'#010+ + '**2FM_Set the directory where to search for unicode binary files'#010+ '**2Fo_Add to object path'#010+ '**2Fr_Load error message file '#010+ - '**2FR_Set resource (.res) linker to '#010+ + '**2FR_Set r','esource (.res) linker to '#010+ '**2Fu_Add to unit path'#010+ - '**2FU_','Set unit output path to , overrides -FE'#010+ + '**2FU_Set unit output path to , overrides -FE'#010+ '**2FW_Store generated whole-program optimization feedback in '#010+ - '**2Fw_Load previously stored whole-program optimization feedback fr'+ - 'om '#010+ - '*g1g_Generate debug information (default format for ','target)'#010+ + '**2Fw_Load previously stored whole-program optimization fe','edback '+ + 'from '#010+ + '*g1g_Generate debug information (default format for target)'#010+ '*g2gc_Generate checks for pointers'#010+ '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+ '*g2gl_Use line info unit (show more info with backtraces)'#010+ - '*g2go_Set debug information options'#010+ - '*g3godwarfsets_ Enable DWARF '#039'set'#039' t','ype debug information (b'+ - 'reaks gdb < 6.5)'#010+ + '*g2go_Set debug information options'#010+ + '*g3godwarfsets_ Enable DWARF '#039'set'#039' type debug information (bre'+ + 'aks gdb < 6.5)'#010+ '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+ #010+ - '*g3godwarfmethodclassprefix_ Prefix method names in DWARF with class n'+ - 'ame'#010+ + '*g3godwarfmethodclassprefix_ Prefix method names in DWARF wi','th class'+ + ' name'#010+ '*g2gp_Preserve case in stabs symbol names'#010+ - '*g2gs_Genera','te Stabs debug information'#010+ + '*g2gs_Generate Stabs debug information'#010+ '*g2gt_Trash local variables (to detect uninitialized uses)'#010+ '*g2gv_Generates programs traceable with Valgrind'#010+ - '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+ + '*g2gw_Generate DWARFv2 debug informat','ion (same as -gw2)'#010+ '*g2gw2_Generate DWARFv2 debug information'#010+ - '*g2gw3_','Generate DWARFv3 debug information'#010+ + '*g2gw3_Generate DWARFv3 debug information'#010+ '*g2gw4_Generate DWARFv4 debug information (experimental)'#010+ '**1i_Information'#010+ '**2iD_Return compiler date'#010+ - '**2iV_Return short compiler version'#010+ + '**2iV_Return short compiler version'#010, '**2iW_Return full compiler version'#010+ '**2iSO_Return compiler OS'#010+ - '**2iSP_','Return compiler host processor'#010+ + '**2iSP_Return compiler host processor'#010+ '**2iTO_Return target OS'#010+ '**2iTP_Return target processor'#010+ '**1I_Add to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_Write logo'#010+ - '**1M_Set language mode to '#010+ + '**1M','_Set language mode to '#010+ '**2Mfpc_Free Pascal dialect (default)'#010+ - '**2M','objfpc_FPC mode with Object Pascal support'#010+ + '**2Mobjfpc_FPC mode with Object Pascal support'#010+ '**2Mdelphi_Delphi 7 compatibility mode'#010+ '**2Mtp_TP/BP 7.0 compatibility mode'#010+ - '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+ + '**2Mmacpas_Macintosh Pascal dialects compatibility mod','e'#010+ '**1n_Do not read the default config files'#010+ - '**1o_Change the name ','of the executable produced to '#010+ + '**1o_Change the name of the executable produced to '#010+ '**1O_Optimizations:'#010+ '**2O-_Disable optimizations'#010+ '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+ - '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+ - '**2O3_Level 3 optimizations (-O2 + slow o','ptimizations)'#010+ + '**2O2_Level 2 optimizations (','-O1 + quick optimizations)'#010+ + '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+ '**2O4_Level 4 optimizations (-O3 + optimizations which might have unex'+ 'pected side effects)'#010+ '**2Oa=_Set alignment'#010+ - '**2Oo[NO]_Enable or disable optimizations, see fpc -i for possible '+ - 'values'#010+ - '**2Op_Set target cpu for opt','imizing, see fpc -i for possible valu'+ - 'es'#010+ + '**2Oo[NO]_Enable or disable optimizat','ions, see fpc -i for possibl'+ + 'e values'#010+ + '**2Op_Set target cpu for optimizing, see fpc -i for possible values'+ + #010+ '**2OW_Generate whole-program optimization feedback for optimization'+ ' , see fpc -i for possible values'#010+ - '**2Ow_Perform whole-program optimization , see fpc -i for possib'+ - 'le values'#010+ - '**2Os_Optimiz','e for size rather than speed'#010+ + '**2Ow_Perform whole-pr','ogram optimization , see fpc -i for poss'+ + 'ible values'#010+ + '**2Os_Optimize for size rather than speed'#010+ '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+ 'F*1P_Target CPU / compiler related options:'#010+ 'F*2PB_Show default compiler binary'#010+ - 'F*2PP_Show default target cpu'#010+ - 'F*2P_Set target CPU (arm,i386,m68k,m','ips,mipsel,powerpc,powerpc64,'+ - 'sparc,x86_64'#010+ + 'F','*2PP_Show default target cpu'#010+ + 'F*2P_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sp'+ + 'arc,x86_64'#010+ '**1R_Assembler reading style:'#010+ '**2Rdefault_Use default assembler for target'#010+ '3*2Ratt_Read AT&T style assembler'#010+ - '3*2Rintel_Read Intel style assembler'#010+ + '3*2Rintel_Read Int','el style assembler'#010+ '6*2RMOT_Read motorola style assembler'#010+ - '**1S_Syn','tax options:'#010+ + '**1S_Syntax options:'#010+ '**2S2_Same as -Mobjfpc'#010+ '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+ '**2Sa_Turn on assertions'#010+ '**2Sd_Same as -Mdelphi'#010+ - '**2Se_Error options. is a combination of the following:'#010+ - '**3*_ : Compiler halts after the erro','rs (default is 1)'#010+ + '**2Se_Error options. is a combin','ation of the following:'#010+ + '**3*_ : Compiler halts after the errors (default is 1)'#010+ '**3*_w : Compiler also halts after warnings'#010+ '**3*_n : Compiler also halts after notes'#010+ '**3*_h : Compiler also halts after hints'#010+ - '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+ - '**2Sh_Use reference counted strings (','ansistring by default) instead '+ - 'of shortstrings'#010+ + '**2Sg_Enable LABEL and GOTO ','(default in -Mtp and -Mdelphi)'#010+ + '**2Sh_Use reference counted strings (ansistring by default) instead of'+ + ' shortstrings'#010+ '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+ '**2Sk_Load fpcylix unit'#010+ - '**2SI_Set interface style to '#010+ + '**2SI_Set interface style to <','x>'#010+ '**3SIcom_COM compatible interface (default)'#010+ - '**3SIcorba_CORBA comp','atible interface'#010+ + '**3SIcorba_CORBA compatible interface'#010+ '**2Sm_Support macros like C (global)'#010+ '**2So_Same as -Mtp'#010+ '**2Ss_Constructor name must be init (destructor must be done)'#010+ - '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+ - '**2Sy_@ returns a typed pointer',', same as $T+'#010+ + '**2Sx_Enable exception keywords (defa','ult in Delphi/ObjFPC modes)'#010+ + '**2Sy_@ returns a typed pointer, same as $T+'#010+ '**1s_Do not call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ '**2st_Generate script to link on target'#010+ - '**2sr_Skip register allocation phase (use with -alr)'#010+ + '**2sr_Skip register allocation phase (use ','with -alr)'#010+ '**1T_Target operating system:'#010+ - '3*2Tdarwin_Darwin/Mac OS',' X'#010+ + '3*2Tdarwin_Darwin/Mac OS X'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ - '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+ - 'rwin)'#010+ + '3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (o','lder versions: -T'+ + 'darwin)'#010+ '3*2Tlinux_Linux'#010+ - '3*2Tnativent_Native NT API ','(experimental)'#010+ + '3*2Tnativent_Native NT API (experimental)'#010+ '3*2Tnetbsd_NetBSD'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ '3*2Topenbsd_OpenBSD'#010+ '3*2Tos2_OS/2 / eComStation'#010+ - '3*2Tsunos_SunOS/Solaris'#010+ + '3*2Tsunos','_SunOS/Solaris'#010+ '3*2Tsymbian_Symbian OS'#010+ '3*2Tsolaris_Solaris'#010+ - '3*2Twatcom','_Watcom compatible DOS extender'#010+ + '3*2Twatcom_Watcom compatible DOS extender'#010+ '3*2Twdosx_WDOSX DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ '4*2Tdarwin_Darwin/Mac OS X'#010+ '4*2Tlinux_Linux'#010+ - '4*2Twin64_Win64 (64 bit Windows systems)'#010+ + '4*2Twin64_Win64 (64 bi','t Windows systems)'#010+ '6*2Tamiga_Commodore Amiga'#010+ - '6*2Tatari_Atari ST/STe/','TT'#010+ + '6*2Tatari_Atari ST/STe/TT'#010+ '6*2Tlinux_Linux'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+ @@ -1488,124 +1489,124 @@ const msgtxt : array[0..000291,1..240] of char=( 'P*2Tamiga_AmigaOS'#010+ 'P*2Tdarwin_Darwin/Mac OS X'#010+ 'P*2Tlinux_Linux'#010+ - 'P*2Tmacos_Mac OS (classic)'#010+ + 'P*2Tma','cos_Mac OS (classic)'#010+ 'P*2Tmorphos_MorphOS'#010+ 'S*2Tsolaris_Solaris'#010+ - 'S*2Tlin','ux_Linux'#010+ + 'S*2Tlinux_Linux'#010+ '**1u_Undefines the symbol '#010+ '**1U_Unit options:'#010+ '**2Un_Do not check where the unit name matches the file name'#010+ - '**2Ur_Generate release unit files (never automatically recompiled)'#010+ + '**2Ur_Generate release unit files (never automatic','ally recompiled)'#010+ '**2Us_Compile a system unit'#010+ - '**1v_Be verbose. ',' is a combination of the following letters:'#010+ + '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ '**2*_w : Show warnings u : Show unit info'#010+ - '**2*_n : Show notes t : Show tried/used files'#010+ - '**2*_h ',': Show hints c : Show conditionals'#010+ + '**','2*_n : Show notes t : Show tried/used files'#010+ + '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+ - '**2*_s : Show time stamps q : Show message numbers',#010+ + '**2*_l : Show linenumbers r : Rhide/GCC compatibilit','y mod'+ + 'e'#010+ + '**2*_s : Show time stamps q : Show message numbers'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_b : Write file names messages p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ with full path v : Write fpcdebug.txt with'#010+ - '**2*_ ',' lots of debugging info'#010+ + '**2*_ with full path ',' v : Write fpcdebug.txt with'#010+ + '**2*_ lots of debugging info'#010+ '**2*_m, : Don'#039't show messages numbered and '#010+ 'F*1V_Append '#039'-'#039' to the used compiler binary name (e.g. f'+ 'or version)'#010+ - '**1W_Target-specific options (targets)'#010+ - '3*2WA_Specify native type applicati','on (Windows)'#010+ + '**1W_T','arget-specific options (targets)'#010+ + '3*2WA_Specify native type application (Windows)'#010+ '4*2WA_Specify native type application (Windows)'#010+ 'A*2WA_Specify native type application (Windows)'#010+ '3*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'P*2Wb_Create a bundle instead of a library (Darwin)'#010+ - 'p*2Wb_Create a bundle inste','ad of a library (Darwin)'#010+ + 'P*2Wb_Creat','e a bundle instead of a library (Darwin)'#010+ + 'p*2Wb_Create a bundle instead of a library (Darwin)'#010+ 'A*2Wb_Create a bundle instead of a library (Darwin)'#010+ '4*2Wb_Create a bundle instead of a library (Darwin)'#010+ - '3*2WB_Create a relocatable image (Windows, Symbian)'#010+ + '3*2WB_Create a relocatable image (Windows, ','Symbian)'#010+ '3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ - '4*2WB_C','reate a relocatable image (Windows)'#010+ + '4*2WB_Create a relocatable image (Windows)'#010+ '4*2WBxxxx_Set image base to xxxx (Windows)'#010+ 'A*2WB_Create a relocatable image (Windows, Symbian)'#010+ - 'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+ - '3*2WC_Specify console type application (EMX, OS/2, Window','s)'#010+ + 'A*2WBxxxx_Set image base to xxxx (Windows',', Symbian)'#010+ + '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ '4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+ 'A*2WC_Specify console type application (Windows)'#010+ 'P*2WC_Specify console type application (Classic Mac OS)'#010+ - '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ - '4*2WD_Use ','DEFFILE to export functions of DLL or EXE (Windows)'#010+ + '3*2W','D_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ + '4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ 'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+ '3*2We_Use external resources (Darwin)'#010+ - '4*2We_Use external resources (Darwin)'#010+ + '4*2We_Use external r','esources (Darwin)'#010+ 'A*2We_Use external resources (Darwin)'#010+ - 'P*2We_Use ex','ternal resources (Darwin)'#010+ + 'P*2We_Use external resources (Darwin)'#010+ 'p*2We_Use external resources (Darwin)'#010+ '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+ - '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ + '3*2WG_Specify graphic type application (EMX, OS/2, Wi','ndows)'#010+ '4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+ - 'A','*2WG_Specify graphic type application (Windows)'#010+ + 'A*2WG_Specify graphic type application (Windows)'#010+ 'P*2WG_Specify graphic type application (Classic Mac OS)'#010+ '3*2Wi_Use internal resources (Darwin)'#010+ - '4*2Wi_Use internal resources (Darwin)'#010+ + '4*2Wi_Use internal resources (','Darwin)'#010+ 'A*2Wi_Use internal resources (Darwin)'#010+ - 'P*2Wi_Use internal res','ources (Darwin)'#010+ + 'P*2Wi_Use internal resources (Darwin)'#010+ 'p*2Wi_Use internal resources (Darwin)'#010+ '3*2WI_Turn on/off the usage of import sections (Windows)'#010+ '4*2WI_Turn on/off the usage of import sections (Windows)'#010+ - 'A*2WI_Turn on/off the usage of import sections (Windows)'#010+ - '8*2Wm_Set me','mory model'#010+ + 'A*2W','I_Turn on/off the usage of import sections (Windows)'#010+ + '8*2Wm_Set memory model'#010+ '8*3WmTiny_Tiny memory model'#010+ '8*3WmSmall_Small memory model (default)'#010+ '8*3WmMedium_Medium memory model'#010+ - '3*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ - 'n)'#010+ - '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5','.1, ... (Dar'+ + '3*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, .','.. (Dar'+ 'win)'#010+ + '4*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ + 'n)'#010+ 'p*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ 'P*2WM_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+ 'n)'#010+ - '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - '4*2WN_D','o not generate relocation code, needed for debugging (Windows'+ + '3*2WN_Do ','not generate relocation code, needed for debugging (Windows'+ ')'#010+ + '4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ 'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+ - 'A*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ - 'V*2Wpxxxx_Specify the controller type',', see fpc -i for possible value'+ + 'A*2Wpxxxx_Specify the controller type, ','see fpc -i for possible value'+ 's'#010+ + 'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+ '3*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+ 'A*2WP_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+ - '3*2WR_Generate relocation code (Windows)'#010+ - '4*2WR_Generate relocation code ','(Windows)'#010+ + '3*2W','R_Generate relocation code (Windows)'#010+ + '4*2WR_Generate relocation code (Windows)'#010+ 'A*2WR_Generate relocation code (Windows)'#010+ '8*2Wt_Set the target executable format'#010+ '8*3Wtexe_Create a DOS .EXE file (default)'#010+ - '8*3Wtcom_Create a DOS .COM file (requires tiny memory model)'#010+ - 'P*2WT_Specify MPW tool type application (Cla','ssic Mac OS)'#010+ + '8*3Wtcom_Create a DOS .COM file (requ','ires tiny memory model)'#010+ + 'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+ '**2WX_Enable executable stack (Linux)'#010+ '**1X_Executable options:'#010+ '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+ 'ux)'#010+ - '**2Xd_Do not search default library path (sometimes required for cross'+ - '-compiling when not ','using -XR)'#010+ + '**2Xd_Do not search de','fault library path (sometimes required for cro'+ + 'ss-compiling when not using -XR)'#010+ '**2Xe_Use external linker'#010+ '**2Xg_Create debuginfo in a separate file and add a debuglink section '+ 'to executable'#010+ - '**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+ + '**2XD_Try to link units dynamically (defines F','PC_LINK_DYNAMIC)'#010+ '**2Xi_Use internal linker'#010+ '**2Xm_Generate link map'#010+ - '*','*2XM_Set the name of the '#039'main'#039' program routine (default'+ - ' is '#039'main'#039')'#010+ + '**2XM_Set the name of the '#039'main'#039' program routine (default i'+ + 's '#039'main'#039')'#010+ 'F*2Xp_First search for the compiler binary in the directory '#010+ - '**2XP_Prepend the binutils names with the prefix '#010+ - '**2Xr_Set the linker'#039's rlink-path to (n','eeded for cross co'+ - 'mpile, see the ld manual for more information) (BeOS, Linux)'#010+ + '**2XP_Prepend the binutils name','s with the prefix '#010+ + '**2Xr_Set the linker'#039's rlink-path to (needed for cross comp'+ + 'ile, see the ld manual for more information) (BeOS, Linux)'#010+ '**2XR_Prepend to all linker search paths (BeOS, Darwin, FreeBSD'+ - ', Linux, Mac OS, Solaris)'#010+ + ', Linux, Mac OS, Solari','s)'#010+ '**2Xs_Strip all symbols from executable'#010+ - '**2XS_Try to link units s','tatically (default, defines FPC_LINK_STATIC'+ - ')'#010+ + '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+ '**2Xt_Link with static libraries (-static is passed to linker)'#010+ - '**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+ + '**2XX_Try to smartlink units (defines FPC_LINK_SMART',')'#010+ '**1*_'#010+ '**1?_Show this help'#010+ '**1h_Shows this help without waiting' diff --git a/compiler/options.pas b/compiler/options.pas index 09e1cfa304..e62242f85a 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -1144,7 +1144,7 @@ begin include(init_settings.moduleswitches,cs_explicit_codepage); end; 'C' : - RCCompiler := More; + RCCompiler:=More; 'd' : if UnsetBool(more, 0, opt, true) then init_settings.disabledircache:=false @@ -1185,6 +1185,8 @@ begin else IllegalPara(opt); end; + 'M' : + unicodepath:=FixPath(More,true); 'g' : Message2(option_obsolete_switch_use_new,'-Fg','-Fl'); 'l' : @@ -1211,7 +1213,7 @@ begin 'r' : Msgfilename:=More; 'R' : - ResCompiler := More; + ResCompiler:=More; 'u' : begin if ispara then diff --git a/compiler/scandir.pas b/compiler/scandir.pas index da8a8fdd02..a3cf2c320e 100644 --- a/compiler/scandir.pas +++ b/compiler/scandir.pas @@ -1511,7 +1511,7 @@ unit scandir; s:=current_scanner.readcomment; if (upper(s)='UTF8') or (upper(s)='UTF-8') then current_settings.sourcecodepage:=CP_UTF8 - else if not(cpavailable(s)) then + else if not(cpavailable(s) or loadbinarycp(s)) then Message1(option_code_page_not_available,s) else current_settings.sourcecodepage:=codepagebyname(s); diff --git a/compiler/widestr.pas b/compiler/widestr.pas index 0e71949927..5df1d1fd42 100644 --- a/compiler/widestr.pas +++ b/compiler/widestr.pas @@ -63,12 +63,17 @@ unit widestr; d : pchar; dcp : tstringencoding ); function codepagebyname(const s : string) : tstringencoding; + function loadbinarycp(const s: String): Boolean; implementation uses {$if FPC_FULLVERSION>20700} - cpall, + { the majority of character maps can be loaded by + compiler from binary file from the directory passed + by -FM compiler switch } + // cp8859_1,cp437, + cpall, // disable this when dynamic charset loading is ready {$endif} globals,cutils; @@ -324,4 +329,13 @@ unit widestr; Result:=p^.cp; end; + function loadbinarycp(const s: String): Boolean; + begin + {$if FPC_FULLVERSION>20700} + result:=(unicodepath<>'')and(registerbinarymapping(unicodepath+'charset',s)); + {$else} + result:=false; + {$ifend} + end; + end.