Merge branch 'master' of github.com:VSoftTechnologies/Delphi-WeakRefe…

…rences
VSoftTechnologies · Dec 14, 2019 · b2d3228 · b2d3228
2 parents 2921433 + 7039b11
commit b2d3228
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/VSoft.inc b/src/VSoft.inc
@@ -14,8 +14,10 @@
 //Use namespaces
 {$DEFINE USE_NS}
 
-{$DEFINE DELPHIX_BERLIN_DOWN}
-{$DEFINE DELPHIX_SEATTLE_DOWN}
+{$DEFINE DELPHI_XE103_DOWN}
+{$DEFINE DELPHI_XE102_DOWN}
+{$DEFINE DELPHI_XE101_DOWN}
+{$DEFINE DELPHI_XE10_DOWN}
 {$DEFINE DELPHI_XE8_DOWN}
 {$DEFINE DELPHI_XE7_DOWN}
 {$DEFINE DELPHI_XE6_DOWN}
@@ -172,8 +174,8 @@
   {$DEFINE DELPHI_XE7}
   {$DEFINE DELPHI_XE7_UP}
   {$DEFINE DELPHI_XE8_UP}
-  {$DEFINE DELPHIX_SEATTLE_UP}
-  {$DEFINE DELPHIX_SEATTLE}
+  {$DEFINE DELPHIX_XE10_UP}
+  {$DEFINE DELPHIX_XE10}
   {$DEFINE SUPPORTS_REGEX}
   {$DEFINE USE_NS}
   {$UNDEF DELPHI_2010_DOWN}
@@ -201,6 +203,8 @@
   {$DEFINE DELPHIX_SEATTLE_UP}
   {$DEFINE DELPHIX_SEATTLE}
   {$DEFINE DELPHI_XE10_UP}
+  {$DEFINE DELPHI_XE101_UP}
+  {$DEFINE DELPHI_XE101}
   {$DEFINE SUPPORTS_REGEX}
   {$DEFINE USE_NS}
   {$UNDEF DELPHI_2010_DOWN}
@@ -212,8 +216,7 @@
   {$UNDEF DELPHI_XE6_DOWN}
   {$UNDEF DELPHI_XE7_DOWN}
   {$UNDEF DELPHI_XE8_DOWN}
-  {$UNDEF DELPHIX_BERLIN_DOWN}
-
+  {$UNDEF DELPHI_XE10_DOWN}
 {$ENDIF VER310}
 
 {$IFDEF VER320} // RAD Studio 10.2 Tokyo
@@ -232,6 +235,7 @@
   {$DEFINE DELPHI_XE10_UP}
   {$DEFINE DELPHI_XE101_UP}
   {$DEFINE DELPHI_XE102_UP}
+  {$DEFINE DELPHI_XE102}
   {$DEFINE SUPPORTS_REGEX}
   {$DEFINE USE_NS}
   {$UNDEF DELPHI_2010_DOWN}
@@ -245,10 +249,9 @@
   {$UNDEF DELPHI_XE8_DOWN}
   {$UNDEF DELPHI_XE10_DOWN}
   {$UNDEF DELPHI_XE101_DOWN}
-  {$DEFINE DELPHI_XE102_DOWN} 
 {$ENDIF VER320}
 
-{$IFDEF VER330} // RAD Studio 10.3 Rio
+{$IFDEF VER330} // RAD Studio 10.3
   {$DEFINE DELPHI_2010_UP}
   {$DEFINE DELPHI_XE_UP}
   {$DEFINE DELPHI_XE2_UP}
@@ -265,6 +268,7 @@
   {$DEFINE DELPHI_XE101_UP}
   {$DEFINE DELPHI_XE102_UP}
   {$DEFINE DELPHI_XE103_UP}
+  {$DEFINE DELPHI_XE103}
   {$DEFINE SUPPORTS_REGEX}
   {$DEFINE USE_NS}
   {$UNDEF DELPHI_2010_DOWN}
@@ -279,12 +283,4 @@
   {$UNDEF DELPHI_XE10_DOWN}
   {$UNDEF DELPHI_XE101_DOWN}
   {$UNDEF DELPHI_XE102_DOWN}
-  {$UNDEF DELPHI_XE103_DOWN}
-{$ENDIF VER320}
-
-
-{$IFNDEF SUPPORTS_REGEX}
-  {$IFDEF USE_TREGEXPR}
-    {$DEFINE SUPPORTS_REGEX}
-  {$ENDIF}
-{$ENDIF}
+{$ENDIF VER330}