update to version 0.4.0

Zengl_SRC/Update_ZenGL.txt

@@ -1,5 +1,20 @@
-17.03.2023
-	Стабилизация последней версии 3.30. Подготовка модулей для создания ZenGL-library.
+25.06.2023
+	Правка проектов Android для правильной их сборки.
+	Добавлен дефайн CPUARMV7A - так как он отсутствует для Android. Отключайте его, если будете использовать ARM v5 или ARM v6, во избежании ошибок.
+	Добавлен дефайн NOT_OLD_ARM - отвечающий за использование динамических библиотек для старших Android-версий - это ARM64 и ARMv7a.
+	Версия ZenGL теперь 0.4.0.
+
+21.06.2023
+	Собраны динамические библиотеки LibZip под Android. Требуется проверка исправлений в связи с изменениями.
+	Уделены библиотеки Tremolo, как устаревшие. Для их возврата, надо заново их перебирать. Вероятнее всего ни кто этим заниматься не будет.
+	Добавлены и исправлены демоверсии для Android. Теперь они содержат несколько проектов под разные архитектуры: v5, v6, v7a, v8a, x86, x86_64.
+
+11.06.2023
+	Внесены коррекции в демки для версии 3.30 (на гит).
+	Удалён дефайн "OLD_METHODS". Код ZenGL полностью корректирован вместе с демками в связи с данным удалением. Теперь демки более удобочитаемы.
+	Осталась старая функциональность при работе с полем ввода сделанная Andru. Введён новый дефайн "KEYBOARD_OLD_FUNCTION" для работы с данными процедурами/функциями. При включении данного дефайна отключится библиотека "Green Engine" (должна, по крайней мере).
+	Полностью удалёна поддержка MacOS Carbon (она и не поддерживалась).
+	Собраны библиотеки "Ogg", "Vorbis", "Theora" для Android (v8a, v7a, x86, x86_64). v7a - звук работает, видео не проверено.
 
 14.03.2023
 	Исправления для статической сборки OGG, Vorbis - убраны динамические зависимости.

Zengl_SRC/demos/Android/01-Initialization/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

Zengl_SRC/demos/Android/01-Initialization/jni/demo01.lps

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="12"/>
-    <BuildModes Active="Default"/>
-    <Units Count="15">
-      <Unit0>
-        <Filename Value="demo01.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="37"/>
-        <CursorPos X="47" Y="67"/>
-        <UsageCount Value="28"/>
-        <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="..\..\..\..\src\zgl_application.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="159"/>
-        <CursorPos X="22" Y="180"/>
-        <UsageCount Value="13"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\..\..\..\src\zgl_main.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="426"/>
-        <CursorPos X="39" Y="449"/>
-        <UsageCount Value="11"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\..\..\src\zgl_screen.pas"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="2" Y="29"/>
-        <UsageCount Value="13"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\..\src\zgl_window.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="23"/>
-        <CursorPos X="3" Y="53"/>
-        <UsageCount Value="11"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\..\..\..\src\zgl_opengles.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="290"/>
-        <CursorPos X="73" Y="293"/>
-        <UsageCount Value="11"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\..\..\src\zgl_opengles_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="897"/>
-        <CursorPos X="3" Y="912"/>
-        <UsageCount Value="12"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="..\..\..\..\src\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="100"/>
-        <CursorPos X="35" Y="110"/>
-        <UsageCount Value="13"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\src\zgl_log.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="97"/>
-        <CursorPos X="28" Y="119"/>
-        <UsageCount Value="11"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\..\..\src\zgl_utils.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="85"/>
-        <CursorPos X="29" Y="104"/>
-        <UsageCount Value="11"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\..\..\src\zgl_text.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="47"/>
-        <CursorPos X="13" Y="71"/>
-        <UsageCount Value="12"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\..\..\..\src\zgl_textures.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="155"/>
-        <CursorPos X="12" Y="170"/>
-        <UsageCount Value="12"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\..\..\src\zgl_font.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="91"/>
-        <CursorPos X="46" Y="92"/>
-        <UsageCount Value="12"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\Lazarus\01 - Initialization\demo01.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="90"/>
-        <CursorPos X="25" Y="34"/>
-        <UsageCount Value="12"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="..\..\..\..\headers\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="174"/>
-        <CursorPos X="4" Y="207"/>
-        <UsageCount Value="10"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit14>
-    </Units>
-    <JumpHistory Count="7" HistoryIndex="6">
-      <Position1>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="9" Column="21"/>
-      </Position1>
-      <Position2>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="66" Column="45" TopLine="49"/>
-      </Position2>
-      <Position3>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="23" TopLine="2"/>
-      </Position3>
-      <Position4>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="14" Column="36" TopLine="2"/>
-      </Position4>
-      <Position5>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="23"/>
-      </Position5>
-      <Position6>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="22" Column="45"/>
-      </Position6>
-      <Position7>
-        <Filename Value="demo01.lpr"/>
-        <Caret Line="67" Column="40" TopLine="38"/>
-      </Position7>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01.lpi → Zengl_SRC/demos/Android/01-Initialization/jni/demo01_v5.lpi

@@ -40,16 +40,22 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
-      <Libraries Value="..\..\..\..\bin\Android\armv6"/>
-      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\theora\android\armv5;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV5"/>
       <TargetCPU Value="arm"/>
       <TargetOS Value="android"/>
       <Optimizations>
-        <OptimizationLevel Value="3"/>
+        <OptimizationLevel Value="2"/>
       </Optimizations>
     </CodeGeneration>
     <Linking>
@@ -63,7 +69,7 @@
     </Linking>
     <Other>
       <ExecuteBefore>
-        <Command Value="sh prebuild.sh"/>
+        <Command Value="sh prebuild_v5.sh"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01_v6.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo01"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo01.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\demo01"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\theora\android\armv6;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV6"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v6.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01_v7a.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo01"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo01.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi-v7a\demo01"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\armeabi-v7a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\theora\android\armv7a;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV7A"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v7a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01_v8a.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo01"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo01.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\arm64-v8a\demo01"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\arm64-v8a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\theora\android\aarchv8a;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="aarch64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v8a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01_x64.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo01"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo01.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86_64\demo01"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\x86_64"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\theora\android\x86_64;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="x86_64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="3"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x64.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/demo01_x86.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo01"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo01.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86\demo01"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGEGL;..\..\..\..\src;..\..\..\..\srcGL"/>
+      <Libraries Value="...\libs\x86"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\theora\android\x86;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\bin\Android\armv5"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="3"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x86.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_v5.sh

@@ -0,0 +1,11 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libzenjpeg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libopenal.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libogg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libvorbis.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libtheoradec.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libchipmunk.so ../libs/armeabi/

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild.sh → Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_v6.sh

@@ -1,3 +1,5 @@
+# clean
+rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/armeabi/

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_v7a.sh

@@ -0,0 +1,12 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzenjpeg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libopenal.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libogg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libvorbis.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libtheoradec.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzip.so ../libs/armeabi-v7a/
+#cp ../../../../bin/Android/armeabi-v7a/libchipmunk.so ../libs/armeabi/

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_v8a.sh

@@ -0,0 +1,12 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzenjpeg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libopenal.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libogg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libvorbis.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libtheoradec.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzip.so ../libs/arm64-v8a/
+#cp ../../../../bin/Android/arm64-v8a/libchipmunk.so ../libs/armeabi/

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_x64.sh

@@ -0,0 +1,12 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzenjpeg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libopenal.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libogg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libvorbis.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libtheoradec.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzip.so ../libs/x86_64/
+#cp ../../../../bin/Android/x86_64/libchipmunk.so ../libs/x86_64/

Zengl_SRC/demos/Android/01-Initialization/jni/prebuild_x86.sh

