Browse Source

- [Android]added libGLU.so, now triangulation should work

git-svn-id: http://zengl.googlecode.com/svn/branches/0.3.x@1985 6573c10b-8653-0410-9706-d32479e959fb
dr.andru 12 years ago
parent
commit
3bfc408aae
58 changed files with 74 additions and 26 deletions
  1. BIN
      bin/Android/armv5/libGLU.so
  2. BIN
      bin/Android/armv6/libGLU.so
  3. 2 1
      demos/Android/01 - Initialization/jni/linux_prebuild.sh
  4. 2 1
      demos/Android/01 - Initialization/jni/windows_prebuild.bat
  5. 1 0
      demos/Android/01 - Initialization/src/zengl/android/ZenGL.java
  6. 1 0
      demos/Android/02 - Resources/jni/linux_prebuild.sh
  7. 1 0
      demos/Android/02 - Resources/jni/windows_prebuild.bat
  8. 1 0
      demos/Android/02 - Resources/src/zengl/android/ZenGL.java
  9. 1 0
      demos/Android/03 - Input/jni/linux_prebuild.sh
  10. 1 0
      demos/Android/03 - Input/jni/windows_prebuild.bat
  11. 1 0
      demos/Android/03 - Input/src/zengl/android/ZenGL.java
  12. 1 0
      demos/Android/04 - Screen Settings/jni/linux_prebuild.sh
  13. 1 0
      demos/Android/04 - Screen Settings/jni/windows_prebuild.bat
  14. 1 0
      demos/Android/04 - Screen Settings/src/zengl/android/ZenGL.java
  15. 2 1
      demos/Android/05 - Primitives/jni/linux_prebuild.sh
  16. 2 1
      demos/Android/05 - Primitives/jni/windows_prebuild.bat
  17. 1 0
      demos/Android/05 - Primitives/src/zengl/android/ZenGL.java
  18. 1 0
      demos/Android/06 - Text/jni/linux_prebuild.sh
  19. 1 0
      demos/Android/06 - Text/jni/windows_prebuild.bat
  20. 1 0
      demos/Android/06 - Text/src/zengl/android/ZenGL.java
  21. 1 0
      demos/Android/07 - Sprites/jni/linux_prebuild.sh
  22. 1 0
      demos/Android/07 - Sprites/jni/windows_prebuild.bat
  23. 1 0
      demos/Android/07 - Sprites/src/zengl/android/ZenGL.java
  24. 1 0
      demos/Android/08 - Sprite Engine/jni/linux_prebuild.sh
  25. 1 0
      demos/Android/08 - Sprite Engine/jni/windows_prebuild.bat
  26. 1 0
      demos/Android/08 - Sprite Engine/src/zengl/android/ZenGL.java
  27. 1 0
      demos/Android/09 - Sprite Engine(Classes)/jni/linux_prebuild.sh
  28. 1 0
      demos/Android/09 - Sprite Engine(Classes)/jni/windows_prebuild.bat
  29. 1 0
      demos/Android/09 - Sprite Engine(Classes)/src/zengl/android/ZenGL.java
  30. 1 0
      demos/Android/10 - Tiles/jni/linux_prebuild.sh
  31. 1 0
      demos/Android/10 - Tiles/jni/windows_prebuild.bat
  32. 1 0
      demos/Android/10 - Tiles/src/zengl/android/ZenGL.java
  33. 1 0
      demos/Android/11 - Grid/jni/linux_prebuild.sh
  34. 1 0
      demos/Android/11 - Grid/jni/windows_prebuild.bat
  35. 1 0
      demos/Android/11 - Grid/src/zengl/android/ZenGL.java
  36. 1 0
      demos/Android/12 - Render into Texture/jni/linux_prebuild.sh
  37. 1 0
      demos/Android/12 - Render into Texture/jni/windows_prebuild.bat
  38. 1 0
      demos/Android/12 - Render into Texture/src/zengl/android/ZenGL.java
  39. 1 0
      demos/Android/13 - Particles/jni/linux_prebuild.sh
  40. 1 0
      demos/Android/13 - Particles/jni/windows_prebuild.bat
  41. 1 0
      demos/Android/13 - Particles/src/zengl/android/ZenGL.java
  42. 1 0
      demos/Android/14 - Sound/jni/linux_prebuild.sh
  43. 1 0
      demos/Android/14 - Sound/jni/windows_prebuild.bat
  44. 1 0
      demos/Android/14 - Sound/src/zengl/android/ZenGL.java
  45. 1 0
      demos/Android/15 - Video/jni/linux_prebuild.sh
  46. 1 0
      demos/Android/15 - Video/jni/windows_prebuild.bat
  47. 1 0
      demos/Android/15 - Video/src/zengl/android/ZenGL.java
  48. 1 0
      demos/Android/16 - Physics/jni/linux_prebuild.sh
  49. 1 0
      demos/Android/16 - Physics/jni/windows_prebuild.bat
  50. 1 0
      demos/Android/16 - Physics/src/zengl/android/ZenGL.java
  51. 1 0
      headers/android/zengl/android/ZenGL.java
  52. 2 2
      headers/zglHeader.h
  53. 2 2
      headers/zglHeader.pas
  54. 2 2
      src/Lazarus/ZenGL-win.lpi
  55. BIN
      src/ZenGL.res
  56. 0 3
      src/zgl_config.cfg
  57. 3 3
      src/zgl_main.pas
  58. 12 10
      src/zgl_opengles_all.pas

