include file simplification

QRCodeGenLib/src/Include/QRCodeGenLib.inc

@@ -1,6 +1,6 @@
 { *********************************************************************************** }
 { *                              QRCodeGenLib Library                               * }
-{ *                 Copyright (c) 2018 - 2019 Ugochukwu Mmaduekwe                   * }
+{ *                          Author - Ugochukwu Mmaduekwe                           * }
 { *                 Github Repository <https://github.com/Xor-el>                   * }
 
 { *  Distributed under the MIT software license, see the accompanying file LICENSE  * }
@@ -10,21 +10,48 @@
 
 (* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
 
+{========================== Common Compiler Settings ==========================}
+
+{$HINTS OFF}
+{$WARNINGS OFF}
+{$RANGECHECKS OFF}
+{$OVERFLOWCHECKS OFF}
+{$SCOPEDENUMS ON}
+{$POINTERMATH ON}
+
+{========================= Compiler Specific Settings =========================}
 
-{---------------------------- Compiler Family Switch --------------------------}
 {$IFDEF FPC}
-  {$I QRCodeGenLibFPC.inc} // FPC-specific settings
+  {$I QRCodeGenLibFPC.inc}
 {$ELSE}
+   // Delphi XE3 and Above
+  {$IF CompilerVersion < 24.0}
+    {$MESSAGE ERROR 'This Library requires Delphi XE3 or higher.'}
+  {$IFEND}
+
   {$DEFINE DELPHI}
-  {$I ../../QRCodeGenLib/src/Include/QRCodeGenLibDelphi.inc} // Delphi-specific settings
-{$ENDIF}
 
-{-------------------------- Common Compiler Settings --------------------------}
-{$SCOPEDENUMS ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$POINTERMATH ON}
-{$WARNINGS OFF}
-{$HINTS OFF}
+  {$DEFINITIONINFO ON} // Enable code browsing (Ctrl+Click)
+  {$STRINGCHECKS OFF}
+  {$WARN DUPLICATE_CTOR_DTOR OFF}
+
+  {.$DEFINE Framework_FMX} // enable to force FMX mode
+  {$IFDEF Framework_FMX}
+     {$UNDEF VCL}
+     {$DEFINE FMX}
+  {$ELSE}
+     {$DEFINE VCL}
+  {$ENDIF}
+
+  {$IFDEF VCL}
+     {$DEFINE VCL_OR_LCL}
+  {$ENDIF VCL}
+
+  // XE and Above
+  {$IF CompilerVersion >= 22.0}
+     {$DEFINE DELPHIXE_UP}
+  {$IFEND}
+
+{$ENDIF}
 
 (* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)

QRCodeGenLib/src/Include/QRCodeGenLibDelphi.inc

@@ -1,39 +0,0 @@
-{ *********************************************************************************** }
-{ *                              QRCodeGenLib Library                               * }
-{ *                 Copyright (c) 2018 - 2019 Ugochukwu Mmaduekwe                   * }
-{ *                 Github Repository <https://github.com/Xor-el>                   * }
-
-{ *  Distributed under the MIT software license, see the accompanying file LICENSE  * }
-{ *          or visit http://www.opensource.org/licenses/mit-license.php.           * }
-
-{ * ******************************************************************************* * }
-
-(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
-
-{$IFDEF DELPHI}
-  {$DEFINITIONINFO ON}       // IDE navigation; no binary impact
-  {$STRINGCHECKS OFF}
-  {$WARN DUPLICATE_CTOR_DTOR OFF}
-
-  {.$DEFINE Framework_FMX} // enable to force FMX mode
-  {$IFDEF Framework_FMX}
-     {$UNDEF VCL}
-     {$DEFINE FMX}
-  {$ELSE}
-     {$DEFINE VCL}
-  {$ENDIF}
-
-  {$IFDEF VCL}
-     {$DEFINE VCL_OR_LCL}
-  {$ENDIF VCL}
-
-  // XE and Above
-  {$IF CompilerVersion >= 22.0}
-     {$DEFINE DELPHIXE_UP}
-  {$IFEND}
-
-  {$IF CompilerVersion < 24.0}
-    {$MESSAGE ERROR 'This Library requires Delphi XE3 or higher.'}
-  {$IFEND}
-{$ENDIF}
-

QRCodeGenLib/src/Include/QRCodeGenLibFPC.inc

@@ -1,6 +1,6 @@
 { *********************************************************************************** }
 { *                              QRCodeGenLib Library                               * }
-{ *                 Copyright (c) 2018 - 2019 Ugochukwu Mmaduekwe                   * }
+{ *                          Author - Ugochukwu Mmaduekwe                           * }
 { *                 Github Repository <https://github.com/Xor-el>                   * }
 
 { *  Distributed under the MIT software license, see the accompanying file LICENSE  * }