aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2019-01-26 14:07:30 +0100
committerAndre Weissflog <floooh@gmail.com>2019-01-26 14:07:30 +0100
commit490198313a23bf5d9331c8c49799c9522a4c2ee1 (patch)
tree87c84e493176537adebd7d4b8016ec52d2943bc4
parent968f174eda39bf9129c936ededd5c3c1552b4230 (diff)
Android notes in Readme and sokol_app.h doc header
-rw-r--r--README.md11
-rw-r--r--sokol_app.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/README.md b/README.md
index 92ad45ce..db8666ef 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ A minimal cross-platform application-wrapper library:
- single window or canvas for 3D rendering
- 3D context initialization
- event-based keyboard, mouse and touch input
-- supported platforms: Win32, MacOS, Linux (X11), iOS, WASM/asm.js (planned: Android, RaspberryPi)
+- supported platforms: Win32, MacOS, Linux (X11), iOS, WASM/asm.js, Android (planned: RaspberryPi)
- supported 3D-APIs: GL3.3 (GLX/WGL), Metal, D3D11, GLES2/WebGL, GLES3/WebGL2
A simple clear-loop sample using sokol_app.h and sokol_gfx.h (does not include
@@ -393,10 +393,6 @@ Mainly some "missing features" for desktop apps:
- show/hide mouse cursor
- allow to change mouse cursor image (at first only switch between system-provided standard images)
-Big stuff:
-
-- Android support (currently WIP)
-
## sokol_audio.h planned features:
- implement an alternative WebAudio backend using Audio Worklets and WASM threads
@@ -411,6 +407,11 @@ Big stuff:
# Updates
+- **26-Jan-2019**: sokol_app.h now has an Android backend contributed by
+ [Gustav Olsson](https://github.com/gustavolsson)!
+ See the [sokol-samples readme](https://github.com/floooh/sokol-samples/blob/master/README.md)
+ for build instructions.
+
- **21-Jan-2019**: sokol_gfx.h - pool-slot-generation-counters and a dummy backend:
- Resource pool slots now have a generation-counter for the resource-id
unique-tag, instead of a single counter for the whole pool. This allows
diff --git a/sokol_app.h b/sokol_app.h
index 1d1d251e..c5dd9ae2 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -66,7 +66,7 @@
- creates a window and 3D-API context/device with a 'default framebuffer'
- makes the rendered frame visible
- provides keyboard-, mouse- and low-level touch-events
- - platforms: MacOS, iOS, HTML5, Win32, Linux (planned: Android, RaspberryPi)
+ - platforms: MacOS, iOS, HTML5, Win32, Linux, Android (RaspberryPi)
- 3D-APIs: Metal, D3D11, GL3.2, GLES2, GLES3, WebGL, WebGL2
FEATURE/PLATFORM MATRIX