From 6b8cec125c2946b1a64130c3b544d94c7092566c Mon Sep 17 00:00:00 2001 From: gbamber Date: Mon, 14 Aug 2017 09:17:37 +0000 Subject: [PATCH] Added Darwin 32-bit target. Compiles in all modes OK FPC 3.1.1/Laz 1.9 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5998 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/foobot/latest_stable/foobot.lpi | 52 +++++++++++--- applications/foobot/latest_stable/foobot.lps | 72 +++++++++---------- applications/foobot/monitor/foobotmonitor.lpi | 48 +++++++++++-- applications/foobot/monitor/foobotmonitor.lps | 5 +- 4 files changed, 122 insertions(+), 55 deletions(-) diff --git a/applications/foobot/latest_stable/foobot.lpi b/applications/foobot/latest_stable/foobot.lpi index fc11dbdad..7d0da7eed 100644 --- a/applications/foobot/latest_stable/foobot.lpi +++ b/applications/foobot/latest_stable/foobot.lpi @@ -9,10 +9,6 @@ <ResourceType Value="res"/> <UseXPManifest Value="True"/> - <XPManifest> - <TextName Value="CompanyName.ProductName.AppName"/> - <TextDesc Value="Your application description."/> - </XPManifest> <Icon Value="0"/> </General> <VersionInfo> @@ -21,7 +17,7 @@ <RevisionNr Value="1"/> <StringTable Comments="Uses foobot public API" LegalCopyright="(c)2016 minesadorada@charcodelvalle.com" ProductName="fpc/Lazarus" ProductVersion="3.1.1.0"/> </VersionInfo> - <BuildModes Count="6"> + <BuildModes Count="7"> <Item1 Name="Win32" Default="True"/> <Item2 Name="Win64"> <CompilerOptions> @@ -186,9 +182,6 @@ </CompilerOptions> </Item5> <Item6 Name="Win32GTK"> - <MacroValues Count="1"> - <Macro1 Name="LCLWidgetType" Value="gtk2"/> - </MacroValues> <CompilerOptions> <Version Value="11"/> <PathDelim Value="\"/> @@ -226,8 +219,49 @@ </Other> </CompilerOptions> </Item6> + <Item7 Name="Darwin32"> + <MacroValues Count="1"> + <Macro1 Name="LCLWidgetType" Value="gtk2"/> + </MacroValues> + <CompilerOptions> + <Version Value="11"/> + <PathDelim Value="\"/> + <Target> + <Filename Value="compiled\darwin32\foobotinterrogator"/> + </Target> + <SearchPaths> + <IncludeFiles Value="$(ProjOutDir)"/> + <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> + <CodeGeneration> + <SmartLinkUnit Value="True"/> + <TargetCPU Value="i386"/> + <TargetOS Value="darwin"/> + <Optimizations> + <OptimizationLevel Value="3"/> + </Optimizations> + </CodeGeneration> + <Linking> + <Debugging> + <GenerateDebugInfo Value="False"/> + </Debugging> + <LinkSmart Value="True"/> + <Options> + <Win32> + <GraphicApplication Value="True"/> + </Win32> + </Options> + </Linking> + <Other> + <CustomOptions Value="-FcUTF8"/> + <OtherDefines Count="1"> + <Define0 Value="DEBUG"/> + </OtherDefines> + </Other> + </CompilerOptions> + </Item7> <SharedMatrixOptions Count="1"> - <Item1 ID="766380513179" Modes="Win32GTK" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/> + <Item1 ID="766380513179" Modes="Darwin32" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/> </SharedMatrixOptions> </BuildModes> <PublishOptions> diff --git a/applications/foobot/latest_stable/foobot.lps b/applications/foobot/latest_stable/foobot.lps index 7d4d92d6b..1e61f57b8 100644 --- a/applications/foobot/latest_stable/foobot.lps +++ b/applications/foobot/latest_stable/foobot.lps @@ -3,16 +3,14 @@ <ProjectSession> <PathDelim Value="\"/> <Version Value="10"/> - <BuildModes Active="Win32"/> + <BuildModes Active="Darwin32"/> <Units Count="25"> <Unit0> <Filename Value="foobot.lpr"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="6"/> - <TopLine Value="6"/> - <CursorPos Y="44"/> + <EditorIndex Value="-1"/> + <CursorPos X="47" Y="25"/> <UsageCount Value="95"/> - <Loaded Value="True"/> </Unit0> <Unit1> <Filename Value="umainform.pas"/> @@ -30,7 +28,7 @@ <Filename Value="foobot_objects.pas"/> <IsPartOfProject Value="True"/> <EditorIndex Value="2"/> - <TopLine Value="80"/> + <TopLine Value="143"/> <CursorPos Y="101"/> <UsageCount Value="55"/> <Loaded Value="True"/> @@ -38,11 +36,9 @@ <Unit3> <Filename Value="foobot_httpclient.pas"/> <IsPartOfProject Value="True"/> - <EditorIndex Value="4"/> - <TopLine Value="348"/> + <EditorIndex Value="-1"/> <CursorPos X="26" Y="356"/> <UsageCount Value="57"/> - <Loaded Value="True"/> </Unit3> <Unit4> <Filename Value="ulogin.pas"/> @@ -50,10 +46,9 @@ <ComponentName Value="loginform"/> <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> - <IsVisibleTab Value="True"/> - <EditorIndex Value="5"/> - <TopLine Value="19"/> - <CursorPos X="20" Y="29"/> + <EditorIndex Value="4"/> + <TopLine Value="63"/> + <CursorPos X="32" Y="36"/> <UsageCount Value="49"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> @@ -65,7 +60,7 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <EditorIndex Value="3"/> - <TopLine Value="8"/> + <TopLine Value="47"/> <CursorPos X="30" Y="51"/> <UsageCount Value="48"/> <Loaded Value="True"/> @@ -74,8 +69,9 @@ <Unit6> <Filename Value="foobot_utility.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="362"/> + <TopLine Value="496"/> <CursorPos X="44" Y="374"/> <UsageCount Value="26"/> <Loaded Value="True"/> @@ -213,7 +209,7 @@ <OtherDefines Count="1"> <Define0 Value="DEBUG"/> </OtherDefines> - <JumpHistory Count="30" HistoryIndex="29"> + <JumpHistory Count="29" HistoryIndex="28"> <Position1> <Filename Value="foobot_utility.pas"/> <Caret Line="8" Column="46" TopLine="4"/> @@ -275,65 +271,61 @@ <Caret Line="35" Column="47" TopLine="28"/> </Position15> <Position16> - <Filename Value="foobot.lpr"/> - <Caret Line="44" TopLine="6"/> - </Position16> - <Position17> <Filename Value="foobot_objects.pas"/> <Caret Line="101" TopLine="80"/> + </Position16> + <Position17> + <Filename Value="umainform.pas"/> + <Caret Line="216" Column="26" TopLine="211"/> </Position17> <Position18> <Filename Value="umainform.pas"/> - <Caret Line="216" Column="26" TopLine="211"/> + <Caret Line="90" TopLine="72"/> </Position18> <Position19> - <Filename Value="umainform.pas"/> - <Caret Line="90" TopLine="72"/> + <Filename Value="foobot_utility.pas"/> + <Caret Line="40" Column="56" TopLine="18"/> </Position19> <Position20> <Filename Value="foobot_utility.pas"/> - <Caret Line="40" Column="56" TopLine="18"/> + <Caret Line="72" Column="56" TopLine="50"/> </Position20> <Position21> <Filename Value="foobot_utility.pas"/> - <Caret Line="72" Column="56" TopLine="50"/> + <Caret Line="86" Column="45" TopLine="63"/> </Position21> <Position22> <Filename Value="foobot_utility.pas"/> - <Caret Line="86" Column="45" TopLine="63"/> + <Caret Line="50" TopLine="27"/> </Position22> <Position23> - <Filename Value="foobot_utility.pas"/> - <Caret Line="50" TopLine="27"/> - </Position23> - <Position24> <Filename Value="umainform.pas"/> <Caret Line="257" Column="31" TopLine="174"/> + </Position23> + <Position24> + <Filename Value="foobot_utility.pas"/> + <Caret Line="364" Column="43" TopLine="351"/> </Position24> <Position25> <Filename Value="foobot_utility.pas"/> - <Caret Line="364" Column="43" TopLine="351"/> + <Caret Line="365" Column="74" TopLine="343"/> </Position25> <Position26> <Filename Value="foobot_utility.pas"/> - <Caret Line="365" Column="74" TopLine="343"/> + <Caret Line="375" TopLine="342"/> </Position26> <Position27> - <Filename Value="foobot_utility.pas"/> - <Caret Line="375" TopLine="342"/> + <Filename Value="ulogin.pas"/> + <Caret Line="92"/> </Position27> <Position28> <Filename Value="ulogin.pas"/> - <Caret Line="92"/> + <Caret Line="71" Column="19" TopLine="46"/> </Position28> <Position29> - <Filename Value="ulogin.pas"/> - <Caret Line="71" Column="19" TopLine="46"/> - </Position29> - <Position30> <Filename Value="ulogin.pas"/> <Caret Line="29" Column="20" TopLine="19"/> - </Position30> + </Position29> </JumpHistory> </ProjectSession> </CONFIG> diff --git a/applications/foobot/monitor/foobotmonitor.lpi b/applications/foobot/monitor/foobotmonitor.lpi index 57b9f559c..cd08142ad 100644 --- a/applications/foobot/monitor/foobotmonitor.lpi +++ b/applications/foobot/monitor/foobotmonitor.lpi @@ -29,7 +29,7 @@ <RevisionNr Value="7"/> <StringTable Comments="Uses Foobot public API to query Foobots" FileDescription="Monitor for Foobot" InternalName="foobotmonitor" LegalCopyright="(c)2016 minesadorada@charcodelvalle.com" LegalTrademarks="Foobot" ProductName="Foobot" ProductVersion="0.0.0.0"/> </VersionInfo> - <BuildModes Count="6"> + <BuildModes Count="7"> <Item1 Name="Debug" Default="True"/> <Item2 Name="win32"> <CompilerOptions> @@ -174,9 +174,6 @@ </CompilerOptions> </Item5> <Item6 Name="win32GTK2"> - <MacroValues Count="1"> - <Macro1 Name="LCLWidgetType" Value="gtk2"/> - </MacroValues> <CompilerOptions> <Version Value="11"/> <PathDelim Value="\"/> @@ -209,8 +206,49 @@ </Linking> </CompilerOptions> </Item6> + <Item7 Name="Darwin32"> + <MacroValues Count="1"> + <Macro1 Name="LCLWidgetType" Value="gtk2"/> + </MacroValues> + <CompilerOptions> + <Version Value="11"/> + <PathDelim Value="\"/> + <Target> + <Filename Value="compiled\$(BuildMode)\foobotmonitor"/> + </Target> + <SearchPaths> + <IncludeFiles Value="$(ProjOutDir)"/> + <OtherUnitFiles Value=".."/> + <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> + <CodeGeneration> + <SmartLinkUnit Value="True"/> + <TargetCPU Value="i386"/> + <TargetOS Value="linux"/> + <Optimizations> + <OptimizationLevel Value="3"/> + </Optimizations> + </CodeGeneration> + <Linking> + <Debugging> + <GenerateDebugInfo Value="False"/> + </Debugging> + <LinkSmart Value="True"/> + <Options> + <Win32> + <GraphicApplication Value="True"/> + </Win32> + </Options> + </Linking> + <Other> + <OtherDefines Count="1"> + <Define0 Value="DEBUGMODE"/> + </OtherDefines> + </Other> + </CompilerOptions> + </Item7> <SharedMatrixOptions Count="1"> - <Item1 ID="571324092942" Modes="win32GTK2" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/> + <Item1 ID="571324092942" Modes="Darwin32" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/> </SharedMatrixOptions> </BuildModes> <PublishOptions> diff --git a/applications/foobot/monitor/foobotmonitor.lps b/applications/foobot/monitor/foobotmonitor.lps index 72445dffa..f9ddb9499 100644 --- a/applications/foobot/monitor/foobotmonitor.lps +++ b/applications/foobot/monitor/foobotmonitor.lps @@ -3,7 +3,7 @@ <ProjectSession> <PathDelim Value="\"/> <Version Value="10"/> - <BuildModes Active="win32"/> + <BuildModes Active="Darwin32"/> <Units Count="42"> <Unit0> <Filename Value="foobotmonitor.lpr"/> @@ -326,6 +326,9 @@ <UsageCount Value="10"/> </Unit41> </Units> + <OtherDefines Count="1"> + <Define0 Value="DEBUGMODE"/> + </OtherDefines> <JumpHistory Count="2" HistoryIndex="1"> <Position1> <Filename Value="umainform.pas"/>