From 2df8dbe3df25853a9ec5ea6190a18a95beec160b Mon Sep 17 00:00:00 2001 From: Wizzup? Date: Wed, 27 Jan 2010 13:48:56 +0000 Subject: [PATCH] Setting for CPascal or PascalScript. git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@490 3f818213-9676-44b0-a9b4-5e4c4e03d09d --- trunk/Projects/SAMufasaGUI/testunit.pas | 8 ++++++-- trunk/Units/MMLAddon/mmlpsthread.pas | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/trunk/Projects/SAMufasaGUI/testunit.pas b/trunk/Projects/SAMufasaGUI/testunit.pas index 9941a8a..966daf2 100644 --- a/trunk/Projects/SAMufasaGUI/testunit.pas +++ b/trunk/Projects/SAMufasaGUI/testunit.pas @@ -511,6 +511,7 @@ var AppPath : string; pluginspath: string; ScriptPath : string; + UseCPascal: String; loadFontsOnScriptStart: String; begin @@ -533,8 +534,11 @@ begin PluginsPath := LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS)); ScriptErrorLine:= -1; CurrentSyncInfo.SyncMethod:= @Self.SafeCallThread; - ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath); - //ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath); + UseCPascal := LoadSettingDef('Settings/Interpreter/UseCPascal', 'True'); + if lowercase(UseCPascal) = 'true' then + ScriptThread := TCPThread.Create('libcpascal',True,@CurrentSyncInfo,PluginsPath) + else + ScriptThread := TPSThread.Create(True,@CurrentSyncInfo,PluginsPath); {$IFNDEF TERMINALWRITELN} ScriptThread.SetDebug(@formWriteln); ScriptThread.DebugMemo := Self.Memo1; diff --git a/trunk/Units/MMLAddon/mmlpsthread.pas b/trunk/Units/MMLAddon/mmlpsthread.pas index ba64b11..71ca40e 100644 --- a/trunk/Units/MMLAddon/mmlpsthread.pas +++ b/trunk/Units/MMLAddon/mmlpsthread.pas @@ -187,7 +187,6 @@ uses tpa, //Tpa stuff forms,//Forms lclintf // for GetTickCount and others. - {$IFDEF SIMBA} ,testunit {$ENDIF} ; {$define PS_StdCall}