Merge branch 'main' into sdl3

Author: jhasse

.clang-format

@@ -1,7 +1,9 @@
 BasedOnStyle: LLVM
+
+AccessModifierOffset: -4
+AlignTrailingComments: false
 IndentWidth: 4
 TabWidth: 4
-AccessModifierOffset: -4
 UseTab: ForIndentation
 AllowShortIfStatementsOnASingleLine: true
 ColumnLimit: 100

.clang-tidy

@@ -47,6 +47,7 @@ Checks: '
        ,-hicpp-uppercase-literal-suffix,
        ,-hicpp-vararg,
        ,-llvm-header-guard,
+       ,-llvm-prefer-static-over-anonymous-namespace,
        ,-llvm-qualified-auto,
        ,-llvmlibc-callee-namespace,
        ,-llvmlibc-implementation-in-namespace,
@@ -71,12 +72,32 @@ Checks: '
        ,-readability-use-anyofallof,
        ,-readability-use-std-min-max,
 '
-WarningsAsErrors: 'hicpp-use-override,modernize-avoid-bind,llvm-namespace-comment,modernize-use-nullptr,modernize-pass-by-value,hicpp-noexcept-move,boost-use-to-string,google-readability-namespace-comments,modernize-use-default-member-init,modernize-loop-convert,hicpp-use-nullptr,google-readability-braces-around-statements,cert-dcl03-c,readability-else-after-return,bugprone-macro-parentheses,readability-redundant-declaration,google-explicit-constructor,readability-avoid-const-params-in-decls,readability-redundant-casting,performance-move-const-arg'
+WarningsAsErrors: '
+  hicpp-use-override,
+  modernize-avoid-bind,
+  llvm-namespace-comment,
+  modernize-use-nullptr,
+  modernize-pass-by-value,
+  hicpp-noexcept-move,
+  boost-use-to-string,
+  google-readability-namespace-comments,
+  modernize-use-default-member-init,
+  modernize-loop-convert,
+  hicpp-use-nullptr,
+  google-readability-braces-around-statements,
+  cert-dcl03-c,
+  readability-else-after-return,
+  bugprone-macro-parentheses,
+  readability-redundant-declaration,
+  google-explicit-constructor,
+  readability-avoid-const-params-in-decls,
+  readability-redundant-casting,
+  performance-move-const-arg,
+  readability-implicit-bool-conversion,
+'
 CheckOptions:
       - key:             readability-implicit-bool-conversion.AllowPointerConditions
         value:           '1'
-      - key:             readability-implicit-bool-conversion.AllowIntegerConditions
-        value:           '1'
       - key:             bugprone-narrowing-conversions.WarnOnFloatingPointNarrowingConversion
         value:           '0'
       - key:             cppcoreguidelines-narrowing-conversions.WarnOnFloatingPointNarrowingConversion

.github/workflows/android.yml

@@ -17,6 +17,6 @@ jobs:
         path: .cache/cpm
         key: cpm
     - name: Build
-      run: make -C android
+      run: cd android/test && ./gradlew build
 env:
   CPM_SOURCE_CACHE: ${{ github.workspace }}/.cache/cpm

.github/workflows/macos.yml

@@ -12,10 +12,3 @@ jobs:
       run: |
         cmake -Bbuild-cmake -GNinja
         ninja -Cbuild-cmake
-    # - uses: actions/setup-java@v4
-    #   with:
-    #     java-version: '17'
-    #     distribution: 'zulu'
-    # - name: Android
-    #   run: |
-    #     make -Candroid

.github/workflows/windows.yml

@@ -49,12 +49,6 @@ jobs:
     - name: Unittest (Release)
       # tests like CharacterTest need OpenGL 2.0 and can't run on GitHub Actions runners
       run: just unittest-headless Release