@@ -0,0 +1,12 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86/
+cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libopenal.so ../libs/x86/
+cp ../../../../bin/Android/x86/libogg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libvorbis.so ../libs/x86/
+cp ../../../../bin/Android/x86/libtheoradec.so ../libs/x86/
+cp ../../../../bin/Android/x86/libzip.so ../libs/x86/
+#cp ../../../../bin/Android/x86/libchipmunk.so ../libs/x86/

Zengl_SRC/demos/Android/01-Initialization/src/zengl/android/ZenGL.java

@@ -64,13 +64,7 @@ public class ZenGL extends GLSurfaceView
 	public ZenGL( Context context, String appName, String appSourceDir )
 	{
 		super( context );
-
-		System.loadLibrary( "zenjpeg" );
-		System.loadLibrary( "openal" );
-		System.loadLibrary( "ogg" );
-		System.loadLibrary( "vorbis" );
-		System.loadLibrary( "theoradec" );
-		System.loadLibrary( "chipmunk" );
+		
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

Zengl_SRC/demos/Android/02-Resources/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

Zengl_SRC/demos/Android/02-Resources/jni/demo02.lps

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="12"/>
-    <BuildModes Active="Default"/>
-    <Units Count="20">
-      <Unit0>
-        <Filename Value="demo02.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="46"/>
-        <CursorPos X="7" Y="46"/>
-        <UsageCount Value="28"/>
-        <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="..\..\..\..\src\zgl_opengles.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="15"/>
-        <CursorPos X="14" Y="26"/>
-        <UsageCount Value="14"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\..\..\..\src\zgl_opengles_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="752"/>
-        <CursorPos X="74" Y="770"/>
-        <UsageCount Value="14"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="C:\codetyphon\fpcsrc\packages\opengl\src\gl.pp"/>
-        <UnitName Value="GL"/>
-        <EditorIndex Value="-1"/>
-        <UsageCount Value="9"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\..\src\zgl_main.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="387"/>
-        <CursorPos X="61" Y="398"/>
-        <UsageCount Value="14"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\..\..\..\src\zgl_textures.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="347"/>
-        <CursorPos X="42" Y="355"/>
-        <UsageCount Value="14"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\..\..\src\zgl_sprite_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="248"/>
-        <CursorPos X="3" Y="252"/>
-        <UsageCount Value="14"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="..\..\..\..\src\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="102"/>
-        <CursorPos X="3" Y="112"/>
-        <UsageCount Value="13"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\src\zgl_fpc.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="2"/>
-        <CursorPos X="20" Y="4"/>
-        <UsageCount Value="13"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\..\..\src\zgl_primitives_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="55"/>
-        <CursorPos X="3" Y="71"/>
-        <UsageCount Value="13"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\..\..\src\zgl_resources.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="391"/>
-        <CursorPos X="3" Y="371"/>
-        <UsageCount Value="14"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\..\..\..\src\zgl_application.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1691"/>
-        <CursorPos X="7" Y="1629"/>
-        <UsageCount Value="14"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\..\..\src\zgl_screen.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="804"/>
-        <CursorPos Y="806"/>
-        <UsageCount Value="9"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\..\src\zgl_timers.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="152"/>
-        <CursorPos X="3" Y="158"/>
-        <UsageCount Value="14"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="..\..\..\..\src\zgl_file.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="297"/>
-        <CursorPos X="16" Y="313"/>
-        <UsageCount Value="14"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="..\..\..\..\src\zgl_log.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="22"/>
-        <CursorPos X="13" Y="34"/>
-        <UsageCount Value="13"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="..\..\..\..\src\zgl_font.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="151"/>
-        <CursorPos X="3" Y="140"/>
-        <UsageCount Value="11"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="..\..\..\..\src\zgl_textures_png.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="391"/>
-        <CursorPos X="9" Y="399"/>
-        <UsageCount Value="11"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="..\..\..\..\src\zgl_memory.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="50"/>
-        <CursorPos X="61" Y="66"/>
-        <UsageCount Value="11"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="..\..\..\..\src\zgl_sound.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="4"/>
-        <CursorPos X="15" Y="26"/>
-        <UsageCount Value="10"/>
-      </Unit19>
-    </Units>
-    <JumpHistory Count="9" HistoryIndex="8">
-      <Position1>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="79" Column="12" TopLine="60"/>
-      </Position1>
-      <Position2>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="82" Column="21" TopLine="72"/>
-      </Position2>
-      <Position3>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="83" Column="25" TopLine="72"/>
-      </Position3>
-      <Position4>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="27" Column="11" TopLine="3"/>
-      </Position4>
-      <Position5>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="83" Column="22" TopLine="70"/>
-      </Position5>
-      <Position6>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="78" Column="12" TopLine="64"/>
-      </Position6>
-      <Position7>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="7" Column="15"/>
-      </Position7>
-      <Position8>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="46" Column="18" TopLine="28"/>
-      </Position8>
-      <Position9>
-        <Filename Value="demo02.lpr"/>
-        <Caret Line="148" Column="27" TopLine="116"/>
-      </Position9>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/demo02.lpi → Zengl_SRC/demos/Android/02-Resources/jni/demo02_v5.lpi

@@ -40,12 +40,18 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
-      <Libraries Value="..\libs\armeabi;C:\codetyphon\binLibraries\android-4.0-api14-arm"/>
+      <Libraries Value="..\libs\armeabi"/>
       <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV5"/>
       <TargetCPU Value="arm"/>
       <TargetOS Value="android"/>
       <Optimizations>
@@ -63,7 +69,7 @@
     </Linking>
     <Other>
       <ExecuteBefore>
-        <Command Value="sh prebuild.sh"/>
+        <Command Value="sh prebuild_v5.sh"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

Zengl_SRC/demos/Android/02-Resources/jni/demo02_v6.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo02"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo02.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\demo02"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV6"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v6.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/demo02_v7a.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo02"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo02.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi-v7a\demo02"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\armeabi-v7a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV7A"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v7a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/demo02_v8a.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo02"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo02.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\arm64-v8a\demo02"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\arm64-v8a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="aarch64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v8a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/demo02_x64.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo02"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo02.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86_64\demo02"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\x86_64"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="x86_64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x64.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/demo02_x86.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo02"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo02.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86\demo02"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\x86"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x86.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/02-Resources/jni/prebuild_v5.sh

@@ -0,0 +1,17 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libzenjpeg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libopenal.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libogg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libvorbis.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libtheoradec.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libchipmunk.so ../libs/armeabi/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/zengl.png ../assets
+cp ../../../../bin/data/click.wav ../assets
+cp ../../../../bin/data/back01.jpg ../assets

Zengl_SRC/demos/Android/02-Resources/jni/prebuild.sh → Zengl_SRC/demos/Android/02-Resources/jni/prebuild_v6.sh

@@ -1,3 +1,5 @@
+# clean
+rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/armeabi/
@@ -8,8 +10,9 @@ cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
 # copy resources
-mkdir ../assets
+mkdir ../assets/
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/zengl.png ../assets
 cp ../../../../bin/data/click.wav ../assets
 cp ../../../../bin/data/back01.jpg ../assets
+

Zengl_SRC/demos/Android/02-Resources/jni/prebuild_v7a.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzenjpeg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libopenal.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libogg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libvorbis.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libtheoradec.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzip.so ../libs/armeabi-v7a/
+#cp ../../../../bin/Android/armeabi-v7a/libchipmunk.so ../libs/armeabi-v7a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/zengl.png ../assets
+cp ../../../../bin/data/click.wav ../assets
+cp ../../../../bin/data/back01.jpg ../assets

Zengl_SRC/demos/Android/02-Resources/jni/prebuild_v8a.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzenjpeg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libopenal.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libogg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libvorbis.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libtheoradec.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzip.so ../libs/arm64-v8a/
+#cp ../../../../bin/Android/arm64-v8a/libchipmunk.so ../libs/arm64-v8a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/zengl.png ../assets
+cp ../../../../bin/data/click.wav ../assets
+cp ../../../../bin/data/back01.jpg ../assets

Zengl_SRC/demos/Android/02-Resources/jni/prebuild_x64.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzenjpeg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libopenal.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libogg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libvorbis.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libtheoradec.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzip.so ../libs/x86_64/
+#cp ../../../../bin/Android/x86_64/libchipmunk.so ../libs/x86_64/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/zengl.png ../assets
+cp ../../../../bin/data/click.wav ../assets
+cp ../../../../bin/data/back01.jpg ../assets

Zengl_SRC/demos/Android/02-Resources/jni/prebuild_x86.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86/
+cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libopenal.so ../libs/x86/
+cp ../../../../bin/Android/x86/libogg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libvorbis.so ../libs/x86/
+cp ../../../../bin/Android/x86/libtheoradec.so ../libs/x86/
+cp ../../../../bin/Android/x86/libzip.so ../libs/x86/
+#cp ../../../../bin/Android/x86/libchipmunk.so ../libs/x86/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/zengl.png ../assets
+cp ../../../../bin/data/click.wav ../assets
+cp ../../../../bin/data/back01.jpg ../assets

Zengl_SRC/demos/Android/02-Resources/src/zengl/android/ZenGL.java

@@ -64,13 +64,7 @@ public class ZenGL extends GLSurfaceView
 	public ZenGL( Context context, String appName, String appSourceDir )
 	{
 		super( context );
-
-		System.loadLibrary( "zenjpeg" );
-		System.loadLibrary( "openal" );
-		System.loadLibrary( "ogg" );
-		System.loadLibrary( "vorbis" );
-		System.loadLibrary( "theoradec" );
-		System.loadLibrary( "chipmunk" );
+		
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

Zengl_SRC/demos/Android/03-Input/jni/demo03.lpr

@@ -2,6 +2,11 @@ library demo03;
 {$I zgl_config.cfg}
 {$I zglCustomConfig.cfg}
 
+// RU: Включите KEYBOARD_OLD_FUNCTION в zgl_config.cfg, если хотите использовать старые функции клавиатуры.
+//     С введением Green Engine - они стали не актуальны, но я их пока оставляю.
+// EN: Enable KEYBOARD_OLD_FUNCTION in zgl_config.cfg if you want to use the old keyboard functions.
+//     With the introduction of the Green Engine - they are no longer relevant, but I leave them for now.
+
 uses
   zgl_application,
   zgl_file,
@@ -19,7 +24,7 @@ uses
   zgl_types,
   zgl_log,
   zgl_utils
-  {$IfDef OLD_METHODS}
+  {$IfDef KEYBOARD_OLD_FUNCTION}
   zgl_collision_2d
   {$else}
   , gegl_draw_gui,
@@ -46,7 +51,7 @@ var
   // RU: строка для получения значения из поля ввода
   // EN: string to get value from input field
   userInput  : UTF8String;
-  {$IfDef OLD_METHODS}
+  {$IfDef KEYBOARD_OLD_FUNCTION}
   trackInput : Boolean;
   inputRect  : zglTRect;
   lineAlpha  : LongWord;
@@ -77,12 +82,12 @@ begin
   //     Текст будет выведен поверх того, что вы здесь нарисуете.
   // EN: displacement and rotation will be done prior to performing the procedure. I am showing you how to draw a frame.
   //     The text will be drawn on top of what you draw here.
-  pr2d_Rect(- 2, - 1, myRect.W + 5, myRect.H,  {$IfnDef OLD_METHODS}cl_White{$else}, $FFFFFF, 128{$EndIf}, PR2D_FILL);
+  pr2d_Rect(- 2, - 1, myRect.W + 5, myRect.H, cl_White, PR2D_FILL);
 end;
   {$EndIf}
 
 procedure Init;
-{$IfNDef OLD_METHODS}
+{$IfNDef KEYBOARD_OLD_FUNCTION}
 var
   EScale: LongWord;
 {$EndIf}
@@ -99,11 +104,11 @@ begin
   // note
   // RU: Мы дважды загружаем один и тот же фонт для того, чтоб работать с ними по раздельности. Один фонт для клавиатуры, другой фонт для поля ввода.
   // EN: We download the same font twice in order to work with them separately. One font for the keyboard, another font for the input field.
-  {$IfNDef OLD_METHODS}
+  {$IfNDef KEYBOARD_OLD_FUNCTION}
   // обязательный код! Данные для отображения клавиатуры.
   // RU: Загружаем данные о шрифте.
   // EN: Load the font.
-   fntEdit := font_LoadFromFile(dirRes + 'CalibriBold50pt.zfi');
+  fntEdit := font_LoadFromFile(dirRes + 'CalibriBold50pt.zfi');
   JoyArrow := tex_LoadFromFile(dirRes + 'arrow.png');     // загрузили текстуру
   tex_SetFrameSize(JoyArrow, 64, 64);                     // и разбили её на части, но в записях не будет указано количество полученных текстур
   // RU: Данные для виртуальной клавиатуры.
@@ -116,7 +121,7 @@ begin
 
   file_CloseArchive();
 
-  {$IfNDef OLD_METHODS}
+  {$IfNDef KEYBOARD_OLD_FUNCTION}
   // RU: устанавливаем размеры шрифтов
   // EN: set font sizes
   setFontTextScale(15, fntMain);
@@ -191,7 +196,7 @@ begin
   text_Draw(fntMain, 0, 128, 'Nine  X, Y: ' + u_IntToStr(touch_X(8)) + '; ' + u_IntToStr(touch_Y(8)));
   text_Draw(fntMain, 0, 144, 'Ten   X, Y: ' + u_IntToStr(touch_X(9)) + '; ' + u_IntToStr(touch_Y(9)));
 
-  {$IfDef OLD_METHODS}
+  {$IfDef KEYBOARD_OLD_FUNCTION}
   // RU: Выводим введённый пользователем текст.
   // EN: Show the inputted text.
   pr2d_Rect( inputRect.X, inputRect.Y, inputRect.W, inputRect.H, $FFFFFF, 255 );
@@ -212,7 +217,7 @@ begin
   batch2d_End;
 end;
 
-{$IfDef OLD_METHODS}
+{$IfDef KEYBOARD_OLD_FUNCTION}
 procedure Timer;
 begin
   if lineAlpha > 5 Then
@@ -224,7 +229,7 @@ end;
 
 procedure KeyMouseEvent;
 begin
-  {$IfDef OLD_METHODS}
+  {$IfDef KEYBOARD_OLD_FUNCTION}
   // RU: Проверить тапнул ли пользователь в пределах inputRect и начать отслеживать ввод текста.
   // EN: Check if there was tap inside inputRect and start to track text input.
   if touch_Tap( 0 ) and col2d_PointInRect( touch_X( 0 ), touch_Y( 0 ), inputRect ) Then
@@ -259,7 +264,7 @@ procedure Restore;
 begin
   file_OpenArchive( PAnsiChar( zgl_Get( DIRECTORY_APPLICATION ) ) );
   font_RestoreFromFile( fntMain, dirRes + 'font.zfi' );
-  {$IfNDef OLD_METHODS}
+  {$IfNDef KEYBOARD_OLD_FUNCTION}
   font_RestoreFromFile( fntMain, dirRes + 'CalibriBold50pt.zfi' );
   tex_RestoreFromFile( JoyArrow, dirRes + 'arrow.png' );
   {$EndIf}
@@ -268,7 +273,7 @@ end;
 
 procedure Java_zengl_android_ZenGL_Main( var env; var thiz ); cdecl;
 begin
-  {$IfDef OLD_METHODS}
+  {$IfDef KEYBOARD_OLD_FUNCTION}
   TimerStart := timer_Add( @Timer, 16, Start );
   {$EndIf}
 

Zengl_SRC/demos/Android/03-Input/jni/demo03.lps

@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="12"/>
-    <BuildModes Active="Default"/>
-    <Units Count="53">
-      <Unit0>
-        <Filename Value="demo03.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <CursorPos X="10" Y="8"/>
-        <UsageCount Value="137"/>
-        <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
-        <IsPartOfProject Value="True"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="97"/>
-        <CursorPos X="3" Y="99"/>
-        <UsageCount Value="93"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\..\..\..\src\zgl_keyboard.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="323"/>
-        <CursorPos X="18" Y="358"/>
-        <UsageCount Value="56"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\..\..\src\zgl_application.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="2050"/>
-        <CursorPos X="98" Y="2059"/>
-        <UsageCount Value="33"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\..\src\zgl_threads.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="91"/>
-        <CursorPos X="36" Y="102"/>
-        <UsageCount Value="10"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="D:\lazarus\fpc\3.0.4\source\rtl\linux\sysosh.inc"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="2"/>
-        <CursorPos X="50" Y="23"/>
-        <UsageCount Value="10"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="D:\lazarus\fpc\3.0.4\source\rtl\inc\threadh.inc"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="148"/>
-        <CursorPos X="11" Y="163"/>
-        <UsageCount Value="10"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="D:\lazarus\fpc\3.0.4\source\rtl\inc\thread.inc"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="406"/>
-        <CursorPos X="28" Y="421"/>
-        <UsageCount Value="10"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\src\zgl_utils.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="372"/>
-        <CursorPos X="3" Y="372"/>
-        <UsageCount Value="33"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\01 - Initialization\jni\demo01.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="58"/>
-        <UsageCount Value="1"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\02 - Resources\jni\demo02.lpr"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="25" Y="9"/>
-        <UsageCount Value="10"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\..\..\Lazarus\05 - Primitives\demo05.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="56"/>
-        <UsageCount Value="10"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\..\Lazarus\01 - Initialization\demo01.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="88"/>
-        <UsageCount Value="1"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\Lazarus\03 - Input\demo03.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="130"/>
-        <CursorPos X="10" Y="44"/>
-        <UsageCount Value="10"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="..\..\..\..\src\zgl_primitives_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="33"/>
-        <CursorPos X="20" Y="41"/>
-        <UsageCount Value="10"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="..\..\..\..\src\zgl_main.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="654"/>
-        <CursorPos X="57" Y="665"/>
-        <UsageCount Value="3"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="..\..\..\..\src\zgl_screen.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1018"/>
-        <CursorPos X="8" Y="1021"/>
-        <UsageCount Value="28"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="..\..\..\..\src\zgl_window.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="128"/>
-        <CursorPos X="50" Y="151"/>
-        <UsageCount Value="36"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="..\..\..\..\extra\sw_touch_menu.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1081"/>
-        <CursorPos X="19" Y="894"/>
-        <UsageCount Value="2"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="..\..\..\..\extra\sw_draw_gui.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="125"/>
-        <CursorPos Y="3"/>
-        <UsageCount Value="3"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="..\..\..\..\src\zgl_opengl_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="308"/>
-        <CursorPos X="122" Y="324"/>
-        <UsageCount Value="2"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="..\..\..\..\src\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="97"/>
-        <CursorPos X="3" Y="113"/>
-        <UsageCount Value="2"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit21>
-      <Unit22>
-        <Filename Value="..\..\..\..\headers\zglCustomConfig.cfg"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="11" Y="29"/>
-        <UsageCount Value="12"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="..\..\..\..\src\zgl_file.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="85"/>
-        <CursorPos X="11" Y="115"/>
-        <UsageCount Value="43"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="C:\Projects\workspace\FilePathPr\jni\filerw.lpr"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="40" Y="10"/>
-        <UsageCount Value="3"/>
-      </Unit24>
-      <Unit25>
-        <Filename Value="..\..\..\..\src\zgl_opengles.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="347"/>
-        <CursorPos X="44" Y="365"/>
-        <UsageCount Value="3"/>
-      </Unit25>
-      <Unit26>
-        <Filename Value="..\..\..\..\src\zgl_text.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="378"/>
-        <CursorPos X="13" Y="427"/>
-        <UsageCount Value="34"/>
-      </Unit26>
-      <Unit27>
-        <Filename Value="..\..\..\..\src\zgl_font.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="160"/>
-        <CursorPos X="3" Y="140"/>
-        <UsageCount Value="3"/>
-      </Unit27>
-      <Unit28>
-        <Filename Value="..\..\..\..\src\zgl_opengles_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1741"/>
-        <CursorPos X="24" Y="1764"/>
-        <UsageCount Value="9"/>
-      </Unit28>
-      <Unit29>
-        <Filename Value="..\..\..\..\src\zgl_touch.pas"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="60" Y="49"/>
-        <UsageCount Value="54"/>
-      </Unit29>
-      <Unit30>
-        <Filename Value="..\..\..\..\headers\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="102"/>
-        <CursorPos X="39" Y="115"/>
-        <UsageCount Value="36"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit30>
-      <Unit31>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <UsageCount Value="30"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit31>
-      <Unit32>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_draw_gui.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="239"/>
-        <CursorPos X="13" Y="262"/>
-        <UsageCount Value="54"/>
-      </Unit32>
-      <Unit33>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_VElements.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="555"/>
-        <CursorPos X="37" Y="567"/>
-        <UsageCount Value="46"/>
-      </Unit33>
-      <Unit34>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_menu_gui.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1022"/>
-        <CursorPos X="7" Y="917"/>
-        <UsageCount Value="47"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="..\..\..\..\..\..\..\FPC_3_2\lazarus\lcl\interfaces\gtk2\gtk2cellrenderer.pas"/>
-        <UnitName Value="Gtk2CellRenderer"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="3" Y="30"/>
-        <UsageCount Value="3"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="..\..\..\..\src\zgl_fpc.cfg"/>
-        <EditorIndex Value="-1"/>
-        <UsageCount Value="4"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="..\..\..\..\..\..\..\FPC_3_2\fpcsrc\rtl\inc\system.inc"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1961"/>
-        <CursorPos X="11" Y="1991"/>
-        <UsageCount Value="3"/>
-      </Unit37>
-      <Unit38>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_types.pas"/>
-        <UnitName Value="gegl_Types"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="111"/>
-        <CursorPos X="3" Y="169"/>
-        <UsageCount Value="45"/>
-      </Unit38>
-      <Unit39>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_color.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="53"/>
-        <CursorPos X="36" Y="304"/>
-        <UsageCount Value="5"/>
-      </Unit39>
-      <Unit40>
-        <Filename Value="..\..\..\..\src\zgl_textures.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="16"/>
-        <CursorPos X="30" Y="34"/>
-        <UsageCount Value="40"/>
-      </Unit40>
-      <Unit41>
-        <Filename Value="..\..\..\..\src\zgl_textures_png.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="436"/>
-        <CursorPos X="51" Y="469"/>
-        <ExtraEditorCount Value="1"/>
-        <ExtraEditor1>
-          <EditorIndex Value="-1"/>
-          <WindowIndex Value="1"/>
-          <TopLine Value="287"/>
-          <CursorPos X="44" Y="287"/>
-        </ExtraEditor1>
-        <UsageCount Value="39"/>
-      </Unit41>
-      <Unit42>
-        <Filename Value="..\..\..\..\src\zgl_lib_zip.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="65"/>
-        <CursorPos X="45" Y="78"/>
-        <UsageCount Value="35"/>
-      </Unit42>
-      <Unit43>
-        <Filename Value="..\..\..\..\src\zgl_render.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="123"/>
-        <CursorPos X="28" Y="173"/>
-        <UsageCount Value="5"/>
-      </Unit43>
-      <Unit44>
-        <Filename Value="..\..\..\..\src\zgl_memory.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="-1"/>
-        <CursorPos X="-1" Y="-1"/>
-        <ExtraEditorCount Value="1"/>
-        <ExtraEditor1>
-          <EditorIndex Value="-1"/>
-          <TopLine Value="183"/>
-          <CursorPos X="30" Y="219"/>
-        </ExtraEditor1>
-        <UsageCount Value="5"/>
-      </Unit44>
-      <Unit45>
-        <Filename Value="..\..\..\..\src\zgl_types.pas"/>
-        <EditorIndex Value="-1"/>
-        <UsageCount Value="36"/>
-      </Unit45>
-      <Unit46>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_utils.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="29"/>
-        <CursorPos X="64" Y="57"/>
-        <UsageCount Value="34"/>
-      </Unit46>
-      <Unit47>
-        <Filename Value="..\..\..\..\srcGL\GLdefine.cfg"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="19" Y="34"/>
-        <UsageCount Value="19"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit47>
-      <Unit48>
-        <Filename Value="..\..\..\..\srcGL\zgl_gltypeconst.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <CursorPos X="6" Y="36"/>
-        <UsageCount Value="15"/>
-      </Unit48>
-      <Unit49>
-        <Filename Value="..\..\..\..\src\zgl_render_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="77"/>
-        <CursorPos X="3" Y="79"/>
-        <UsageCount Value="9"/>
-      </Unit49>
-      <Unit50>
-        <Filename Value="..\..\..\..\src\zgl_lib_ogg.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="61"/>
-        <CursorPos X="11" Y="77"/>
-        <UsageCount Value="12"/>
-      </Unit50>
-      <Unit51>
-        <Filename Value="..\..\..\..\src\zgl_lib_theora.pas"/>
-        <EditorIndex Value="-1"/>
-        <WindowIndex Value="1"/>
-        <TopLine Value="20"/>
-        <CursorPos X="17" Y="40"/>
-        <UsageCount Value="11"/>
-      </Unit51>
-      <Unit52>
-        <Filename Value="..\..\..\..\src\zgl_mouse.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="88"/>
-        <CursorPos X="78" Y="105"/>
-        <UsageCount Value="11"/>
-      </Unit52>
-    </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
-      <Position1>
-        <Filename Value="demo03.lpr"/>
-        <Caret Line="12" Column="11"/>
-      </Position1>
-      <Position2>
-        <Filename Value="demo03.lpr"/>
-        <Caret Line="12" Column="11"/>
-      </Position2>
-      <Position3>
-        <Filename Value="demo03.lpr"/>
-        <Caret Line="8" Column="10"/>
-      </Position3>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/demo03.lpi → Zengl_SRC/demos/Android/03-Input/jni/demo03_v5.lpi

@@ -48,8 +48,14 @@
       <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV5"/>
       <TargetCPU Value="arm"/>
       <TargetOS Value="android"/>
       <Optimizations>
@@ -67,7 +73,7 @@
     </Linking>
     <Other>
       <ExecuteBefore>
-        <Command Value="sh prebuild.sh"/>
+        <Command Value="sh prebuild_v5.sh"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

Zengl_SRC/demos/Android/03-Input/jni/demo03_v6.lpi

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo03"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="demo03.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\demo03"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV6"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v6.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/demo03_v7a.lpi

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo03"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="demo03.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi-v7a\demo03"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <Libraries Value="..\libs\armeabi-v7a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV7A"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v7a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/demo03_v8a.lpi

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo03"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="demo03.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\arm64-v8a"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <Libraries Value="..\libs\arm64-v8a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="aarch64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v8a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/demo03_x64.lpi

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo03"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="demo03.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86_64\demo03"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <Libraries Value="..\libs\x86_64"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="x86_64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x64.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/demo03_x86.lpi

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo03"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="2">
+      <Unit0>
+        <Filename Value="demo03.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+      <Unit1>
+        <Filename Value="..\..\..\..\srcGEGL\gegl_button.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit1>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86\demo03"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <Libraries Value="..\libs\x86"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\extra"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x86.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/03-Input/jni/prebuild_v5.sh

@@ -0,0 +1,17 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libzenjpeg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libopenal.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libogg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libvorbis.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libtheoradec.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libchipmunk.so ../libs/armeabi/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/CalibriBold50pt* ../assets
+cp ../../../../bin/data/arrow.png ../assets
+cp ../../../../bin/data/Rus.txt ../assets

Zengl_SRC/demos/Android/03-Input/jni/prebuild.sh → Zengl_SRC/demos/Android/03-Input/jni/prebuild_v6.sh

@@ -1,3 +1,5 @@
+# clean
+rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/armeabi/
@@ -8,7 +10,7 @@ cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
 # copy resources
-mkdir ../assets
+mkdir ../assets/
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/CalibriBold50pt* ../assets
 cp ../../../../bin/data/arrow.png ../assets

Zengl_SRC/demos/Android/03-Input/jni/prebuild_v7a.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzenjpeg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libopenal.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libogg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libvorbis.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libtheoradec.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzip.so ../libs/armeabi-v7a/
+#cp ../../../../bin/Android/armeabi-v7a/libchipmunk.so ../libs/armeabi-v7a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/CalibriBold50pt* ../assets
+cp ../../../../bin/data/arrow.png ../assets
+cp ../../../../bin/data/Rus.txt ../assets

Zengl_SRC/demos/Android/03-Input/jni/prebuild_v8a.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzenjpeg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libopenal.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libogg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libvorbis.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libtheoradec.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzip.so ../libs/arm64-v8a/
+#cp ../../../../bin/Android/arm64-v8a/libchipmunk.so ../libs/arm64-v8a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/CalibriBold50pt* ../assets
+cp ../../../../bin/data/arrow.png ../assets
+cp ../../../../bin/data/Rus.txt ../assets

Zengl_SRC/demos/Android/03-Input/jni/prebuild_x64.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzenjpeg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libopenal.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libogg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libvorbis.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libtheoradec.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzip.so ../libs/x86_64/
+#cp ../../../../bin/Android/x86_64/libchipmunk.so ../libs/x86_64/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/CalibriBold50pt* ../assets
+cp ../../../../bin/data/arrow.png ../assets
+cp ../../../../bin/data/Rus.txt ../assets

Zengl_SRC/demos/Android/03-Input/jni/prebuild_x86.sh

@@ -0,0 +1,18 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86/
+cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libopenal.so ../libs/x86/
+cp ../../../../bin/Android/x86/libogg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libvorbis.so ../libs/x86/
+cp ../../../../bin/Android/x86/libtheoradec.so ../libs/x86/
+cp ../../../../bin/Android/x86/libzip.so ../libs/x86/
+#cp ../../../../bin/Android/x86/libchipmunk.so ../libs/x86/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/CalibriBold50pt* ../assets
+cp ../../../../bin/data/arrow.png ../assets
+cp ../../../../bin/data/Rus.txt ../assets

Zengl_SRC/demos/Android/03-Input/src/zengl/android/ZenGL.java

@@ -64,13 +64,7 @@ public class ZenGL extends GLSurfaceView
 	public ZenGL( Context context, String appName, String appSourceDir )
 	{
 		super( context );
-
-		System.loadLibrary( "zenjpeg" );
-		System.loadLibrary( "openal" );
-		System.loadLibrary( "ogg" );
-		System.loadLibrary( "vorbis" );
-		System.loadLibrary( "theoradec" );
-		System.loadLibrary( "chipmunk" );
+		
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04.lpr

@@ -19,11 +19,9 @@ uses
   zgl_textures_jpg,
   zgl_types,
   zgl_collision_2d,
-  {$IfNDef OLD_METHODS}
   gegl_color,
-  {$EndIf}
-  zgl_utils
-  ;
+  zgl_types,
+  zgl_utils;
 
 var
   dirRes  : UTF8String = 'assets/';
@@ -66,12 +64,12 @@ begin
   correctRect.Y := 100;
   if correctAspect Then
     begin
-      pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, {$IfDef OLD_METHODS}$FFFFFF, 25,{$Else}cl_White05,{$EndIf} PR2D_FILL );
-      pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, {$IfDef OLD_METHODS}$00FF00, 255{$Else}cl_Lime{$EndIf} );
+      pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, cl_White05, PR2D_FILL );
+      pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, cl_Lime );
     end else
       begin