BIN
bin/Android/armv5/libGLU.so


BIN
bin/Android/armv6/libGLU.so


+ 2 - 1
demos/Android/01 - Initialization/jni/linux_prebuild.sh

@@ -4,4 +4,5 @@ cp ../../../../bin/Android/armv6/libopenal.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
-cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/

+ 2 - 1
demos/Android/01 - Initialization/jni/windows_prebuild.bat

@@ -3,4 +3,5 @@ copy ..\..\..\..\bin\Android\armv6\libopenal.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
-copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\

+ 1 - 0
demos/Android/01 - Initialization/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/02 - Resources/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/zengl.png ../assets

+ 1 - 0
demos/Android/02 - Resources/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets
 copy ..\..\..\..\bin\data\zengl.png ..\assets

+ 1 - 0
demos/Android/02 - Resources/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/03 - Input/jni/linux_prebuild.sh

@@ -5,5 +5,6 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/03 - Input/jni/windows_prebuild.bat

@@ -4,5 +4,6 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/03 - Input/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/04 - Screen Settings/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/back03.jpg ../assets

+ 1 - 0
demos/Android/04 - Screen Settings/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets
 copy ..\..\..\..\bin\data\back03.jpg ..\assets

+ 1 - 0
demos/Android/04 - Screen Settings/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 2 - 1
demos/Android/05 - Primitives/jni/linux_prebuild.sh

@@ -4,4 +4,5 @@ cp ../../../../bin/Android/armv6/libopenal.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
-cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/

+ 2 - 1
demos/Android/05 - Primitives/jni/windows_prebuild.bat

@@ -3,4 +3,5 @@ copy ..\..\..\..\bin\Android\armv6\libopenal.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
-copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\

+ 1 - 0
demos/Android/05 - Primitives/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/06 - Text/jni/linux_prebuild.sh

@@ -5,5 +5,6 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/06 - Text/jni/windows_prebuild.bat

@@ -4,5 +4,6 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/06 - Text/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/07 - Sprites/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/zengl.png ../assets
 cp ../../../../bin/data/back01.jpg ../assets

+ 1 - 0
demos/Android/07 - Sprites/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\zengl.png ..\assets
 copy ..\..\..\..\bin\data\back01.jpg ..\assets

+ 1 - 0
demos/Android/07 - Sprites/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/08 - Sprite Engine/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/zengl.png ../assets
 cp ../../../../bin/data/miku.png ../assets

+ 1 - 0
demos/Android/08 - Sprite Engine/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\zengl.png ..\assets
 copy ..\..\..\..\bin\data\miku.png ..\assets

