Add units required for wide strings support for go32v2 target

git-svn-id: trunk@38740 -
This commit is contained in:
pierre 2018-04-12 12:53:20 +00:00
parent f9069b1ec6
commit c9f15c906e
6 changed files with 105 additions and 9 deletions

View File

@ -3,10 +3,33 @@ program strtest;
{$MODE OBJFPC} {$MODE OBJFPC}
{$LONGSTRINGS ON} {$LONGSTRINGS ON}
{$ifdef unix} {$ifdef go32v2}
uses CWstring; {$define USE_INTERNAL_UNICODE}
{$endif} {$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses
{$ifdef unix}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif ndef USE_INTERNAL_UNICODE}
{$endif unix}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
Strings;
type type
tEnum = (North, East, South, West); tEnum = (North, East, South, West);

View File

@ -1,10 +1,36 @@
{ %opt=-gh } { %opt=-gh }
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
program tw19701; program tw19701;
{$ifdef FPC}{$mode objfpc}{$h+}{$endif} {$ifdef FPC}{$mode objfpc}{$h+}{$endif}
{$ifdef mswindows}{$apptype console}{$endif} {$ifdef mswindows}{$apptype console}{$endif}
uses uses
{$ifdef FPC}{$ifdef linux}cthreads,cwstring,{$endif}{$endif} {$ifdef FPC}
{$ifdef linux}
cthreads,
{$endif}
{$endif}
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif ndef USE_INTERNAL_UNICODE}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
sysutils,uw19701; sysutils,uw19701;
begin begin
HaltOnNotReleased:=True; HaltOnNotReleased:=True;

View File

@ -1,10 +1,35 @@
{ %opt=-gh } { %opt=-gh }
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
program outpar; program outpar;
{$ifdef FPC}{$mode objfpc}{$h+}{$endif} {$ifdef FPC}{$mode objfpc}{$h+}{$endif}
{$ifdef mswindows}{$apptype console}{$endif} {$ifdef mswindows}{$apptype console}{$endif}
uses uses
{$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif} {$ifdef FPC}
{$ifdef unix}
cthreads,
{$ifndef USE_INTERNAL_UNICODE}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif ndef USE_INTERNAL_UNICODE}
{$endif}
{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
sysutils; sysutils;
{$ifndef FPC} {$ifndef FPC}
type type

View File

@ -7,7 +7,7 @@ program tw30119;
// fkdane, // fkdane,
// fkrecord; // fkrecord;
//uses //uses
// cwstring; // cwstringdisabled;
{$H+} {$H+}

View File

@ -7,7 +7,7 @@ program tw30119;
// fkdane, // fkdane,
// fkrecord; // fkrecord;
//uses //uses
// cwstring; // cwstringdisabled;
{$H+} {$H+}

View File

@ -4,10 +4,32 @@ program cp;
{$h+} {$h+}
{$codepage utf8} {$codepage utf8}
{$ifdef go32v2}
{$define USE_INTERNAL_UNICODE}
{$endif}
{$ifdef USE_INTERNAL_UNICODE}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$define USE_CPALL_UNIT}
{$endif}
uses uses
SysUtils {$ifdef unix}
{$ifdef unix}, cwstring {$ifndef USE_INTERNAL_UNICODE}
{$endif}; {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif ndef USE_INTERNAL_UNICODE}
{$endif unix}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef USE_CPALL_UNIT}
cpall,
{$endif}
SysUtils;
type type
string1252 = type ansistring(1252); string1252 = type ansistring(1252);