-        pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, {$IfDef OLD_METHODS}$000000, 155,{$Else}cl_Black05,{$EndIf} PR2D_FILL );
-        pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, {$IfDef OLD_METHODS}$FFFFFF, 255{$Else}cl_White{$EndIf} );
+        pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, cl_Black05, PR2D_FILL );
+        pr2d_Rect( correctRect.X, correctRect.Y, correctRect.W, correctRect.H, cl_White );
       end;
   text_DrawInRect( fntMain, correctRect, str, TEXT_HALIGN_CENTER or TEXT_VALIGN_CENTER );
 end;

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04.lps

@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="12"/>
-    <BuildModes Active="Default"/>
-    <Units Count="12">
-      <Unit0>
-        <Filename Value="demo04.lpr"/>
-        <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="23"/>
-        <CursorPos X="53" Y="57"/>
-        <UsageCount Value="26"/>
-        <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="..\..\..\..\src\zgl_screen.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="698"/>
-        <CursorPos X="49" Y="713"/>
-        <UsageCount Value="12"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\..\..\..\src\zgl_window.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="143"/>
-        <UsageCount Value="11"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\..\..\src\zgl_text.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="84"/>
-        <CursorPos X="3" Y="85"/>
-        <UsageCount Value="12"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\..\src\zgl_primitives_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="75"/>
-        <CursorPos X="21" Y="90"/>
-        <UsageCount Value="12"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\..\..\..\src\zgl_opengles_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="753"/>
-        <CursorPos X="95" Y="767"/>
-        <UsageCount Value="12"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\..\..\src\zgl_main.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="474"/>
-        <CursorPos X="63" Y="465"/>
-        <UsageCount Value="11"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="..\..\..\..\src\zgl_application.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1612"/>
-        <CursorPos X="11" Y="1631"/>
-        <UsageCount Value="11"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\src\zgl_threads.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="82"/>
-        <CursorPos X="22" Y="91"/>
-        <UsageCount Value="11"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\..\..\src\zgl_sprite_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="240"/>
-        <CursorPos X="3" Y="254"/>
-        <UsageCount Value="10"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\..\..\src\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="101"/>
-        <CursorPos X="32" Y="119"/>
-        <UsageCount Value="10"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_color.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="31"/>
-        <CursorPos X="3" Y="52"/>
-        <UsageCount Value="10"/>
-      </Unit11>
-    </Units>
-    <JumpHistory Count="20" HistoryIndex="19">
-      <Position1>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="10" Column="11"/>
-      </Position1>
-      <Position2>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="70" Column="9" TopLine="46"/>
-      </Position2>
-      <Position3>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="67" Column="13" TopLine="53"/>
-      </Position3>
-      <Position4>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="70" Column="10" TopLine="58"/>
-      </Position4>
-      <Position5>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="68" Column="11" TopLine="51"/>
-      </Position5>
-      <Position6>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="15" Column="15" TopLine="5"/>
-      </Position6>
-      <Position7>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="10" Column="9"/>
-      </Position7>
-      <Position8>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="7" Column="9"/>
-      </Position8>
-      <Position9>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="6" Column="11"/>
-      </Position9>
-      <Position10>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="111" Column="44" TopLine="95"/>
-      </Position10>
-      <Position11>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="19" Column="12" TopLine="17"/>
-      </Position11>
-      <Position12>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="50" Column="17" TopLine="36"/>
-      </Position12>
-      <Position13>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="57" Column="10" TopLine="45"/>
-      </Position13>
-      <Position14>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="57" Column="11" TopLine="42"/>
-      </Position14>
-      <Position15>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="44" Column="37" TopLine="36"/>
-      </Position15>
-      <Position16>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="31" Column="29" TopLine="2"/>
-      </Position16>
-      <Position17>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="69" Column="121" TopLine="37"/>
-      </Position17>
-      <Position18>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="108" Column="27" TopLine="64"/>
-      </Position18>
-      <Position19>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="115" Column="41" TopLine="36"/>
-      </Position19>
-      <Position20>
-        <Filename Value="demo04.lpr"/>
-        <Caret Line="73" Column="131" TopLine="44"/>
-      </Position20>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04.lpi → Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_v5.lpi

