compile on Linux 64

Carlos Picanco
1 parent c22f45c6
Showing 6 changed files with 48 additions and 11 deletions Show diff stats
.gitignore
experiment_runner/experiment_runner.lpi
experiment_runner/experiment_runner.lpr
experiment_runner/lib/x86_64-linux/experiment_runner.compiled
experiment_runner/units/game_control.pas
experiment_runner/units/helpers.pas
@@ -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
@@ -88,7 +88,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="15">
+    <Units Count="16">
       <Unit0>
         <Filename Value="experiment_runner.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -155,6 +155,10 @@
         <Filename Value="units/csv_writer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="units/helpers.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit15>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -165,7 +169,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
-      <OtherUnitFiles Value="units;../../dependency/delphizmq;../../units"/>
+      <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
@@ -177,9 +181,6 @@
     </Linking>
     <Other>
       <CustomOptions Value="-dUseCThreads"/>
-      <OtherDefines Count="1">
-        <Define0 Value="UseCThreads"/>
-      </OtherDefines>
     </Other>
   </CompilerOptions>
   <Debugging>
@@ -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
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
+  <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_runner/lib/x86_64-linux -Fl/usr/lib/gcc/x86_64-linux-gnu/4.9 -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/home/rafael/git/sc_split/dependencies/delphizmq -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_runner/ -FU/home/rafael/git/sc_split/experiment_runner/lib/x86_64-linux/ -dLCL -dLCLgtk2 -dUseCThreads experiment_runner.lpr"/>
+</CONFIG>
@@ -121,7 +121,6 @@ const
 implementation
  
 uses ButtonPanel,Controls,ExtCtrls,StdCtrls,LazUTF8, Forms, Dialogs, strutils
-     , zhelpers
      , form_matrixgame
      , presentation_classes
      , form_chooseactor
@@ -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.
+
...	...	@@ -31,4 +31,8 @@
31	31	/P/
32	32	__history
33	33	backup
34		-id
35	34	\ No newline at end of file
	35	+id
	36	+experiment_runner/experiment_runner
	37	+experiment_runner/Participant1/
	38	+experiment_runner/Participant2/
	39	+experiment_runner/Participant3/
36	40	\ No newline at end of file
...	...
...	...	@@ -88,7 +88,7 @@
88	88	<PackageName Value="LCL"/>
89	89	</Item2>
90	90	</RequiredPackages>
91		- <Units Count="15">
	91	+ <Units Count="16">
92	92	<Unit0>
93	93	<Filename Value="experiment_runner.lpr"/>
94	94	<IsPartOfProject Value="True"/>
...	...	@@ -155,6 +155,10 @@
155	155	<Filename Value="units/csv_writer.pas"/>
156	156	<IsPartOfProject Value="True"/>
157	157	</Unit14>
	158	+ <Unit15>
	159	+ <Filename Value="units/helpers.pas"/>
	160	+ <IsPartOfProject Value="True"/>
	161	+ </Unit15>
158	162	</Units>
159	163	</ProjectOptions>
160	164	<CompilerOptions>
...	...	@@ -165,7 +169,7 @@
165	169	<SearchPaths>
166	170	<IncludeFiles Value="$(ProjOutDir)"/>
167	171	<Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
168		- <OtherUnitFiles Value="units;../../dependency/delphizmq;../../units"/>
	172	+ <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
169	173	<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
170	174	</SearchPaths>
171	175	<Linking>
...	...	@@ -177,9 +181,6 @@
177	181	</Linking>
178	182	<Other>
179	183	<CustomOptions Value="-dUseCThreads"/>
180		- <OtherDefines Count="1">
181		- <Define0 Value="UseCThreads"/>
182		- </OtherDefines>
183	184	</Other>
184	185	</CompilerOptions>
185	186	<Debugging>
...	...
...	...	@@ -11,8 +11,6 @@ program experiment_runner;
11	11
12	12	{$mode objfpc}{$H+}
13	13
14		-{$DEFINE DEBUG}
15		-
16	14	uses
17	15	{$IFDEF UNIX}{$IFDEF UseCThreads}
18	16	cthreads,
...	...	@@ -26,7 +24,7 @@ uses
26	24	{$ENDIF}
27	25	, StrUtils, Forms, Classes, sysutils
28	26	, form_matrixgame, game_actors
29		- , zhelpers, form_chooseactor
	27	+ , helpers
30	28	;
31	29
32	30
...	...	@@ -80,7 +78,7 @@ const
80	78	end
81	79	else
82	80	try
83		- ID.Text := s_random(32);
	81	+ ID.Text := RandomString(32);
84	82	ID.SaveToFile(F);
85	83	F := Copy(ID.Text,0,Length(ID.Text)-2);
86	84	except
...	...
...	...	@@ -0,0 +1,5 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<CONFIG>
	3	+ <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
	4	+ <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_runner/lib/x86_64-linux -Fl/usr/lib/gcc/x86_64-linux-gnu/4.9 -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/home/rafael/git/sc_split/dependencies/delphizmq -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_runner/ -FU/home/rafael/git/sc_split/experiment_runner/lib/x86_64-linux/ -dLCL -dLCLgtk2 -dUseCThreads experiment_runner.lpr"/>
	5	+</CONFIG>
...	...
...	...	@@ -121,7 +121,6 @@ const
121	121	implementation
122	122
123	123	uses ButtonPanel,Controls,ExtCtrls,StdCtrls,LazUTF8, Forms, Dialogs, strutils
124		- , zhelpers
125	124	, form_matrixgame
126	125	, presentation_classes
127	126	, form_chooseactor
...	...
...	...	@@ -0,0 +1,30 @@
	1	+unit helpers;
	2	+
	3	+{$mode objfpc}{$H+}
	4	+
	5	+interface
	6	+
	7	+uses
	8	+ Classes, SysUtils;
	9	+
	10	+function RandomString(ALength : Integer): Utf8String;
	11	+
	12	+implementation
	13	+
	14	+function RandomString( ALength: Integer ): Utf8String;
	15	+const
	16	+ Chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ';
	17	+var
	18	+ i: integer;
	19	+begin
	20	+ Result := '';
	21	+ for i := 1 to ALength do
	22	+ Result := Result + Chars[Random(Length(Chars)) + 1];
	23	+end;
	24	+
	25	+initialization
	26	+
	27	+ Randomize;
	28	+
	29	+end.
	30	+
...	...