paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 15:31:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updates the example Android app now that I learned that only onLoad and onUnload need to be statically exported. Some other very minor fixes.

Browse Source 
git-svn-id: trunk@40796 -
This commit is contained in:
sekelsenmat 2013-04-12 12:58:39 +00:00
parent ea7b51a457
commit c48f864fc6
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
examples/androidlcl/androidlcltest.lpi
View File

@ -22,7 +22,7 @@
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="customdrawn"/>
</MacroValues>
<BuildModes Count="3">
<BuildModes Count="4">
<Item1 Name="Release" Default="True"/>
<Item2 Name="Debug">
<MacroValues Count="1">
@ -103,6 +103,46 @@
<LCLWidgetType Value="customdrawn"/>
</CompilerOptions>
</Item3>
<Item4 Name="Release-Tandroid">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="customdrawn"/>
</MacroValues>
<CompilerOptions>
<Version Value="11"/>
<Target>
<Filename Value="android/libs/armeabi/liblclapp.so"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<Libraries Value="../../../android-ndk-r8c/platforms/android-8/arch-arm/usr/lib;../../../android-ndk-r8c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3;../../../android-ndk-r8c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/windows/lib/gcc/arm-linux-androideabi/4.4.3"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
<TargetCPU Value="arm"/>
<TargetOS Value="android"/>
</CodeGeneration>
<Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
<DebugInfoType Value="dsDwarf2"/>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<ExecutableType Value="Library"/>
</Options>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dANDROID -Xd -CpARMV6"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
<LCLWidgetType Value="customdrawn"/>
</CompilerOptions>
</Item4>
</BuildModes>
<PublishOptions>
<Version Value="2"/>

9
examples/androidlcl/androidlcltest.lpr
View File

@ -7,15 +7,6 @@ uses
customdrawn_android, customdrawndrawers, sqliteform;
exports
Java_com_pascal_lclproject_LCLActivity_LCLOnTouch name 'Java_com_pascal_lcltest_LCLActivity_LCLOnTouch',
Java_com_pascal_lclproject_LCLActivity_LCLDrawToBitmap name 'Java_com_pascal_lcltest_LCLActivity_LCLDrawToBitmap',
Java_com_pascal_lclproject_LCLActivity_LCLOnCreate name 'Java_com_pascal_lcltest_LCLActivity_LCLOnCreate',
Java_com_pascal_lclproject_LCLActivity_LCLOnMessageBoxFinished name 'Java_com_pascal_lcltest_LCLActivity_LCLOnMessageBoxFinished',
Java_com_pascal_lclproject_LCLActivity_LCLOnKey name 'Java_com_pascal_lcltest_LCLActivity_LCLOnKey',
Java_com_pascal_lclproject_LCLActivity_LCLOnTimer name 'Java_com_pascal_lcltest_LCLActivity_LCLOnTimer',
Java_com_pascal_lclproject_LCLActivity_LCLOnConfigurationChanged name 'Java_com_pascal_lcltest_LCLActivity_LCLOnConfigurationChanged',
Java_com_pascal_lclproject_LCLActivity_LCLOnSensorChanged name 'Java_com_pascal_lcltest_LCLActivity_LCLOnSensorChanged',
Java_com_pascal_lclproject_LCLActivity_LCLOnMenuAction name 'Java_com_pascal_lcltest_LCLActivity_LCLOnMenuAction',
JNI_OnLoad name 'JNI_OnLoad',
JNI_OnUnload name 'JNI_OnUnload';

2
lcl/interfaces/customdrawn/customdrawnlclintf_win.inc
View File

@ -132,6 +132,8 @@ function TCDWidgetSet.PromptUser(const DialogCaption : string;
DefaultIndex : LongInt;
EscapeResult : LongInt) : LongInt;
begin
Result := 0;
Application.MessageBox(PChar(DialogMessage), PChar(DialogCaption), MB_OK);
end;
{------------------------------------------------------------------------------

1
lcl/shellctrls.pas
View File

@ -625,6 +625,7 @@ var
Files: TStringList;
NewNode: TTreeNode;
begin
Result := False;
// avoids crashes in the IDE by not populating during design
if (csDesigning in ComponentState) then Exit;