diff --git a/README.md b/README.md index 6fc9372..55cb561 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,4 @@ mysql -V # client version # on windows, check if libMySQL.dll is necessary... +# must compile with Lazarus 32 bits ultil delphi-zmq (pool) 64 bit support is available. \ No newline at end of file diff --git a/cultural_matrix.lpi b/cultural_matrix.lpi index 30e3ca4..61d8b3f 100644 --- a/cultural_matrix.lpi +++ b/cultural_matrix.lpi @@ -8,7 +8,6 @@ <ResourceType Value="res"/> <UseXPManifest Value="True"/> - <Icon Value="0"/> </General> <i18n> <EnableI18N LFM="False"/> @@ -16,8 +15,29 @@ <VersionInfo> <StringTable ProductVersion=""/> </VersionInfo> - <BuildModes Count="1"> - <Item1 Name="Default" Default="True"/> + <BuildModes Count="2"> + <Item1 Name="Linux64" Default="True"/> + <Item2 Name="Win32"> + <CompilerOptions> + <Version Value="11"/> + <Target> + <Filename Value="cultural_matrix"/> + </Target> + <SearchPaths> + <IncludeFiles Value="$(ProjOutDir)"/> + <Libraries Value="/usr/lib/gcc/x86_64-linux-gnu/4.9"/> + <OtherUnitFiles Value="units;../../dependency/delphizmq;../../units"/> + <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> + <Linking> + <Options> + <Win32> + <GraphicApplication Value="True"/> + </Win32> + </Options> + </Linking> + </CompilerOptions> + </Item2> </BuildModes> <PublishOptions> <Version Value="2"/> @@ -125,7 +145,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;../../dependency/delphizmq;../../units"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> @@ -138,9 +158,6 @@ </Linking> <Other> <CustomOptions Value="-dUseCThreads"/> - <OtherDefines Count="1"> - <Define0 Value="UseCThreads"/> - </OtherDefines> </Other> </CompilerOptions> <Debugging> diff --git a/units/game_control.pas b/units/game_control.pas index 33b3850..4ad336e 100644 --- a/units/game_control.pas +++ b/units/game_control.pas @@ -2,8 +2,6 @@ unit game_control; {$mode objfpc}{$H+} -{$DEFINE DEBUG} - interface uses @@ -479,7 +477,10 @@ end; end; end; + {$IFDEF DEBUG} WriteLn('Good Bye'); + {$ENDIF} + end; procedure ResumeActor; @@ -492,7 +493,9 @@ end; end; end; + {$IFDEF DEBUG} WriteLn('Resumed.'); + {$ENDIF} end; procedure ReceiveLogin; @@ -505,7 +508,9 @@ end; end; end; + {$IFDEF DEBUG} WriteLn('login'); + {$ENDIF} end; procedure ReceiveLogout; @@ -518,7 +523,9 @@ end; end; end; + {$IFDEF DEBUG} WriteLn('logout'); + {$ENDIF} end; begin diff --git a/units/game_experiment.pas b/units/game_experiment.pas index dd02423..5e6ad7c 100644 --- a/units/game_experiment.pas +++ b/units/game_experiment.pas @@ -320,7 +320,9 @@ begin if FFilename <> '' then SaveExperimentToFile(Self,FFilename) else + {$IFDEF DEBUG} WriteLn(WARN_CANNOT_SAVE) + {$ENDIF}; end; end. diff --git a/units/game_file_methods.pas b/units/game_file_methods.pas index c39404d..170502a 100644 --- a/units/game_file_methods.pas +++ b/units/game_file_methods.pas @@ -248,7 +248,9 @@ var s1 := ReadString(LS, KEY_ENDCRITERIA,''); if s1 = '' then begin + {$IFDEF DEBUG} WriteLn(WARN_CONDITION_WITH_NO_END+LS+'. '+KEY_ENDCRITERIA+KV_SEP+DEF_END+WARN_END); + {$ENDIF} s1 := DEF_END; end; EndCriterium := GetEndCriteria(s1); diff --git a/units/game_zmq_actors.pas b/units/game_zmq_actors.pas index ef6ef71..80f768c 100644 --- a/units/game_zmq_actors.pas +++ b/units/game_zmq_actors.pas @@ -75,7 +75,10 @@ implementation procedure TZMQWatcher.Start; begin inherited Start; + {$IFDEF DEBUG} WriteLn('TZMQWatcher.Start'); + {$ENDIF} + end; { TZMQAdmin } @@ -110,13 +113,18 @@ procedure TZMQAdmin.Start; begin inherited Start; FZMQServer.Start; + {$IFDEF DEBUG} WriteLn('TZMQAdmin.Start'); + {$ENDIF} end; { TZMQPlayer } procedure TZMQPlayer.SendMessage(AMessage: array of UTF8string); begin + {$IFDEF DEBUG} + + {$ENDIF} FZMQClient.Push(AMessage); end; @@ -144,7 +152,9 @@ procedure TZMQPlayer.Start; begin inherited Start; FZMQClient.Start; - WriteLn('TZMQPlayer.Start'); + {$IFDEF DEBUG} + WriteLn('TZMQPlayer.Start'); + {$ENDIF} end; { TZMQActor } @@ -171,7 +181,9 @@ end; procedure TZMQActor.Start; begin + {$IFDEF DEBUG} WriteLn('TZMQActor.Start'); + {$ENDIF} end; end. -- libgit2 0.21.2