From 599d81c9d21e67e090df95606967777677f578c0 Mon Sep 17 00:00:00 2001 From: cpicanco Date: Thu, 29 Dec 2016 20:50:35 -0300 Subject: [PATCH] compile on Linux 64 --- .gitignore | 6 +++++- experiment_runner/experiment_runner.lpi | 11 ++++++----- experiment_runner/experiment_runner.lpr | 6 ++---- experiment_runner/lib/x86_64-linux/experiment_runner.compiled | 5 +++++ experiment_runner/units/game_control.pas | 1 - experiment_runner/units/helpers.pas | 30 ++++++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 experiment_runner/lib/x86_64-linux/experiment_runner.compiled create mode 100644 experiment_runner/units/helpers.pas diff --git a/.gitignore b/.gitignore index 83f02b0..6288479 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,8 @@ /P*/* __history *backup* -id \ No newline at end of file +id +experiment_runner/experiment_runner +experiment_runner/Participant1/ +experiment_runner/Participant2/ +experiment_runner/Participant3/ \ No newline at end of file diff --git a/experiment_runner/experiment_runner.lpi b/experiment_runner/experiment_runner.lpi index 539cba1..a37fcd2 100644 --- a/experiment_runner/experiment_runner.lpi +++ b/experiment_runner/experiment_runner.lpi @@ -88,7 +88,7 @@ - + @@ -155,6 +155,10 @@ + + + + @@ -165,7 +169,7 @@ - + @@ -177,9 +181,6 @@ - - - diff --git a/experiment_runner/experiment_runner.lpr b/experiment_runner/experiment_runner.lpr index 93ed7e4..894c8b8 100644 --- a/experiment_runner/experiment_runner.lpr +++ b/experiment_runner/experiment_runner.lpr @@ -11,8 +11,6 @@ program experiment_runner; {$mode objfpc}{$H+} -{$DEFINE DEBUG} - uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, @@ -26,7 +24,7 @@ uses {$ENDIF} , StrUtils, Forms, Classes, sysutils , form_matrixgame, game_actors - , zhelpers, form_chooseactor + , helpers ; @@ -80,7 +78,7 @@ const end else try - ID.Text := s_random(32); + ID.Text := RandomString(32); ID.SaveToFile(F); F := Copy(ID.Text,0,Length(ID.Text)-2); except diff --git a/experiment_runner/lib/x86_64-linux/experiment_runner.compiled b/experiment_runner/lib/x86_64-linux/experiment_runner.compiled new file mode 100644 index 0000000..a95b464 --- /dev/null +++ b/experiment_runner/lib/x86_64-linux/experiment_runner.compiled @@ -0,0 +1,5 @@ + + + + + diff --git a/experiment_runner/units/game_control.pas b/experiment_runner/units/game_control.pas index 86996d3..8c14f16 100644 --- a/experiment_runner/units/game_control.pas +++ b/experiment_runner/units/game_control.pas @@ -121,7 +121,6 @@ const implementation uses ButtonPanel,Controls,ExtCtrls,StdCtrls,LazUTF8, Forms, Dialogs, strutils - , zhelpers , form_matrixgame , presentation_classes , form_chooseactor diff --git a/experiment_runner/units/helpers.pas b/experiment_runner/units/helpers.pas new file mode 100644 index 0000000..b858b0d --- /dev/null +++ b/experiment_runner/units/helpers.pas @@ -0,0 +1,30 @@ +unit helpers; + +{$mode objfpc}{$H+} + +interface + +uses + Classes, SysUtils; + +function RandomString(ALength : Integer): Utf8String; + +implementation + +function RandomString( ALength: Integer ): Utf8String; +const + Chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'; +var + i: integer; +begin + Result := ''; + for i := 1 to ALength do + Result := Result + Chars[Random(Length(Chars)) + 1]; +end; + +initialization + + Randomize; + +end. + -- libgit2 0.21.2