+ 1 - 0
demos/Android/08 - Sprite Engine/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/09 - Sprite Engine(Classes)/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/zengl.png ../assets
 cp ../../../../bin/data/miku.png ../assets

+ 1 - 0
demos/Android/09 - Sprite Engine(Classes)/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\zengl.png ..\assets
 copy ..\..\..\..\bin\data\miku.png ..\assets

+ 1 - 0
demos/Android/09 - Sprite Engine(Classes)/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/10 - Tiles/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/ground.map ../assets
 cp ../../../../bin/data/tiles.png ../assets

+ 1 - 0
demos/Android/10 - Tiles/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\ground.map ..\assets
 copy ..\..\..\..\bin\data\tiles.png ..\assets

+ 1 - 0
demos/Android/10 - Tiles/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/11 - Grid/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/back04.jpg ../assets
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/11 - Grid/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\back04.jpg ..\assets
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/11 - Grid/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/12 - Render into Texture/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/tux_stand.png ../assets
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/12 - Render into Texture/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\tux_stand.png ..\assets
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/12 - Render into Texture/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/13 - Particles/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/back02.png ../assets
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/13 - Particles/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\back02.png ..\assets
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/13 - Particles/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/14 - Sound/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/click.wav ../assets
 cp ../../../../bin/data/music.ogg ../assets

+ 1 - 0
demos/Android/14 - Sound/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\click.wav ..\assets
 copy ..\..\..\..\bin\data\music.ogg ..\assets

+ 1 - 0
demos/Android/14 - Sound/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/15 - Video/jni/linux_prebuild.sh

@@ -5,6 +5,7 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets
 cp ../../../../bin/data/video.ogv ../assets

+ 1 - 0
demos/Android/15 - Video/jni/windows_prebuild.bat

@@ -4,6 +4,7 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets
 copy ..\..\..\..\bin\data\video.ogv ..\assets

+ 1 - 0
demos/Android/15 - Video/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
demos/Android/16 - Physics/jni/linux_prebuild.sh

@@ -5,5 +5,6 @@ cp ../../../../bin/Android/armv6/libogg.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libvorbis.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libtheoradec.so ../libs/armeabi/
 cp ../../../../bin/Android/armv6/libchipmunk.so ../libs/armeabi/
+cp ../../../../bin/Android/armv6/libGLU.so ../libs/armeabi/
 # copy resources
 cp ../../../../bin/data/font* ../assets

+ 1 - 0
demos/Android/16 - Physics/jni/windows_prebuild.bat

@@ -4,5 +4,6 @@ copy ..\..\..\..\bin\Android\armv6\libogg.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libvorbis.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libtheoradec.so ..\libs\armeabi\
 copy ..\..\..\..\bin\Android\armv6\libchipmunk.so ..\libs\armeabi\
+copy ..\..\..\..\bin\Android\armv6\libGLU.so ..\libs\armeabi\
 
 copy ..\..\..\..\bin\data\font* ..\assets

+ 1 - 0
demos/Android/16 - Physics/src/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 1 - 0
headers/android/zengl/android/ZenGL.java

@@ -69,6 +69,7 @@ public class ZenGL extends GLSurfaceView
 		System.loadLibrary( "vorbis" );
 		System.loadLibrary( "theoradec" );
 		System.loadLibrary( "chipmunk" );
+		System.loadLibrary( "GLU" );
 		System.loadLibrary( appName );
 
 		SourceDir = appSourceDir;

+ 2 - 2
headers/zglHeader.h

@@ -2,8 +2,8 @@
 /*-----------= ZenGL =------------*/
 /*--------------------------------*/
 /*                                */
-/* version:  0.3.8                */
-/* date:     2013.02.13           */
+/* version:  0.3.9                */
+/* date:     2013.03.05           */
 /* license:  zlib                 */
 /* homepage: http://zengl.org     */
 /*                                */

+ 2 - 2
headers/zglHeader.pas

@@ -2,8 +2,8 @@
 {-----------= ZenGL =------------}
 {--------------------------------}
 {                                }
