Merge pull request #18 from ESTOS/tokyo_issue#17

added tokyo to compiler defines. Fixes #17
graphics32 · Jun 7, 2017 · 6009241 · 6009241
2 parents 2c9823c + ec5cb65
commit 6009241
Showing 1 changed file with 29 additions and 3 deletions.
diff --git a/Source/GR32_Compiler.inc b/Source/GR32_Compiler.inc
@@ -56,6 +56,7 @@
     COMPILERXE8  - Delphi XE8
     COMPILERRX   - Delphi RX
     COMPILERRX1  - Delphi RX1
+	COMPILERRX2  - Delphi RX2 (10.2 Tokyo)
 
 
   Available Targets:
@@ -74,11 +75,11 @@
 {$ENDIF}
 
 {$IFDEF VER_LATEST} // adjust for newer version (always use latest version)
-  {$DEFINE COMPILERRX1}
+  {$DEFINE COMPILERRX2}
   {$IFNDEF BCB}
-    {$DEFINE DELPHIRX1}
+    {$DEFINE DELPHIRX2}
   {$ELSE}
-    {$DEFINE BCBRX1}
+    {$DEFINE BCBRX2}
   {$ENDIF}
   {$UNDEF VER_LATEST}
 {$ENDIF}
@@ -245,6 +246,27 @@
   {$ENDIF}
 {$ENDIF}
 
+{$IFDEF COMPILERRX2}
+  {$DEFINE COMPILERRX2_UP}
+  {$DEFINE COMPILERRX1_UP}
+  {$DEFINE COMPILERRX_UP}
+  {$DEFINE COMPILERXE8_UP}
+  {$DEFINE COMPILERXE7_UP}
+  {$DEFINE COMPILERXE6_UP}
+  {$DEFINE COMPILERXE5_UP}
+  {$DEFINE COMPILERXE4_UP}
+  {$DEFINE COMPILERXE3_UP}
+  {$DEFINE COMPILERXE2_UP}
+  {$DEFINE COMPILERXE1_UP}
+  {$DEFINE COMPILER2010_UP}
+  {$DEFINE COMPILER2009_UP}
+  {$DEFINE COMPILER2007_UP}
+  {$DEFINE COMPILER2006_UP}
+  {$DEFINE COMPILER2005_UP}
+  {$DEFINE COMPILER7_UP}
+  {$DEFINE COMPILER6_UP}
+{$ENDIF}
+
 {$IFDEF COMPILERRX1}
   {$DEFINE COMPILERRX1_UP}
   {$DEFINE COMPILERRX_UP}
@@ -764,3 +786,7 @@
 {$IFDEF COMPILERRX1_UP}
   {$DEFINE COMPILERRX1}
 {$ENDIF}
+
+{$IFDEF COMPILERRX2_UP}
+  {$DEFINE COMPILERRX2}
+{$ENDIF}