-    - name: Configure (UWP)
-      run: cmake -Bbuild-uwp -DCMAKE_SYSTEM_NAME=WindowsStore '-DCMAKE_SYSTEM_VERSION=10.0' '-DCMAKE_POLICY_VERSION_MINIMUM=3.5'
-    - name: Build (UWP, Debug)
-      run: cmake --build build-uwp --config Debug
-    - name: Build (UWP, Release)
-      run: cmake --build build-uwp --config Release
 
   mingw:
     runs-on: [ubuntu-latest]

.gitignore

@@ -11,6 +11,7 @@ Thumbs.db
 /nintendo
 /.clangd/
 /.cache/
+/.claude/
 
 # Visual Studio
 /out/

.gitlab-ci.yml

@@ -9,7 +9,7 @@ cache:
 linux:
   parallel:
     matrix:
-      - VERSION: ['40', '41', 'latest']
+      - VERSION: ['41', '43', 'latest']
   image: fedora:$VERSION
   rules:
   - if: '$VERSION == "latest"'
@@ -22,9 +22,9 @@ linux:
   - .github/ci.py
   - cmake -Bbuild -G"Ninja Multi-Config" -DCMAKE_COMPILE_WARNING_AS_ERROR=1
   - cd build
-  - ninja
-  - ninja -f build-Release.ninja
-  - dnf install -y mesa-dri-drivers xorg-x11-drivers >/dev/null
+  - ninja --quiet
+  - ninja -f build-Release.ninja --quiet
+  - dnf install -y --allowerasing mesa-dri-drivers xorg-x11-drivers
   - Xorg -config ../data/xorg.conf &>/dev/null &
   - sleep 1 # wait for Xorg to boot up
   - export DISPLAY=:0
@@ -35,17 +35,17 @@ linux:
   - cd ..
   - CC=clang CXX=clang++ CXXFLAGS=-fdiagnostics-color cmake -Bbuild-clang -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DJNGL_CLANG_TIDY=1
   - cd build-clang
-  - ninja
+  - ninja --quiet
   - cd ..
   - dnf install -y libavformat-free-devel libswscale-free-devel
   - cmake -Bbuild-record -G"Ninja Multi-Config" -DCMAKE_COMPILE_WARNING_AS_ERROR=1 -DJNGL_RECORD=1
   - cd build-record
-  - ninja
+  - ninja --quiet
 
 mingw:
   parallel:
     matrix:
-      - VERSION: ['40', '41', 'latest']
+      - VERSION: ['41', '42', 'latest']
   image: fedora:$VERSION
   rules:
   - if: '$VERSION == "latest"'
@@ -69,7 +69,8 @@ android:
   image: registry.gitlab.com/jhasse/android-ndk-docker:r28b
   stage: build
   script:
-    - make -C android
+    - cd android/test
+    - ./gradlew build
 
 steamos:
   image: registry.gitlab.steamos.cloud/steamrt/sniper/sdk

.vscode/tasks.json

@@ -99,6 +99,7 @@
 	],
 	"presentation": {
 		"echo": false,
+		"focus": true,
 		"clear": true
 	}
 }

CMakeLists.txt

@@ -4,6 +4,7 @@ project(jngl LANGUAGES C CXX)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # required for ogg, see https://github.com/jhasse/jngl/issues/107
 
 if(MSVC)
