Change directory separator (for linux builds)

slackydev · Apr 22, 2016 · e2f441b · e2f441b
1 parent 84ebe04
commit e2f441b
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 708 deletions.
diff --git a/COPYING b/COPYING
diff --git a/OCRBitmap.pas b/OCRBitmap.pas
@@ -1,11 +1,9 @@
 unit OCRBitmap;
 {==============================================================================]
-  Author: Jarl K. Holta
+  Copyright (c) 2016, Jarl `slacky` Holta
   Project: SimpleOCR
   Project URL: https://github.com/WarPie/SimpleOCR
-  License: GNU GPL v3 (http://www.gnu.org/licenses/gpl.html)
-  
-  A minimalistic bitmap type.
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
 [==============================================================================}
 {$mode objfpc}{$H+}
 {$macro on}

diff --git a/OCREngine.pas b/OCREngine.pas
@@ -1,9 +1,9 @@
 unit OCREngine;
 {==============================================================================]
-  Author: Jarl K. Holta
-  Project: SimpleOCR 
+  Copyright (c) 2016, Jarl `slacky` Holta
+  Project: SimpleOCR
   Project URL: https://github.com/WarPie/SimpleOCR
-  License: GNU GPL v3 (http://www.gnu.org/licenses/gpl.html)
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
 [==============================================================================}
 {$mode objfpc}{$H+}
 {$macro on}

diff --git a/OCRTypes.pas b/OCRTypes.pas
@@ -1,9 +1,9 @@
 unit OCRTypes;
 {==============================================================================]
-  Author: Jarl K. Holta
-  Project: SimpleOCR 
+  Copyright (c) 2016, Jarl `slacky` Holta
+  Project: SimpleOCR
   Project URL: https://github.com/WarPie/SimpleOCR
-  License: GNU GPL v3 (http://www.gnu.org/licenses/gpl.html)
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
 [==============================================================================}
 {$mode objfpc}{$H+}
 {$macro on}

diff --git a/OCRUtils.pas b/OCRUtils.pas
@@ -1,9 +1,9 @@
 unit OCRUtils;
 {==============================================================================]
-  Author: Jarl K. Holta
-  Project: SimpleOCR 
-  Project URL: https://github.com/WarPie/OSR-OCR
-  License: GNU GPL (http://www.gnu.org/licenses/gpl.html)
+  Copyright (c) 2016, Jarl `slacky` Holta
+  Project: SimpleOCR
+  Project URL: https://github.com/WarPie/SimpleOCR
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
  
  Utilities needed for the OCR-engine.
 [==============================================================================}
@@ -190,17 +190,18 @@ function ListDir(Path:String): TStringArray;
 end;
 
 function FindFontPath(Font:String): String;
+var
+  i,j:Int32;
+  paths:array [0..2] of string = ('Fonts/','Includes/','');
 begin
-  if not(Font[Length(Font)] = '\') then Font += '\';
+  if not(Font[Length(Font)] = '/') then Font += '/';
   if DirectoryExists(Font) then Exit(Font);
-  if DirectoryExists('Fonts\'+Font) then Exit('Fonts\'+Font);
-  if DirectoryExists('..\Fonts\'+Font) then Exit('..\Fonts\'+Font);
-  if DirectoryExists('..\..\Fonts\'+Font) then Exit('..\..\Fonts\'+Font);
-  if DirectoryExists('..\..\..\Fonts\'+Font) then Exit('..\..\..\Fonts\'+Font);
-
-  if DirectoryExists('Includes\'+Font) then Exit('Includes\'+Font);
-  if DirectoryExists('..\Includes\'+Font) then Exit('..\Includes\'+Font);
-  if DirectoryExists('..\..\Includes\'+Font) then Exit('..\..\Includes\'+Font);
+
+  for i:=0 to High(paths) do
+    for j:=0 to 6 do
+      if DirectoryExists(paths[i]+Font) then Exit(paths[i] + Font)
+      else paths[i] := '../' + paths[i];
+
   Result := Font;
 end;
 

diff --git a/SimbaPlugin.inc b/SimbaPlugin.inc
@@ -1,7 +1,9 @@
-{=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=]
- Copyright (c) 2014, Jarl K. <Slacky> Holta || http://github.com/WarPie
- All rights reserved.
-[=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=}
+{==============================================================================]
+  Copyright (c) 2016, Jarl `slacky` Holta
+  Project: SimpleOCR
+  Project URL: https://github.com/WarPie/SimpleOCR
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
+[==============================================================================}
 var
   Methods: array of record procAddr: Pointer; ProcDef:PChar; end;
   TypeDefs: array of record TypeName, TypeDef:PChar; end;

diff --git a/SimpleOCR.lpi b/SimpleOCR.lpi
@@ -20,8 +20,53 @@
     <VersionInfo>
       <StringTable ProductVersion=""/>
     </VersionInfo>
-    <BuildModes Count="1">
+    <BuildModes Count="3">
       <Item1 Name="Default" Default="True"/>
+      <Item2 Name="Win32">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <PathDelim Value="\"/>
+          <Target>
+            <Filename Value="SimpleOCR32"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+          </SearchPaths>
+          <CodeGeneration>
+            <RelocatableUnit Value="True"/>
+            <TargetOS Value="win32"/>
+          </CodeGeneration>
+          <Linking>
+            <Options>
+              <ExecutableType Value="Library"/>
+            </Options>
+          </Linking>
+        </CompilerOptions>
+      </Item2>
+      <Item3 Name="Win64">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <PathDelim Value="\"/>
+          <Target>
+            <Filename Value="SimpleOCR64"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+          </SearchPaths>
+          <CodeGeneration>
+            <RelocatableUnit Value="True"/>
+            <TargetCPU Value="x86_64"/>
+            <TargetOS Value="win64"/>
+          </CodeGeneration>
+          <Linking>
+            <Options>
+              <ExecutableType Value="Library"/>
+            </Options>
+          </Linking>
+        </CompilerOptions>
+      </Item3>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>

diff --git a/SimpleOCR.lpr b/SimpleOCR.lpr
@@ -1,9 +1,9 @@
 library SimpleOCR;
 {==============================================================================]
-  Author: Jarl K. Holta
-  Project: SimpleOCR 
+  Copyright (c) 2016, Jarl `slacky` Holta
+  Project: SimpleOCR
   Project URL: https://github.com/WarPie/SimpleOCR
-  License: GNU GPL v3 (http://www.gnu.org/licenses/gpl.html)
+  License: GNU Lesser GPL (http://www.gnu.org/licenses/lgpl.html)
 [==============================================================================}
 {$mode objfpc}{$H+}
 {$macro on}

diff --git a/SimpleOCR.lps b/SimpleOCR.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="9"/>
-    <BuildModes Active="Default"/>
+    <BuildModes Active="Win64"/>
     <Units Count="10">
       <Unit0>
         <Filename Value="SimpleOCR.lpr"/>
@@ -49,8 +49,8 @@
         <UnitName Value="OCREngine"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="4"/>
-        <TopLine Value="186"/>
-        <CursorPos X="26" Y="199"/>
+        <TopLine Value="189"/>
+        <CursorPos X="36" Y="214"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
       </Unit6>