@@ -44,8 +44,14 @@
       <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV5"/>
       <TargetCPU Value="arm"/>
       <TargetOS Value="android"/>
       <Optimizations>
@@ -63,7 +69,7 @@
     </Linking>
     <Other>
       <ExecuteBefore>
-        <Command Value="sh prebuild.sh"/>
+        <Command Value="sh prebuild_v5.sh"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_v6.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo04"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo04.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\demo04"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV6"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v6.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_v7a.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo04"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo04.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi-v7a\demo04"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\armeabi-v7a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV7A"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v7a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_v8a.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo04"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo04.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\arm64-v8a\demo04"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\arm64-v8a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="aarch64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v8a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_x64.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo04"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo04.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86_64\demo04"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\x86_64"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="x86_64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x64.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/demo04_x86.lpi

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo04"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo04.lpr"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86\demo04"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\srcGL;..\..\..\..\srcGEGL;..\..\..\..\src"/>
+      <Libraries Value="..\libs\x86"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\theora\arm-linux;..\..\..\..\lib\ogg\arm-linux;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v86.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_v5.sh

@@ -0,0 +1,15 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libzenjpeg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libopenal.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libogg.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libvorbis.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libtheoradec.so ../libs/armeabi/
+cp ../../../../bin/Android/armv5/libchipmunk.so ../libs/armeabi/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild.sh → Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_v6.sh

