Download as
Browse Code »

Commit 39e527ea762416da3f389e84d66890818937886c

Authored by Carlos Picanco
1 parent e50b237b
Exists in master

experiment designer: compile on Linux 64

Showing 4 changed files with 7 additions and 7 deletions   Show diff stats
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 __history 32 __history
33 *backup* 33 *backup*
34 id 34 id
  35 +.persistence
35 experiment_runner/experiment_runner 36 experiment_runner/experiment_runner
36 experiment_runner/Participant*/* 37 experiment_runner/Participant*/*
37 experiment_runner/lib/x86_64-linux/*.lfm 38 experiment_runner/lib/x86_64-linux/*.lfm
38 \ No newline at end of file 39 \ No newline at end of file
experiment_designer/experiment_designer.lpi
  Diff comments   View file @39e527e
@@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
8 <Title Value="experiment_designer"/> 8 <Title Value="experiment_designer"/>
9 <ResourceType Value="res"/> 9 <ResourceType Value="res"/>
10 <UseXPManifest Value="True"/> 10 <UseXPManifest Value="True"/>
11 - <Icon Value="0"/>  
12 </General> 11 </General>
13 <i18n> 12 <i18n>
14 <EnableI18N LFM="False"/> 13 <EnableI18N LFM="False"/>
@@ -61,7 +60,7 @@ @@ -61,7 +60,7 @@
61 </Target> 60 </Target>
62 <SearchPaths> 61 <SearchPaths>
63 <IncludeFiles Value="$(ProjOutDir)"/> 62 <IncludeFiles Value="$(ProjOutDir)"/>
64 - <OtherUnitFiles Value="../units;../../../units"/> 63 + <OtherUnitFiles Value="../experiment_runner/units"/>
65 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> 64 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
66 </SearchPaths> 65 </SearchPaths>
67 <Linking> 66 <Linking>
experiment_designer/form_main.pas
  Diff comments   View file @39e527e
@@ -983,10 +983,10 @@ procedure TFormDesigner.SetPropstorageFilename; @@ -983,10 +983,10 @@ procedure TFormDesigner.SetPropstorageFilename;
983 var 983 var
984 LRootPath : string; 984 LRootPath : string;
985 begin 985 begin
986 - if FExperiment.FileName = '' then  
987 - LRootPath := ExtractFilePath(Application.ExeName)  
988 - else  
989 - LRootPath := ExtractFilePath(FExperiment.FileName); 986 + LRootPath := ExtractFilePath(Application.ExeName);
  987 + if Assigned(FExperiment) then
  988 + if FExperiment.FileName <> '' then
  989 + LRootPath := ExtractFilePath(FExperiment.FileName);
990 990
991 {$IFDEF WINDOWS} 991 {$IFDEF WINDOWS}
992 XMLPropStorage.FileName := LRootPath+'persistence.xml'; 992 XMLPropStorage.FileName := LRootPath+'persistence.xml';
experiment_designer/lib/x86_64-linux/experiment_designer.compiled
  Diff comments   View file @39e527e
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <CONFIG> 2 <CONFIG>
3 <Compiler Value="/usr/bin/fpc" Date="1449313866"/> 3 <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
4 - <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/stimulus_control/tests/lacs-matrix/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/stimulus_control/tests/lacs-matrix/units -Fu/home/rafael/git/stimulus_control/units -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/stimulus_control/tests/lacs-matrix/experiment_designer/ -FU/home/rafael/git/stimulus_control/tests/lacs-matrix/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/> 4 + <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -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_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
5 </CONFIG> 5 </CONFIG>