-{ version:  0.3.8                }
-{ date:     2013.02.13           }
+{ version:  0.3.9                }
+{ date:     2013.03.05           }
 { license:  zlib                 }
 { homepage: http://zengl.org     }
 {                                }

+ 2 - 2
src/Lazarus/ZenGL-win.lpi

@@ -16,9 +16,9 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MinorVersionNr Value="3"/>
-      <RevisionNr Value="8"/>
+      <RevisionNr Value="9"/>
       <CharSet Value="04B0"/>
-      <StringTable CompanyName="Kemka Andrey aka Andru" FileDescription="Cross-platform game development library" InternalName="ZenGL" LegalCopyright="Kemka Andrey aka Andru" OriginalFilename="ZenGL" ProductName="ZenGL" ProductVersion="0.3.8"/>
+      <StringTable CompanyName="Kemka Andrey aka Andru" FileDescription="Cross-platform game development library" InternalName="ZenGL" LegalCopyright="Kemka Andrey aka Andru" OriginalFilename="ZenGL" ProductName="ZenGL" ProductVersion="0.3.9"/>
     </VersionInfo>
     <BuildModes Count="4">
       <Item1 Name="Release" Default="True"/>

BIN
src/ZenGL.res


+ 0 - 3
src/zgl_config.cfg

@@ -126,9 +126,6 @@
   {$UNDEF USE_OGG_STATIC}
   {$UNDEF USE_THEORA_STATIC}
 {$ENDIF}
-{$IFDEF ANDROID}
-  {$UNDEF USE_TRIANGULATION}
-{$ENDIF}
 {$IFDEF WINMOBILE}
   {$UNDEF USE_ZIP}
   {$UNDEF USE_JPG}

+ 3 - 3
src/zgl_main.pas

@@ -48,11 +48,11 @@ uses
   zgl_types;
 
 const
-  cs_ZenGL    = 'ZenGL 0.3.8';
-  cs_Date     = '2013.02.13';
+  cs_ZenGL    = 'ZenGL 0.3.9';
+  cs_Date     = '2013.03.05';
   cv_major    = 0;
   cv_minor    = 3;
-  cv_revision = 8;
+  cv_revision = 9;
 
   // zgl_Reg
   SYS_APP_INIT           = $000001;

+ 12 - 10
src/zgl_opengles_all.pas

@@ -29,7 +29,9 @@ unit zgl_opengles_all;
 {$ENDIF}
 
 {$IFDEF USE_TRIANGULATION}
-  {$LINKLIB libGLU.a}
+  {$IFNDEF ANDROID}
+    {$LINKLIB libGLU.a}
+  {$ENDIF}
 {$ENDIF}
 
 interface
@@ -435,15 +437,15 @@ var
 
 // Triangulation
   {$IFDEF USE_TRIANGULATION}
-  procedure gluDeleteTess(tess: Integer); stdcall external;
-  function  gluErrorString(error: Integer): PChar; stdcall external;
-  function  gluNewTess: Integer; stdcall external;
-  procedure gluTessBeginContour(tess: Integer); stdcall external;
-  procedure gluTessBeginPolygon(tess: Integer; data: Pointer); stdcall external;
-  procedure gluTessCallback(tess: Integer; which: Integer; fn: Pointer); stdcall external;
-  procedure gluTessEndContour(tess: Integer); stdcall external;
-  procedure gluTessEndPolygon(tess: Integer); stdcall external;
-  procedure gluTessVertex(tess: Integer; vertex: PDouble; data: Pointer); stdcall external;
+  procedure gluDeleteTess(tess: Integer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  function  gluErrorString(error: Integer): PChar; stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  function  gluNewTess: Integer; stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessBeginContour(tess: Integer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessBeginPolygon(tess: Integer; data: Pointer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessCallback(tess: Integer; which: Integer; fn: Pointer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessEndContour(tess: Integer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessEndPolygon(tess: Integer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
+  procedure gluTessVertex(tess: Integer; vertex: PDouble; data: Pointer); stdcall external {$IFDEF ANDROID} 'libGLU' {$ENDIF};
   {$ENDIF}
 
 // EGL