@@ -1,3 +1,5 @@
+# clean
+rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/armeabi/
@@ -8,6 +10,6 @@ cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
 # copy resources
-mkdir ../assets
+mkdir ../assets/
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_v7a.sh

@@ -0,0 +1,16 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzenjpeg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libopenal.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libogg.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libvorbis.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libtheoradec.so ../libs/armeabi-v7a/
+cp ../../../../bin/Android/armeabi-v7a/libzip.so ../libs/armeabi-v7a/
+#cp ../../../../bin/Android/armeabi-v7a/libchipmunk.so ../libs/armeabi-v7a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_v8a.sh

@@ -0,0 +1,16 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzenjpeg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libopenal.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libogg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libvorbis.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libtheoradec.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libzip.so ../libs/arm64-v8a/
+#cp ../../../../bin/Android/arm64-v8a/libchipmunk.so ../libs/arm64-v8a/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_x64.sh

@@ -0,0 +1,16 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzenjpeg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libopenal.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libogg.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libvorbis.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libtheoradec.so ../libs/x86_64/
+cp ../../../../bin/Android/x86_64/libzip.so ../libs/x86_64/
+#cp ../../../../bin/Android/x86_64/libchipmunk.so ../libs/x86_64/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/jni/prebuild_x86.sh

@@ -0,0 +1,16 @@
+# clean
+rm -r ../libs
+# copy libraries
+mkdir ../libs
+mkdir ../libs/x86/
+cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libopenal.so ../libs/x86/
+cp ../../../../bin/Android/x86/libogg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libvorbis.so ../libs/x86/
+cp ../../../../bin/Android/x86/libtheoradec.so ../libs/x86/
+cp ../../../../bin/Android/x86/libzip.so ../libs/x86/
+#cp ../../../../bin/Android/x86/libchipmunk.so ../libs/x86/
+# copy resources
+mkdir ../assets/
+cp ../../../../bin/data/font* ../assets
+cp ../../../../bin/data/back03.jpg ../assets

