Add fpwidestring and unicodeducet in uses clause for go32v2 target

git-svn-id: trunk@38735 -
This commit is contained in:
pierre 2018-04-12 09:58:13 +00:00
parent 79730fe479
commit 980df21fee
11 changed files with 136 additions and 3 deletions

View File

@ -2,9 +2,19 @@ program fpctest4;
{$ifdef fpc} {$ifdef fpc}
{$mode delphi} {$mode delphi}
{$endif fpc} {$endif fpc}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef unix} {$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif} {$endif}
Classes,sysutils,variants,typinfo; Classes,sysutils,variants,typinfo;

View File

@ -1,8 +1,24 @@
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif} {$ifdef unix}
Classes, SysUtils; {$ifdef darwin}
iosxwstr,
{$else}
cwstring,
{$endif}
{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
Classes, SysUtils;
const buffer : array[1..20334] of char=( const buffer : array[1..20334] of char=(

View File

@ -1,5 +1,16 @@
{$codepage cp866} {$codepage cp866}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet;
{$endif}
{$endif}
{$ifdef unix} {$ifdef unix}
uses uses
{$ifdef darwin}iosxwstr{$else}cwstring{$endif}; {$ifdef darwin}iosxwstr{$else}cwstring{$endif};

View File

@ -7,9 +7,20 @@ program test;
{$apptype console} {$apptype console}
{$endif} {$endif}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef unix} {$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif} {$endif}
Classes,SysUtils,uw13015; Classes,SysUtils,uw13015;

View File

@ -1,9 +1,19 @@
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef unix} {$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif} {$endif}
Classes, SysUtils; Classes, SysUtils;

View File

@ -1,7 +1,17 @@
program comparetext; program comparetext;
{$ifdef FPC}{$mode objfpc}{$h+}{$endif} {$ifdef FPC}{$mode objfpc}{$h+}{$endif}
{$ifdef mswindows}{$apptype console}{$endif} {$ifdef mswindows}{$apptype console}{$endif}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
sysutils sysutils
{$ifdef unix} {$ifdef unix}
,{$ifdef darwin}iosxwstr{$else}cwstring{$endif} ,{$ifdef darwin}iosxwstr{$else}cwstring{$endif}

View File

@ -2,6 +2,18 @@ program concatenate_resourestrings_delphiunicode;
{$mode delphiunicode} {$mode delphiunicode}
{$codepage cp1250} {$codepage cp1250}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet;
{$endif}
{$endif}
{$ifdef unix} {$ifdef unix}
uses uses

View File

@ -1,5 +1,17 @@
program TestStrIComp; program TestStrIComp;
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif} {$ifdef unix}{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}
SysUtils; SysUtils;

View File

@ -1,5 +1,16 @@
program tw4080; program tw4080;
{$i+} {$i+}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
uses
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet;
{$endif}
{$endif}
{$ifdef unix} {$ifdef unix}
uses uses

View File

@ -1,8 +1,28 @@
program av; program av;
{$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif} {$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif}
{$ifdef mswindows}{$apptype console}{$endif} {$ifdef mswindows}{$apptype console}{$endif}
{$ifdef go32v2}
{$define USE_FPWIDESTRING_UNIT}
{$define USE_UNICODEDUCET_UNIT}
{$endif}
uses uses
{$ifdef FPC}{$ifdef unix}cthreads,{$ifdef darwin}iosxwstr{$else}cwstring{$endif},{$endif}{$endif}sysutils; {$ifdef FPC}
{$ifdef unix}
cthreads,
{$ifdef darwin}
iosxwstr
{$else}
cwstring
{$endif}
,{$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
{$endif}
sysutils;
type type
testrecty = record testrecty = record
str: widestring; str: widestring;

View File

@ -1,9 +1,19 @@
{ %norun } { %norun }
{$ifdef go32v2}
{$define use_fpwidestring_unit}
{$define use_unicodeducet_unit}
{$endif}
uses uses
{$ifdef unix} {$ifdef unix}
{$ifdef darwin}iosxwstr{$else}cwstring{$endif}, {$ifdef darwin}iosxwstr{$else}cwstring{$endif},
{$endif} {$endif}
{$ifdef USE_FPWIDESTRING_UNIT}
fpwidestring,
{$endif}
{$ifdef USE_UNICODEDUCET_UNIT}
unicodeducet,
{$endif}
sysutils; sysutils;
{ just to make sure that no all wide->shortstring compile time conversions } { just to make sure that no all wide->shortstring compile time conversions }