Simba: Attempt to fix include_once behaviour.

Villavu · Jul 26, 2011 · 303253a · 303253a
1 parent 31df8c6
commit 303253a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Projects/Simba/Simba.inc b/Projects/Simba/Simba.inc
@@ -26,6 +26,8 @@
                             // See Units/Linux/keybinder.pas
 {$ENDIF}
 
+//{$DEFINE SIMBA_VERBOSE} // For more verbosity.
+
 //{$DEFINE USE_RUTIS}
 
 //{$DEFINE USE_CPASCAL} // TODO

diff --git a/Units/MMLAddon/mmlpsthread.pas b/Units/MMLAddon/mmlpsthread.pas
@@ -746,11 +746,15 @@ function TPSThread.FileAlreadyIncluded(Sender: TObject; FileName: string): Boole
   if (path <> '') then
     if Includes.Find(path,i) then
     begin
-      psWriteln('Include_Once file already included');
-      Result := False;
+      {$IFDEF SIMBA_VERBOSE}
+      psWriteln('Include_Once file already included:' + Path);
+      {$ENDIF}
+      Result := True;
+      Exit;
     end;
+
   Includes.Add(path);
-  Result := True;
+  Result := False;
 end;
 
 procedure SIRegister_Mufasa(cl: TPSPascalCompiler);