Zengl_SRC/demos/Android/04-ScreenSettings/src/zengl/android/ZenGL.java

@@ -64,13 +64,7 @@ public class ZenGL extends GLSurfaceView
 	public ZenGL( Context context, String appName, String appSourceDir )
 	{
 		super( context );
-
-		System.loadLibrary( "zenjpeg" );
-		System.loadLibrary( "openal" );
-		System.loadLibrary( "ogg" );
-		System.loadLibrary( "vorbis" );
-		System.loadLibrary( "theoradec" );
-		System.loadLibrary( "chipmunk" );
+		
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

Zengl_SRC/demos/Android/05-Primitives/AndroidManifest.xml

@@ -5,8 +5,8 @@
     android:versionName="1.0" >
 
     <uses-sdk 
-        android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+        android:minSdkVersion="16"
+        android:targetSdkVersion="25" />
 
     <application
         android:icon="@drawable/ic_launcher"

Zengl_SRC/demos/Android/05-Primitives/jni/demo05.lps

@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CONFIG>
-  <ProjectSession>
-    <PathDelim Value="\"/>
-    <Version Value="12"/>
-    <BuildModes Active="Default"/>
-    <Units Count="25">
-      <Unit0>
-        <Filename Value="demo05.pas"/>
-        <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <TopLine Value="33"/>
-        <CursorPos X="117" Y="78"/>
-        <UsageCount Value="49"/>
-        <Loaded Value="True"/>
-      </Unit0>
-      <Unit1>
-        <Filename Value="..\..\..\..\src\zgl_application.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="1597"/>
-        <CursorPos X="17" Y="1637"/>
-        <UsageCount Value="13"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="..\..\..\..\src\jni.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="355"/>
-        <CursorPos X="3" Y="371"/>
-        <UsageCount Value="13"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="..\..\..\..\src\zgl_primitives_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="242"/>
-        <CursorPos X="22" Y="256"/>
-        <UsageCount Value="16"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="..\..\..\..\src\zgl_opengles_all.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="570"/>
-        <CursorPos X="9" Y="578"/>
-        <UsageCount Value="15"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="..\..\..\..\src\zgl_math_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="276"/>
-        <CursorPos X="8" Y="301"/>
-        <UsageCount Value="15"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="..\..\..\..\src\zgl_opengles.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="399"/>
-        <CursorPos X="32" Y="425"/>
-        <UsageCount Value="13"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="..\..\..\..\src\zgl_render_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="9"/>
-        <CursorPos X="12" Y="33"/>
-        <UsageCount Value="12"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="..\..\..\..\src\zgl_render.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="59"/>
-        <CursorPos X="53" Y="77"/>
-        <UsageCount Value="12"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="..\..\..\..\src\zgl_text.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="8"/>
-        <CursorPos X="5" Y="37"/>
-        <UsageCount Value="12"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="..\..\..\..\src\zgl_config.cfg"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="55" Y="12"/>
-        <UsageCount Value="9"/>
-        <DefaultSyntaxHighlighter Value="None"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="C:\codetyphon\fpcsrc\packages\opengl\src\gl.pp"/>
-        <UnitName Value="GL"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="136"/>
-        <CursorPos X="60" Y="153"/>
-        <UsageCount Value="12"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="..\..\..\..\src\zgl_threads.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="11"/>
-        <CursorPos X="11" Y="26"/>
-        <UsageCount Value="9"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\..\..\..\src\zgl_screen.pas"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="2" Y="29"/>
-        <UsageCount Value="9"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="..\..\..\..\..\..\..\fpc_3_2\fpcsrc\packages\opengl\src\glu.pp"/>
-        <EditorIndex Value="-1"/>
-        <UsageCount Value="9"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="..\..\..\..\src\zgl_types.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="2"/>
-        <CursorPos X="5" Y="33"/>
-        <UsageCount Value="9"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="..\..\..\..\src\zgl_window.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="23"/>
-        <CursorPos X="3" Y="53"/>
-        <UsageCount Value="9"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_color.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="44"/>
-        <CursorPos X="132" Y="74"/>
-        <UsageCount Value="9"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_types.pas"/>
-        <UnitName Value="gegl_Types"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="12" Y="29"/>
-        <UsageCount Value="9"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="..\..\..\..\src\zgl_textures.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="26"/>
-        <CursorPos X="3" Y="37"/>
-        <UsageCount Value="9"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="..\..\..\..\src\zgl_memory.pas"/>
-        <EditorIndex Value="-1"/>
-        <CursorPos X="12" Y="30"/>
-        <UsageCount Value="9"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="..\..\..\..\srcGEGL\gegl_draw_gui.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="9"/>
-        <CursorPos X="19" Y="64"/>
-        <UsageCount Value="9"/>
-      </Unit21>
-      <Unit22>
-        <Filename Value="..\..\..\..\src\zgl_render_target.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="70"/>
-        <CursorPos X="16" Y="108"/>
-        <UsageCount Value="9"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="..\..\..\..\src\zgl_sengine_2d.pas"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="16"/>
-        <CursorPos X="12" Y="32"/>
-        <UsageCount Value="9"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="..\..\..\Lazarus\05 - Primitives\demo05.lpr"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="50"/>
-        <CursorPos X="48" Y="89"/>
-        <UsageCount Value="9"/>
-      </Unit24>
-    </Units>
-    <JumpHistory Count="8" HistoryIndex="7">
-      <Position1>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="6" Column="12"/>
-      </Position1>
-      <Position2>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="49" Column="7" TopLine="49"/>
-      </Position2>
-      <Position3>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="49" Column="7" TopLine="49"/>
-      </Position3>
-      <Position4>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="22" Column="17"/>
-      </Position4>
-      <Position5>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="7" Column="7"/>
-      </Position5>
-      <Position6>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="13" Column="12"/>
-      </Position6>
-      <Position7>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="12" Column="31" TopLine="4"/>
-      </Position7>
-      <Position8>
-        <Filename Value="demo05.pas"/>
-        <Caret Line="14" Column="16" TopLine="4"/>
-      </Position8>
-    </JumpHistory>
-    <RunParams>
-      <FormatVersion Value="2"/>
-      <Modes ActiveMode=""/>
-    </RunParams>
-  </ProjectSession>
-</CONFIG>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05.pas

@@ -13,26 +13,20 @@ uses
   zgl_primitives_2dEX,
   zgl_types,
   zgl_math_2d,
-  {$IfNDef OLD_METHODS}
   gegl_color,
-  {$EndIf}
   zgl_utils;
 
 var
   calc   : Integer;
   points : array[ 0..359 ] of zglTPoint2D;
-  {$IfNDef OLD_METHODS}
   //dirRes : UTF8String {$IFNDEF MACOSX} = '../data/' {$ENDIF};      // определится с дирректориями для Android
   newColor: array[0..1] of LongWord;
-  {$EndIf}
-  {$IfNDef OLD_METHODS}
   // RU: это для создания ломанных линий. Можно создать динамический массив и делать
   //     линии с произвольным количеством точек.
   // EN: this is for creating broken lines. You can create a dynamic array and draw
   //     lines with an arbitrary number of points.
   myPointArray: array[0..3] of zglTPoint2DColor;
   deltaX, deltaY: array [0..3] of Integer;
-  {$EndIf}
 
 procedure Init;
   var
@@ -46,7 +40,6 @@ begin
       points[ i ].X := 400 + m_Cos( i ) * ( 96 + random( 32 ) );
       points[ i ].Y := 300 + m_Sin( i ) * ( 96 + random( 32 ) );
     end;
-  {$IfNDef OLD_METHODS}
   // Rus: устанавливаем новый цвет. Которого нет в списке стандартных. Все константы в gegl_color.
   // Eng: set a new color. Which is not in the standard list. All constants in gegl_color.
   newColor[0] := Color_FindOrAdd($0000009B);
@@ -68,7 +61,6 @@ begin
   deltaX[1] := - 1;        deltaY[1] := 1;
   deltaX[2] := - 1;        deltaY[2] := - 1;
   deltaX[3] := 1;          deltaY[3] := - 1;
-  {$EndIf}
 end;
 
 procedure Draw;
@@ -81,13 +73,8 @@ begin
   fx2d_SetVCA( $FF0000, $00FF00, $0000FF, $FFFFFF, 255, 255, 255, 255 );
   // RU: Рисуем прямоугольник с заливкой(флаг PR2D_FILL) с использованием отдельных цветов для каждой вершины(флаг FX2D_VCA).
   // EN: Render filled rectangle(flag PR2D_FILL) and use different colors for each vertex(flag FX2D_VCA).
-  pr2d_Rect( 0, 0, 800, 600, {$IfDef OLD_METHODS}$000000, 255{$Else}cl_Black{$EndIf}, FX2D_VCA or PR2D_FILL );
+  pr2d_Rect( 0, 0, 800, 600, cl_Black, FX2D_VCA or PR2D_FILL );
 
-  // RU: мне лень переделывать под старые методы, потому просто отключаю. Но сама линия приспособлена к использованию старых методов,
-  //     вы можете сами потренироваться и реализовать использование этой функции для старых методов.
-  // EN: I'm too lazy to remake under the old methods, so I just turn it off. But the line itself is adapted to use the old methods,
-  //     you can practice and implement the use of this function for old methods.
-  {$IfNDef OLD_METHODS}
   // RU: рисуем широкую ломанную линию. Каждая точка имеет свой цвет, ширина линии 10 пикселей.
   // EN: draw a wide broken line. Each point has its own color, the line width is 10 pixels.
   pr2d_LineStripEX(@myPointArray, 4, 0, 10, LINE_RGBA);
@@ -103,11 +90,10 @@ begin
     myPointArray[i].X := myPointArray[i].X + deltaX[i];
     myPointArray[i].Y := myPointArray[i].Y + deltaY[i];
   end;
-  {$EndIf}
 
   // RU: Рисуем в центре экрана круг с радиусом 128 пиксела.
   // EN: Render circle in the center of screen with radius 128 pixels.
-  pr2d_Circle( 400, 300, 128, {$IfDef OLD_METHODS}$000000, 155{$Else}newColor[0]{$EndIf}, 32, PR2D_FILL );
+  pr2d_Circle( 400, 300, 128, newColor[0], 32, PR2D_FILL );
 
   INC( calc );
   if calc > 359 Then calc := 0;
@@ -116,15 +102,15 @@ begin
   // RU: Рисуем линии внутри круга.
   // EN: Render lines inside the circle.
   for i := 0 to 359 do
-    pr2d_Line( 400, 300, points[ i ].X, points[ i ].Y, {$IfDef OLD_METHODS}$FFFFFF, 255{$Else}cl_White{$EndIf} );
+    pr2d_Line( 400, 300, points[ i ].X, points[ i ].Y, cl_White );
 
   // RU: Рисуем эллипсы с заливкой и без, со сглаженными контурами(флаг PR2D_SMOOTH).
   // EN: Render filled ellipses with smoothed edges(flag PR2D_SMOOTH).
-  pr2d_Ellipse( 400 + 300, 300, 64, 256, {$IfDef OLD_METHODS}$FFFFFF, 75{$Else}newColor[1]{$EndIf}, 64, PR2D_FILL or PR2D_SMOOTH );
-  pr2d_Ellipse( 400 + 300, 300, 64, 256, {$IfDef OLD_METHODS}$000000, 255{$Else}cl_Black{$EndIf}, 32, PR2D_SMOOTH );
+  pr2d_Ellipse( 400 + 300, 300, 64, 256, newColor[1], 64, PR2D_FILL or PR2D_SMOOTH );
+  pr2d_Ellipse( 400 + 300, 300, 64, 256, cl_Black, 32, PR2D_SMOOTH );
 
-  pr2d_Ellipse( 400 - 300, 300, 64, 256, {$IfDef OLD_METHODS}$FFFFFF, 75{$Else}newColor[1]{$EndIf}, 64, PR2D_FILL{ or PR2D_SMOOTH });
-  pr2d_Ellipse( 400 - 300, 300, 64, 256, {$IfDef OLD_METHODS}$000000, 255{$Else}cl_Black{$EndIf}, 32, PR2D_SMOOTH );
+  pr2d_Ellipse( 400 - 300, 300, 64, 256, newColor[1], 64, PR2D_FILL{ or PR2D_SMOOTH });
+  pr2d_Ellipse( 400 - 300, 300, 64, 256, cl_Black, 32, PR2D_SMOOTH );
   batch2d_End;
 end;
 

Zengl_SRC/demos/Android/05-Primitives/jni/demo05.lpi → Zengl_SRC/demos/Android/05-Primitives/jni/demo05_v5.lpi

@@ -40,12 +40,18 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
-      <Libraries Value="..\libs\armeabi;..\..\..\..\bin\Android\armv6;C:\codetyphon\binLibraries\android-4.0-api14-arm"/>
+      <Libraries Value="..\libs\armeabi"/>
       <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV5"/>
       <TargetCPU Value="arm"/>
       <TargetOS Value="android"/>
       <Optimizations>
@@ -64,7 +70,7 @@
     <Other>
       <CustomOptions Value="-al"/>
       <ExecuteBefore>
-        <Command Value="sh prebuild.sh"/>
+        <Command Value="sh prebuild_v5.sh"/>
       </ExecuteBefore>
     </Other>
   </CompilerOptions>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05_v6.lpi

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo05"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo05.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi\demo05"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\armeabi"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV6"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <CustomOptions Value="-al"/>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v6.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05_v7a.lpi

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo05"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo05.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\armeabi-v7a\demo05"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\armeabi-v7a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetProcessor Value="ARMV7A"/>
+      <TargetCPU Value="arm"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <CustomOptions Value="-al"/>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v7a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05_v8a.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo05"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo05.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\arm64-v8a\demo05"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\arm64-v8a"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="aarch64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <CustomOptions Value="-al"/>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_v8a.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05_x64.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo05"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo05.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86_64\demo05"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\x86_64"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="x86_64"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <CustomOptions Value="-al"/>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x64.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>

Zengl_SRC/demos/Android/05-Primitives/jni/demo05_x86.lpi

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <PathDelim Value="\"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="demo05"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes Count="1">
+      <Item1 Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+    </RunParams>
+    <Units Count="1">
+      <Unit0>
+        <Filename Value="demo05.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit0>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <PathDelim Value="\"/>
+    <Target>
+      <Filename Value="..\libs\x86\demo05"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="..\..\..\..\headers;..\..\..\..\headers\android;$(ProjOutDir);..\..\..\..\src;..\..\..\..\srcGEGL;..\..\..\..\srcGL"/>
+      <Libraries Value="..\libs\x86"/>
+      <OtherUnitFiles Value="..\..\..\..\src;..\..\..\..\lib\zip\arm-linux;..\..\..\..\lib\zlib\arm-linux;..\..\..\..\extra;..\..\..\..\srcGL;..\..\..\..\srcGEGL"/>
+      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="Delphi"/>
+      </SyntaxOptions>
+    </Parsing>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="android"/>
+      <Optimizations>
+        <OptimizationLevel Value="2"/>
+      </Optimizations>
+    </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
+      <Options>
+        <ExecutableType Value="Library"/>
+      </Options>
+    </Linking>
+    <Other>
+      <CustomOptions Value="-al"/>
+      <ExecuteBefore>
+        <Command Value="sh prebuild_x86.sh"/>
+      </ExecuteBefore>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="3">
+      <Item1>
+        <Name Value="EAbort"/>
+      </Item1>
+      <Item2>
+        <Name Value="ECodetoolError"/>
+      </Item2>
+      <Item3>
+        <Name Value="EFOpenError"/>
+      </Item3>
+    </Exceptions>
+  </Debugging>
+</CONFIG>