From 25375db8f20252ad2a967e90446ef818fa649d7c Mon Sep 17 00:00:00 2001
From: cpicanco <cpicanco42@gmail.com>
Date: Tue, 24 Jan 2017 21:46:32 -0300
Subject: [PATCH] compile with static linked libzmq

---
 dependencies/delphizmq                                        |  2 +-
 experiment_runner/experiment_runner.lpi                       | 48 +++++++++++++++++++++++++++---------------------
 experiment_runner/experiment_runner.lpr                       |  1 +
 experiment_runner/lib/x86_64-linux/experiment_runner.compiled |  2 +-
 experiment_runner/units/helpers.pas                           | 24 ++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/dependencies/delphizmq b/dependencies/delphizmq
index 4f72c49..2a0f49d 160000
--- a/dependencies/delphizmq
+++ b/dependencies/delphizmq
@@ -1 +1 @@
-Subproject commit 4f72c4989a46e294d2275b4a9262220f2af2c12f
+Subproject commit 2a0f49dee5513c8074aa10317c71408849ae693c
diff --git a/experiment_runner/experiment_runner.lpi b/experiment_runner/experiment_runner.lpi
index 7aad589..9af75aa 100644
--- a/experiment_runner/experiment_runner.lpi
+++ b/experiment_runner/experiment_runner.lpi
@@ -32,7 +32,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9"/>
+            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
             <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
@@ -47,7 +47,8 @@
             </Options>
           </Linking>
           <Other>
-            <CustomOptions Value="-dUseCThreads"/>
+            <CustomOptions Value="-dUseCThreads
+-dZMQ_STATIC_LINK"/>
           </Other>
         </CompilerOptions>
       </Item2>
@@ -59,7 +60,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9"/>
+            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
             <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
@@ -70,6 +71,10 @@
               </Win32>
             </Options>
           </Linking>
+          <Other>
+            <CustomOptions Value="-dZMQ_STATIC_LINK
+-Fo/home/rafael/Downloads/zeromq-3.2.5/src/"/>
+          </Other>
         </CompilerOptions>
       </Item3>
       <Item4 Name="Win32 Release">
@@ -80,7 +85,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9"/>
+            <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
             <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
@@ -119,69 +124,69 @@
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="form_matrixgame.pas"/>
+        <Filename Value="../sc_split/experiment_runner/form_matrixgame.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormMatrixGame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit1>
       <Unit2>
-        <Filename Value="README.md"/>
+        <Filename Value="../sc_split/experiment_runner/README.md"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="units/zmq_network.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/zmq_network.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="units/game_zmq_actors.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_zmq_actors.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="units/game_actors.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_actors.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit5>
       <Unit6>
-        <Filename Value="units/game_experiment.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_experiment.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit6>
       <Unit7>
-        <Filename Value="units/game_file_methods.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_file_methods.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit7>
       <Unit8>
-        <Filename Value="units/game_resources.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_resources.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit8>
       <Unit9>
-        <Filename Value="units/game_control.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_control.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit9>
       <Unit10>
-        <Filename Value="units/string_methods.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/string_methods.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit10>
       <Unit11>
-        <Filename Value="units/game_actors_point.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_actors_point.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit11>
       <Unit12>
-        <Filename Value="units/game_visual_elements.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/game_visual_elements.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit12>
       <Unit13>
-        <Filename Value="form_chooseactor.pas"/>
+        <Filename Value="../sc_split/experiment_runner/form_chooseactor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormChooseActor"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit13>
       <Unit14>
-        <Filename Value="units/csv_writer.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/csv_writer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit14>
       <Unit15>
-        <Filename Value="units/helpers.pas"/>
+        <Filename Value="../sc_split/experiment_runner/units/helpers.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit15>
     </Units>
@@ -193,7 +198,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9"/>
+      <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9/"/>
       <OtherUnitFiles Value="units;../dependencies/delphizmq"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
@@ -205,7 +210,8 @@
       </Options>
     </Linking>
     <Other>
-      <CustomOptions Value="-dUseCThreads"/>
+      <CustomOptions Value="-dUseCThreads
+-dZMQ_STATIC_LINK"/>
     </Other>
   </CompilerOptions>
   <Debugging>
diff --git a/experiment_runner/experiment_runner.lpr b/experiment_runner/experiment_runner.lpr
index 894c8b8..d46204e 100644
--- a/experiment_runner/experiment_runner.lpr
+++ b/experiment_runner/experiment_runner.lpr
@@ -95,6 +95,7 @@ const
 
 begin
   ApplicationPath := ExtractFilePath(Application.ExeName);
+  PrintZmqVersion(ApplicationPath);
   {$IFDEF DEBUG}
   if not CreateDebugFoldersForPlayers then Exit;
   {$ENDIF}
diff --git a/experiment_runner/lib/x86_64-linux/experiment_runner.compiled b/experiment_runner/lib/x86_64-linux/experiment_runner.compiled
index 434dcb5..95fae91 100644
--- a/experiment_runner/lib/x86_64-linux/experiment_runner.compiled
+++ b/experiment_runner/lib/x86_64-linux/experiment_runner.compiled
@@ -1,5 +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 -Xg -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"/>
+  <Params Value=" -MObjFPC -Scghi -Cg -O1 -g -gl -Xg -l -vewnhibq -Fi/home/rafael/git/free-mtrix/experiment_runner/lib/x86_64-linux -Fl/usr/lib/gcc/x86_64-linux-gnu/4.9 -Fl/opt/gnome/lib -Fu/home/rafael/git/free-mtrix/experiment_runner/units -Fu/home/rafael/git/free-mtrix/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/free-mtrix/experiment_runner/ -FU/home/rafael/git/free-mtrix/experiment_runner/lib/x86_64-linux/ -dLCL -dLCLgtk2 -dUseCThreads -dZMQ_STATIC_LINK experiment_runner.lpr"/>
 </CONFIG>
diff --git a/experiment_runner/units/helpers.pas b/experiment_runner/units/helpers.pas
index b858b0d..48de5af 100644
--- a/experiment_runner/units/helpers.pas
+++ b/experiment_runner/units/helpers.pas
@@ -8,9 +8,13 @@ uses
   Classes, SysUtils;
 
 function RandomString(ALength : Integer): Utf8String;
+procedure PrintZmqVersion(AAplicationPath:string);
+
 
 implementation
 
+uses zmq;
+
 function RandomString( ALength: Integer ): Utf8String;
 const
   Chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ';
@@ -22,6 +26,26 @@ begin
     Result := Result + Chars[Random(Length(Chars)) + 1];
 end;
 
+procedure PrintZmqVersion(AAplicationPath : string);
+var
+  LPatch, LMinor, LMajor: Integer;
+  S : TStringList;
+begin
+  LMajor := 0; LMinor := 0; LPatch := 0;
+  zmq_version(LMajor,LMinor,LPatch);
+  try
+    WriteLn('ZMQVERSION:',LMajor,'.',LMinor,'.',LPatch);
+  except
+    on E : Exception do
+      begin
+         S := TStringList.Create;
+         S.Append(IntToStr(LMajor)+IntToStr(LMinor)+IntToStr(LPatch));
+         S.SaveToFile(AAplicationPath+PathDelim+'ZMQVERSION');
+         S.Free;
+      end;
+  end;
+end;
+
 initialization
 
   Randomize;
--
libgit2 0.21.2