From 4b5f7d03059fc5804715b30108835b39a4da1998 Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Sun, 12 Sep 2010 14:27:42 +0200
Subject: [PATCH] ScriptManager: Fix threads on UNIX

---
 Projects/ScriptManager/project1.lpr           | 6 +++---
 Projects/ScriptManager/scriptmanager.pas      | 6 ++++--
 Projects/{MMLLib => libmml}/array.py          | 0
 Projects/{MMLLib => libmml}/libmml.lpi        | 0
 Projects/{MMLLib => libmml}/libmml.lpr        | 0
 Projects/{MMLLib => libmml}/pymml/mml.py      | 0
 Projects/{MMLLib => libmml}/pymml/mmlcolor.py | 0
 Projects/{MMLLib => libmml}/pymml/mmldtm.py   | 0
 Projects/{MMLLib => libmml}/pymml/mmlmouse.py | 0
 Projects/{MMLLib => libmml}/pymml/mmltypes.py | 0
 Projects/{MMLLib => libmml}/pymml/pres.py     | 0
 11 files changed, 7 insertions(+), 5 deletions(-)
 rename Projects/{MMLLib => libmml}/array.py (100%)
 rename Projects/{MMLLib => libmml}/libmml.lpi (100%)
 rename Projects/{MMLLib => libmml}/libmml.lpr (100%)
 rename Projects/{MMLLib => libmml}/pymml/mml.py (100%)
 rename Projects/{MMLLib => libmml}/pymml/mmlcolor.py (100%)
 rename Projects/{MMLLib => libmml}/pymml/mmldtm.py (100%)
 rename Projects/{MMLLib => libmml}/pymml/mmlmouse.py (100%)
 rename Projects/{MMLLib => libmml}/pymml/mmltypes.py (100%)
 rename Projects/{MMLLib => libmml}/pymml/pres.py (100%)

diff --git a/Projects/ScriptManager/project1.lpr b/Projects/ScriptManager/project1.lpr
index 2f163f2..0ce5d06 100644
--- a/Projects/ScriptManager/project1.lpr
+++ b/Projects/ScriptManager/project1.lpr
@@ -3,9 +3,9 @@ program project1;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
-  cthreads,
-  {$ENDIF}{$ENDIF}
+  {$IFDEF UNIX}
+  cthreads, cmem,
+  {$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms, scriptmanager
   { you can add units after this };
diff --git a/Projects/ScriptManager/scriptmanager.pas b/Projects/ScriptManager/scriptmanager.pas
index 8fe9ef6..44fb12d 100644
--- a/Projects/ScriptManager/scriptmanager.pas
+++ b/Projects/ScriptManager/scriptmanager.pas
@@ -28,8 +28,10 @@ unit scriptmanager;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, ComCtrls, ActnList, Menus, settings, updater,strutils, MufasaTypes,dom;
+  {$IFDEF UNIX}cthreads,cmem,{$ENDIF} Classes, SysUtils, FileUtil, Forms,
+  Controls, Graphics, Dialogs, StdCtrls,
+  ExtCtrls, ComCtrls, ActnList, Menus, settings, updater,strutils, MufasaTypes,
+  dom;
 
 type
 
diff --git a/Projects/MMLLib/array.py b/Projects/libmml/array.py
similarity index 100%
rename from Projects/MMLLib/array.py
rename to Projects/libmml/array.py
diff --git a/Projects/MMLLib/libmml.lpi b/Projects/libmml/libmml.lpi
similarity index 100%
rename from Projects/MMLLib/libmml.lpi
rename to Projects/libmml/libmml.lpi
diff --git a/Projects/MMLLib/libmml.lpr b/Projects/libmml/libmml.lpr
similarity index 100%
rename from Projects/MMLLib/libmml.lpr
rename to Projects/libmml/libmml.lpr
diff --git a/Projects/MMLLib/pymml/mml.py b/Projects/libmml/pymml/mml.py
similarity index 100%
rename from Projects/MMLLib/pymml/mml.py
rename to Projects/libmml/pymml/mml.py
diff --git a/Projects/MMLLib/pymml/mmlcolor.py b/Projects/libmml/pymml/mmlcolor.py
similarity index 100%
rename from Projects/MMLLib/pymml/mmlcolor.py
rename to Projects/libmml/pymml/mmlcolor.py
diff --git a/Projects/MMLLib/pymml/mmldtm.py b/Projects/libmml/pymml/mmldtm.py
similarity index 100%
rename from Projects/MMLLib/pymml/mmldtm.py
rename to Projects/libmml/pymml/mmldtm.py
diff --git a/Projects/MMLLib/pymml/mmlmouse.py b/Projects/libmml/pymml/mmlmouse.py
similarity index 100%
rename from Projects/MMLLib/pymml/mmlmouse.py
rename to Projects/libmml/pymml/mmlmouse.py
diff --git a/Projects/MMLLib/pymml/mmltypes.py b/Projects/libmml/pymml/mmltypes.py
similarity index 100%
rename from Projects/MMLLib/pymml/mmltypes.py
rename to Projects/libmml/pymml/mmltypes.py
diff --git a/Projects/MMLLib/pymml/pres.py b/Projects/libmml/pymml/pres.py
similarity index 100%
rename from Projects/MMLLib/pymml/pres.py
rename to Projects/libmml/pymml/pres.py