erkkah · erkkah · Nov 8, 2025 · Nov 8, 2025 · Nov 8, 2025 · Nov 8, 2025
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,13 +6,18 @@
     "configurations": [
         {
             "type": "lldb",
-            "request": "custom",
+            "request": "launch",
             "name": "Debug",
+            "initCommands": [
+                "platform select remote-android",
+            ],
             "targetCreateCommands": [
                 "target create ${workspaceFolder}/.debug/exe",
             ],
             "processCreateCommands": [
                 "gdb-remote 6666",
+                "process handle SIGSEGV -s false -n false",
+                "continue"
             ],
             "preLaunchTask": "timogr: debug",
             "postDebugTask": "timogr: stop",

diff --git a/README.md b/README.md
@@ -11,6 +11,10 @@ TIMOGR takes care of the Android life-cycle stuff and lets you write the fun par
 Oh, and you don't need Android Studio - it works just fine with the plain Android SDK + NDK,
 and you can build, run and debug from [within VS Code](#debugging-in-vs-code).
 
+## Demo app
+
+The template app in this repo is available on [Google Play :arrow_forward:](https://play.google.com/store/apps/details?id=timogr.app).
+
 ## Getting started
 
 * [Generate](https://github.com/erkkah/timogr/generate) your own repo based on this template
@@ -19,7 +23,7 @@ and you can build, run and debug from [within VS Code](#debugging-in-vs-code).
 * If not already in place, install the Android NDK (Use sdkmanager or Android Studio)
 * Make sure `ANDROID_SDK_ROOT` is set, and `JAVA_HOME` if gradle cannot find the correct version below.
 * Copy keystore.properties.example to keystore.properties (and modify it if you want to sign your app)
-* Run a test build: `./gradlew buildCMakeDebug` (that's `gradlew.bat build` on Windows)
+* Run a test build: `./gradlew build` (that's `gradlew.bat build` on Windows)
 * Tweak `app/build/build.gradle` if the test build complains about `compileSdkVersion` or `ndkVersion`
 * Plug in your device (or run an emulator), and run `./gradlew installDebug` to install the template TIMOGR app
 * Run the app (and report back if there are problems)

diff --git a/app/build.gradle b/app/build.gradle
@@ -18,20 +18,20 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'timogr.app'
-    compileSdk 34
+    compileSdk 35
     ndkVersion '27.0.11902837'
 
     defaultConfig {
         applicationId 'timogr.app'
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_STL=c++_shared'
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
             }
         }
-        versionCode 2
-        versionName '1.0.1'
+        versionCode 7
+        versionName '1.0.3'
     }
     signingConfigs {
         release {
@@ -69,7 +69,6 @@ android {
     }
     externalNativeBuild {
         cmake {
-            // version '3.10.2'
             path 'src/main/cpp/CMakeLists.txt'
         }
     }

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.5.0"
+        classpath 'com.android.tools.build:gradle:8.10.1'
     }
 }
 

diff --git a/dbgtool/sdk.go b/dbgtool/sdk.go
@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
 	"strings"
@@ -84,7 +84,7 @@ func (m *AndroidManifest) mainActivityIntent() string {
 }
 
 func parseManifest(manifest string) (*AndroidManifest, error) {
-	bytes, err := ioutil.ReadFile(manifest)
+	bytes, err := os.ReadFile(manifest)
 	if err != nil {
 		return nil, err
 	}

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/tigr/.github/workflows/build.yml b/tigr/.github/workflows/build.yml
@@ -11,8 +11,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [macos-11, ubuntu-latest, windows-latest]
-        #os: [ubuntu-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
     - name: Check out code
       uses: actions/checkout@v1

diff --git a/tigr/ci/Makefile b/tigr/ci/Makefile
@@ -12,4 +12,4 @@ else
 endif
 
 ci : ci.c ../tigr.c
-	gcc $^ -o $@$(EXT) $(CFLAGS) $(LDFLAGS)
+	gcc -Wall -pedantic $^ -o $@$(EXT) $(CFLAGS) $(LDFLAGS)
diff --git a/tigr/src/tigr_amalgamated.c b/tigr/src/tigr_amalgamated.c
@@ -1,20 +1,20 @@
-
-#include "tigr.h"
-
-#include "tigr_internal.h"
-#include "tigr_upscale_gl_vs.h"
-#include "tigr_upscale_gl_fs.h"
-
-#include "tigr_bitmaps.c"
-#include "tigr_loadpng.c"
-#include "tigr_savepng.c"
-#include "tigr_inflate.c"
-#include "tigr_print.c"
-#include "tigr_win.c"
-#include "tigr_osx.c"
-#include "tigr_ios.c"
-#include "tigr_android.h"
-#include "tigr_linux.c"
-#include "tigr_android.c"
-#include "tigr_gl.c"
+
+#include "tigr.h"
+
+#include "tigr_internal.h"
+#include "tigr_upscale_gl_vs.h"
+#include "tigr_upscale_gl_fs.h"
+
+#include "tigr_bitmaps.c"
+#include "tigr_loadpng.c"
+#include "tigr_savepng.c"
+#include "tigr_inflate.c"
+#include "tigr_print.c"
+#include "tigr_win.c"
+#include "tigr_osx.c"
+#include "tigr_ios.c"
+#include "tigr_android.h"
+#include "tigr_linux.c"
+#include "tigr_android.c"
+#include "tigr_gl.c"
 #include "tigr_utils.c"
diff --git a/tigr/src/tigr_amalgamated_one_header.h b/tigr/src/tigr_amalgamated_one_header.h
@@ -1,18 +1,18 @@
-/*
-Like most of stb libraries, this include needs to be included in one
-compilation unit with TIGR_IMPLEMENTATION defined.
-*/
-
-#include "../tigr.h"
-
-#ifdef TIGR_IMPLEMENTATION
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "tigr_amalgamated.c"
-
-#ifdef __cplusplus
-}
-#endif
+/*
+Like most of stb libraries, this include needs to be included in one
+compilation unit with TIGR_IMPLEMENTATION defined.
+*/
+
+#include "../tigr.h"
+
+#ifdef TIGR_IMPLEMENTATION
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tigr_amalgamated.c"
+
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/tigr/src/tigr_android.c b/tigr/src/tigr_android.c
@@ -745,6 +745,15 @@ int tigrTouch(Tigr* bmp, TigrTouchPoint* points, int maxPoints) {
     return maxPoints < win->numTouchPoints ? maxPoints : win->numTouchPoints;
 }
 
+void tigrMouseWheel(Tigr* bmp, float* x, float* y) {
+    if (x) {
+        *x = 0;
+    }
+    if (y) {
+        *y = 0;
+    }
+}
+
 void* tigrReadFile(const char* fileName, int* length) {
     if (length != 0) {
         *length = 0;