Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Jul 24, 2023
2 parents ce01d67 + 9c6c318 commit eb0016d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions toolkit2/fhirtoolkit.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Item Name="default" Default="True"/>
<Item Name="win64">
<MacroValues Count="1">
<Macro3 Name="LCLWidgetType" Value="win32"/>
<Macro4 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
Expand Down Expand Up @@ -76,7 +76,7 @@
</Item>
<Item Name="linux">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk"/>
<Macro3 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
Expand Down Expand Up @@ -239,7 +239,7 @@
</Item>
<Item Name="win64-release">
<MacroValues Count="1">
<Macro3 Name="LCLWidgetType" Value="win32"/>
<Macro4 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
Expand Down Expand Up @@ -382,7 +382,7 @@
</Item>
<Item Name="linux-release">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk"/>
<Macro3 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
Expand Down Expand Up @@ -422,10 +422,11 @@
</Other>
</CompilerOptions>
</Item>
<SharedMatrixOptions Count="3">
<SharedMatrixOptions Count="4">
<Item1 ID="628482637663" Modes="OSX,osx-m1-release,osx-release,osx-m1" Type="IDEMacro" MacroName="LCLWidgetType" Value="cocoa"/>
<Item2 ID="759823959655" Modes="linux-release,linux" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk"/>
<Item3 ID="299328664200" Modes="win64-release,win64" Type="IDEMacro" MacroName="LCLWidgetType" Value="win32"/>
<Item2 ID="759823959655" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk"/>
<Item3 ID="819787652127" Modes="linux,linux-release" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
<Item4 ID="299328664200" Modes="win64-release,win64" Type="IDEMacro" MacroName="LCLWidgetType" Value="win32"/>
</SharedMatrixOptions>
</BuildModes>
<PublishOptions>
Expand Down

0 comments on commit eb0016d

Please sign in to comment.