+	string(APPEND CMAKE_C_FLAGS " /Zc:__cplusplus /wd4244 /wd4305 /wd4267")
 	string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /wd4244 /wd4305 /wd4267")
 else()
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
@@ -27,6 +28,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 file(GLOB SRC src/*.cpp src/jngl/*.cpp
 	src/audio/*.cpp
 	src/audio/effect/*.cpp
+	src/timing/*.cpp
 )
 add_library(jngl ${SRC}
 	src/jngl/record/VideoRecorder.cpp
@@ -75,6 +77,7 @@ target_include_directories(jngl PUBLIC include/public)
 option(JNGL_VIDEO "Enable Theora video playback" ON)
 option(JNGL_RECORD "Enable video recording using FFmpeg" OFF)
 option(JNGL_STEAMWORKS "Enable Steamsworks SDK support for achievements" OFF)
+option(JNGL_TRACE "Enable tracing for debugging purposes" OFF)
 
 set(JNGL_BUILD_WEBP_FROM_SOURCE_DEFAULT OFF)
 if(MSVC OR IOS OR ANDROID OR EMSCRIPTEN)
@@ -94,7 +97,7 @@ if (ANDROID)
 	find_package(oboe REQUIRED CONFIG)
 	target_link_libraries(jngl PRIVATE oboe::oboe)
 	file(GLOB ANDROID_SOURCES src/android/*.cpp)
-	target_sources(jngl PRIVATE ${ANDROID_SOURCES} src/audio/android/engine.cpp)
+	target_sources(jngl PRIVATE ${ANDROID_SOURCES} src/audio/android/engine.cpp src/font/simple.cpp)
 elseif(IOS)
 	file(GLOB SRC src/ios/*.cpp src/ios/*.mm src/audio/ios/Engine.mm src/ios/*.h)
 	target_sources(jngl PRIVATE ${SRC} src/mac/message.cpp)
@@ -115,25 +118,18 @@ elseif (UNIX)
 		file(GLOB SRC src/linux/*.cpp src/linux/*.c)
 		target_sources(jngl PRIVATE ${SRC})
 		target_link_libraries(jngl PRIVATE atomic)
+		option(JNGL_FONTCONFIG "Enable fontconfig for font discovery" ON)
+		if(JNGL_FONTCONFIG)
+			find_package(Fontconfig REQUIRED)
+			target_link_libraries(jngl PRIVATE Fontconfig::Fontconfig)
+			target_sources(jngl PRIVATE src/linux/fontconfig/fontconfig.cpp)
+		else()
+			target_sources(jngl PRIVATE src/font/simple.cpp)
+		endif()
     endif()
 
 	target_link_libraries(jngl PRIVATE $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs>)
 else() # Windows
-	if(WINDOWS_STORE)
-		FetchContent_Declare(
-			angle
-			GIT_REPOSITORY https://github.com/jhasse/angle.git
-			GIT_TAG        cmake
-		)
-		if(NOT angle_POPULATED)
-			FetchContent_Populate(angle)
-
-			set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
-			set(BUILD_SHARED_LIBS ON CACHE INTERNAL "")
-			add_subdirectory(${angle_SOURCE_DIR} ${angle_BINARY_DIR})
-			set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE BOOL "" FORCE)
-		endif()
-	endif()
 	option(JNGL_WINAPI "Use WinAPI instead of SDL" OFF)
 
 	target_compile_definitions(jngl PRIVATE _WIN32_WINNT=0x602 _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS UNICODE)
@@ -142,21 +138,13 @@ else() # Windows
 		target_link_libraries(jngl PRIVATE opengl32)
 	else()
 		file(GLOB SRC src/sdl/*.cpp)
-		if(WINDOWS_STORE)
-			target_sources(jngl PRIVATE src/xinput/XinputController.cpp)
-		else()
-			target_sources(jngl PRIVATE src/sdl/controller/SdlController.cpp)
-		endif()
+		target_sources(jngl PRIVATE src/sdl/controller/SdlController.cpp)
 		target_sources(jngl PRIVATE src/win32/fontfile.cpp src/win32/message.cpp src/win32/other.cpp
 		                            src/win32/unicode.cpp)
 	endif()
 	target_sources(jngl PRIVATE ${SRC})
 	target_link_libraries(jngl PUBLIC winmm)
-	if(WINDOWS_STORE)
-		target_link_libraries(jngl PUBLIC libEGL libGLESv2)
-	else()
-		target_sources(jngl PRIVATE glad/src/wgl.c)
-	endif()
+	target_sources(jngl PRIVATE glad/src/wgl.c)
 	if(MSVC)
 		string(APPEND CMAKE_C_FLAGS " /D_CRT_SECURE_NO_WARNINGS")
 		string(APPEND CMAKE_CXX_FLAGS " /D_CRT_SECURE_NO_WARNINGS /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING")
@@ -166,14 +154,6 @@ else() # Windows
 	endif()
 endif()
 
-# fontconfig
-if (UNIX AND NOT EMSCRIPTEN)
-	if(NOT APPLE AND NOT ANDROID)
-        find_package(Fontconfig REQUIRED)
-		target_link_libraries(jngl PRIVATE Fontconfig::Fontconfig)
-    endif()
-endif()
-
 include(cmake/CPM.cmake)
 if(ANDROID OR MSVC OR IOS)
 	CPMAddPackage(NAME libogg
@@ -276,20 +256,13 @@ else()
 				URL https://www.libsdl.org/release/SDL3-3.1.6.zip
 				URL_HASH SHA1=b16ad311975378dcc87b11fc02c84eaa1f028b38
 				OPTIONS
-					"SDL_SENSOR OFF" # doesn't work with UWP
-					"SDL_SHARED OFF"
-					"SDL_STATIC ON"
+					"SDL_SENSOR OFF"
 			)
 		endif()
 		target_link_libraries(jngl PRIVATE SDL3-static)
 	endif()
 	if(MSVC)
 		target_compile_definitions(jngl PUBLIC _USE_MATH_DEFINES)
-		if(WINDOWS_STORE)
-			target_compile_definitions(jngl PUBLIC JNGL_UWP)
-			target_include_directories(jngl PUBLIC ${SDL_SOURCE_DIR}/include ${SDL_BINARY_DIR}/include) # TODO: This should be PRIVATE
-			target_link_options(jngl PUBLIC $<IF:$<CONFIG:Debug>,/defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib,/defaultlib:vccorlib.lib /defaultlib:msvcrt.lib>)
-		endif()
 	elseif(IOS)
 		target_compile_definitions(jngl PRIVATE IOS)
 		target_compile_definitions(jngl PUBLIC GLES_SILENCE_DEPRECATION)
@@ -315,7 +288,10 @@ else()
 			set_source_files_properties(data/test.ogg PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 			add_executable(jngl-test src/test/test.cpp src/ios/test/main.mm data/Arial.ttf
 				data/jngl.webp data/test.ogg)
-			set_target_properties(jngl-test PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/data/ios/jngl-test.in.plist")
+			set_target_properties(jngl-test PROPERTIES
+				MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/data/ios/jngl-test.in.plist"
+				XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.bixense.jngl-test")
+			target_link_libraries(jngl-test jngl)
 		endif()
 	else()
 		if(NOT JNGL_BUILD_WEBP_FROM_SOURCE)
@@ -366,6 +342,9 @@ else()
 				target_link_libraries(jngl PRIVATE PkgConfig::FFMPEG)
 				target_compile_definitions(jngl PUBLIC JNGL_RECORD)
 			endif()
+			if(JNGL_TRACE)
+				target_compile_definitions(jngl PUBLIC JNGL_TRACE)
+			endif()
 			if(NOT EMSCRIPTEN)
 				pkg_check_modules(VorbisFile REQUIRED vorbisfile)
 				pkg_check_modules(FREETYPE REQUIRED freetype2)
@@ -387,46 +366,29 @@ else()
 		target_sources(jngl PRIVATE glad/src/gl.c)
 	endif()
 
-	if(NOT hasParent)
-		if(WINDOWS_STORE)
-			# WIN32 is needed to build for the Windows subsystem, not Console
-			add_executable(jngl-test WIN32 src/test/test.cpp src/uwp/SDL_winrt_main_NonXAML.cpp
-				data/Arial.ttf data/jngl.webp data/jngl-icon.webp data/test.ogg)
-			set_source_files_properties(data/Arial.ttf data/jngl.webp data/jngl-icon.webp
-				data/test.ogg
-				PROPERTIES VS_DEPLOYMENT_CONTENT 1)
-
-			# Otherwise linking will fail with
-			#   error LNK2038: mismatch detected for
-			#   'vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker': value '1' doesn't
-			#   match value '0' in msvcrtd.lib(app_appinit.obj)
-			set_source_files_properties(src/uwp/SDL_winrt_main_NonXAML.cpp
-				PROPERTIES COMPILE_FLAGS "/ZW /Zc:twoPhase- /std:c++17")
-		else()
-			if(NOT IOS)
-				add_executable(jngl-test src/test/test.cpp)
-				if(WIN32)
-					target_sources(jngl-test PRIVATE src/win32/jngl.manifest)
-				endif()
-
-				add_executable(example-bike examples/bike/base.cpp examples/bike/bike.cpp
-					examples/bike/line.cpp examples/bike/main.cpp examples/bike/wheel.cpp)
-				target_link_libraries(example-bike jngl)
-				add_executable(example-throw examples/throw/main.cpp)
-				target_link_libraries(example-throw jngl)
-				add_executable(example-shader examples/shader/main.cpp)
-				target_link_libraries(example-shader jngl)
-
-				add_executable(audioplayer examples/audioplayer.cpp)
-				target_link_libraries(audioplayer PRIVATE jngl)
-				add_custom_command(TARGET audioplayer POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/data/test.ogg "$<TARGET_FILE_DIR:audioplayer>")
-				# add_executable(benchmark-shapes src/benchmarks/benchmark-shapes.cpp)
-				# target_link_libraries(benchmark-shapes jngl)
-
-				add_executable(jngl-test-forceQuit src/test/integration/forceQuit.cpp)
-				target_link_libraries(jngl-test-forceQuit PRIVATE jngl)
-			endif()
+	if(NOT hasParent AND NOT IOS)
+		add_executable(jngl-test src/test/test.cpp)
+		set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT jngl-test)
+		if(WIN32)
+			target_sources(jngl-test PRIVATE src/win32/jngl.manifest)
 		endif()
+
+		add_executable(example-bike examples/bike/base.cpp examples/bike/bike.cpp
+			examples/bike/line.cpp examples/bike/main.cpp examples/bike/wheel.cpp)
+		target_link_libraries(example-bike jngl)
+		add_executable(example-throw examples/throw/main.cpp)
+		target_link_libraries(example-throw jngl)
+		add_executable(example-shader examples/shader/main.cpp)
+		target_link_libraries(example-shader jngl)
+
+		add_executable(audioplayer examples/audioplayer.cpp)
+		target_link_libraries(audioplayer PRIVATE jngl)
+		add_custom_command(TARGET audioplayer POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/data/test.ogg "$<TARGET_FILE_DIR:audioplayer>")
+		# add_executable(benchmark-shapes src/benchmarks/benchmark-shapes.cpp)
+		# target_link_libraries(benchmark-shapes jngl)
+
+		add_executable(jngl-test-forceQuit src/test/integration/forceQuit.cpp)
+		target_link_libraries(jngl-test-forceQuit PRIVATE jngl)
 		target_link_libraries(jngl-test jngl)
 	endif()
 endif()
@@ -451,7 +413,7 @@ if(JNGL_BUILD_WEBP_FROM_SOURCE)
 	target_link_libraries(jngl PRIVATE webpdecode webpdspdecode webputilsdecode)
 endif()
 
-if(ANDROID OR IOS OR APPLE OR WINDOWS_STORE)
+if(ANDROID OR IOS OR APPLE)
 	if(JNGL_VIDEO)
 		CPMAddPackage(NAME theora
 			URL http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
@@ -481,7 +443,7 @@ target_include_directories(jngl PRIVATE ${FREETYPE_INCLUDE_DIRS})
 target_link_directories(jngl PUBLIC ${FREETYPE_LIBRARY_DIRS})
 target_link_libraries(jngl PUBLIC ${FREETYPE_LIBRARIES})
 
-if(NOT hasParent AND NOT WINDOWS_STORE)
+if(NOT hasParent)
 	include(CTest)
 	if(BUILD_TESTING)
 		file(GLOB UNITTEST_SRC src/unittest/*.cpp)

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2025 Jan Niklas Hasse
+Copyright (c) 2007-2026 Jan Niklas Hasse
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages