error Android jpg

Zengl_SRC/Update_ZenGL.txt

@@ -16,6 +16,9 @@
 	Полностью удалёна поддержка MacOS Carbon (она и не поддерживалась).
 	Собраны библиотеки "Ogg", "Vorbis", "Theora" для Android (v8a, v7a, x86, x86_64). v7a - звук работает, видео не проверено.
 
+17.03.2023
+	Стабилизация последней версии 3.30. Подготовка модулей для создания ZenGL-library.
+	
 14.03.2023
 	Исправления для статической сборки OGG, Vorbis - убраны динамические зависимости.
 	Исправлены проблемы работы виртуальной клавиатуры в мобильных системах.

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

@@ -1,4 +0,0 @@
-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/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

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

@@ -1,4 +0,0 @@
-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.lpr

@@ -22,6 +22,8 @@ uses
   // EN: Units for using textures. zgl_textures is a main unit, next units provide support of different formats.
   zgl_textures,
   zgl_textures_tga, // TGA
+  // Rus: для Android v5 и v6 отключите в файле конфигурации define CPUARMV7A.
+  // Eng: for Android v5 and v6 disable in the config file define CPUARMV7A.
   zgl_textures_jpg, // JPG
   zgl_textures_png, // PNG
   // RU: Звуковая подсистема реализована в модулях ниже. Подход такой же как и с текстурами - основной модуль и модули поддержки форматов.

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/03-Input/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/03-Input/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

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

@@ -16,6 +16,8 @@ uses
   zgl_sprite_2d,
   zgl_textures,
   zgl_textures_png,
+  // Rus: для Android v5 и v6 отключите в файле конфигурации define CPUARMV7A.
+  // Eng: for Android v5 and v6 disable in the config file define CPUARMV7A.
   zgl_textures_jpg,
   zgl_types,
   zgl_collision_2d,

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

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

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/05-Primitives/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/05-Primitives/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/05-Primitives/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/05-Primitives/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/05-Primitives/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/06-Text/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/06-Text/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/06-Text/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/06-Text/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/07-Sprites/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/07-Sprites/jni/demo07.lpr

@@ -14,6 +14,8 @@ uses
   zgl_fx,
   zgl_textures,
   zgl_textures_png,
+  // Rus: для Android v5 и v6 отключите в файле конфигурации define CPUARMV7A.
+  // Eng: for Android v5 and v6 disable in the config file define CPUARMV7A.
   zgl_textures_jpg,
   zgl_sprite_2d,
   zgl_primitives_2d,

Zengl_SRC/demos/Android/07-Sprites/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/07-Sprites/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/07-Sprites/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/07-Sprites/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/08-SpriteEngine/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/08-SpriteEngine/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/08-SpriteEngine/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/08-SpriteEngine/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/09-SpriteEngine_Classes/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/09-SpriteEngine_Classes/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/09-SpriteEngine_Classes/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/09-SpriteEngine_Classes/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/10-Tiles/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/10-Tiles/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/10-Tiles/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/10-Tiles/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/10-Tiles/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/11-Grid/jni/demo11.lpr

@@ -12,6 +12,8 @@ uses
   zgl_fx,
   zgl_textures,
   zgl_textures_png,
+  // Rus: для Android v5 и v6 отключите в файле конфигурации define CPUARMV7A.
+  // Eng: for Android v5 and v6 disable in the config file define CPUARMV7A.
   zgl_textures_jpg,
   zgl_grid_2d,
   zgl_font,

Zengl_SRC/demos/Android/11-Grid/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/11-Grid/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/11-Grid/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/11-Grid/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/12-RenderIntoTexture/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/12-RenderIntoTexture/jni/prebuild_v8a.sh

@@ -1,16 +1,16 @@
 # clean
 rm -r ../libs
-# copy resources
-mkdir ../assets/
-cp ../../../../bin/data/tux_stand.png ../assets
-cp ../../../../bin/data/font* ../assets
 # copy libraries
 mkdir ../libs
 mkdir ../libs/arm64-v8a/
-cp ../../../../bin/Android/arm64-v8a/libzenjpeg.so ../libs/arm64-v8a/
+cp ../../../../bin/Android/arm64-v8a/libjpeg_turbo.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/tux_stand.png ../assets
+cp ../../../../bin/data/font* ../assets

Zengl_SRC/demos/Android/12-RenderIntoTexture/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/12-RenderIntoTexture/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/13-Particles/.settings/org.eclipse.jdt.core.prefs

@@ -1,15 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.6

Zengl_SRC/demos/Android/13-Particles/.settings/org.eclipse.jdt.ui.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=

Zengl_SRC/demos/Android/13-Particles/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/13-Particles/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/13-Particles/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/13-Particles/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/14-Sound/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/14-Sound/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/14-Sound/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/14-Sound/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/14-Sound/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/15-Video/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +0,0 @@
-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/15-Video/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/15-Video/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/15-Video/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/15-Video/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/demos/Android/16-Physics/jni/prebuild_v7a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/16-Physics/jni/prebuild_v8a.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/16-Physics/jni/prebuild_x64.sh

@@ -3,7 +3,7 @@ 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/libjpeg_turbo.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/

Zengl_SRC/demos/Android/16-Physics/jni/prebuild_x86.sh

@@ -3,7 +3,7 @@ rm -r ../libs
 # copy libraries
 mkdir ../libs
 mkdir ../libs/x86/
-cp ../../../../bin/Android/x86/libzenjpeg.so ../libs/x86/
+cp ../../../../bin/Android/x86/libjpeg_turbo.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/

Zengl_SRC/headers/android/zengl/android/ZenGL.java

@@ -63,13 +63,6 @@ public class ZenGL extends GLSurfaceView
 	{
 		super( context );
 
-		System.loadLibrary( "zenjpeg" );
-		System.loadLibrary( "openal" );
-		System.loadLibrary( "ogg" );
-		System.loadLibrary( "vorbis" );
-		System.loadLibrary( "theoradec" );
-		System.loadLibrary( "chipmunk" );
-		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;
@@ -273,4 +266,4 @@ public class ZenGL extends GLSurfaceView
 			return true;
 		}
 	}
-}
+}

Zengl_SRC/src/zgl_textures_jpg.pas

@@ -127,7 +127,7 @@ type
     GetMem : function(Size: Integer): PByte; cdecl;
   end;
 
-  procedure jpgturbo_Load(var jpgData: zglTJPGData; out Data: Pointer); cdecl; external {$IFDEF ANDROID} 'jpeg_turbo' {$ENDIF};
+  procedure jpgturbo_Load(var jpgData: zglTJPGData; out Data: Pointer); cdecl; external {$IFDEF ANDROID}{$IFNDEF NOT_OLD_ARM} 'zenjpeg'{$ELSE} 'jpeg_turbo' {$ENDIF}{$ENDIF};
 {$ENDIF}
 
 {$IFDEF USE_OLEPICTURE}