bug fixes
This commit is contained in:
1 parent
cda90a0617
commit
861ca9ad2e
15 files changed
+287
-40
No files matched your search
@@ -26,6 +26,8 @@ node_modules
|
||||
/main
|
||||
!droid/app/src/main
|
||||
droid/app/src/main/assets
|
||||
droid/*.apk
|
||||
droid/*.aab
|
||||
|
||||
.direnv/
|
||||
.node-repl-history
|
||||
|
||||
@@ -9,6 +9,7 @@ CC ?= gcc
|
||||
GRADLE ?= gradle
|
||||
ARCH := $(shell uname -m)
|
||||
ANDROID_KEYSTORE ?= $(HOME)/.android/flint-release.keystore
|
||||
ANDROID_KEY_ALIAS ?= inbe-key
|
||||
|
||||
BUILD_DIR := build
|
||||
BUILD_OBJ_DIR := $(BUILD_DIR)/obj
|
||||
@@ -17,18 +18,38 @@ BUILD_DIST_DIR := $(BUILD_DIR)/dist
|
||||
LINUX_OBJ_DIR := $(BUILD_OBJ_DIR)/linux
|
||||
LINUX_BIN_DIR := $(BUILD_BIN_DIR)/linux
|
||||
LINUX_DIST_DIR := $(BUILD_DIST_DIR)/linux
|
||||
LINUX_APPDIR := $(LINUX_DIST_DIR)/$(APP_NAME).AppDir
|
||||
LINUX_APPIMAGE_BUILD_DIR := $(BUILD_OBJ_DIR)/appimage/linux
|
||||
LINUX_APPDIR := $(LINUX_APPIMAGE_BUILD_DIR)/$(APP_NAME).AppDir
|
||||
LINUX_APPIMAGE_DIR := packaging/linux/appimage
|
||||
LINUX_APPIMAGE_APPRUN := $(LINUX_APPIMAGE_DIR)/AppRun
|
||||
LINUX_APPIMAGE_DESKTOP := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).desktop
|
||||
LINUX_APPIMAGE_ICON := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).png
|
||||
WINDOWS_OBJ_DIR := $(BUILD_OBJ_DIR)/windows
|
||||
WINDOWS_BIN_DIR := $(BUILD_BIN_DIR)/windows
|
||||
WINDOWS_DIST_DIR := $(BUILD_DIST_DIR)/windows
|
||||
ANDROID_BUILD_DIR := $(BUILD_DIR)/android
|
||||
WEB_OBJ_DIR := $(BUILD_OBJ_DIR)/web
|
||||
WEB_DIST_DIR := $(BUILD_DIST_DIR)/web
|
||||
VERSION_FILE := src/core/version.h
|
||||
APP_VERSION := $(shell sed -n 's/^#define INBE_VERSION_STRING "\([^"]*\)".*/\1/p' $(VERSION_FILE) 2>/dev/null)
|
||||
|
||||
RAYLIB_DIR := vendor/raylib/src
|
||||
RAYLIB_BUILD_DIR := $(LINUX_OBJ_DIR)/$(ARCH)/native/raylib
|
||||
RAYLIB_A := $(RAYLIB_BUILD_DIR)/libraylib.a
|
||||
WIN64_ARCH := x86_64
|
||||
WIN64_CC ?= $(or $(WIN_CC),x86_64-w64-mingw32-gcc)
|
||||
WIN64_AR ?= $(or $(WIN_AR),x86_64-w64-mingw32-ar)
|
||||
WIN64_RANLIB ?= $(or $(WIN_RANLIB),x86_64-w64-mingw32-ranlib)
|
||||
WIN64_STRIP ?= $(or $(WIN_STRIP),x86_64-w64-mingw32-strip)
|
||||
WIN32_ARCH := i686
|
||||
WIN32_CC ?= i686-w64-mingw32-gcc
|
||||
WIN32_AR ?= i686-w64-mingw32-ar
|
||||
WIN32_RANLIB ?= i686-w64-mingw32-ranlib
|
||||
WIN32_STRIP ?= i686-w64-mingw32-strip
|
||||
WIN64_RAYLIB_BUILD_DIR := $(WINDOWS_OBJ_DIR)/$(WIN64_ARCH)/raylib
|
||||
WIN64_RAYLIB_A := $(WIN64_RAYLIB_BUILD_DIR)/libraylib.a
|
||||
WIN32_RAYLIB_BUILD_DIR := $(WINDOWS_OBJ_DIR)/$(WIN32_ARCH)/raylib
|
||||
WIN32_RAYLIB_A := $(WIN32_RAYLIB_BUILD_DIR)/libraylib.a
|
||||
WEB_RAYLIB_BUILD_DIR := $(WEB_OBJ_DIR)/raylib
|
||||
WEB_RAYLIB_A := $(WEB_RAYLIB_BUILD_DIR)/libraylib.web.a
|
||||
RAYLIB_SOURCES := $(wildcard $(RAYLIB_DIR)/*.c) $(wildcard $(RAYLIB_DIR)/*.h)
|
||||
@@ -38,6 +59,7 @@ FLINT_ICON_FILES := $(wildcard $(FLINT_DIR)/icons/*.png)
|
||||
FLINT_ICON_ASSETS_C := $(FLINT_DIR)/src/flint_icon_assets.c
|
||||
FLINT_SRCS := $(filter-out $(FLINT_ICON_ASSETS_C),$(wildcard $(FLINT_DIR)/src/*.c)) $(FLINT_ICON_ASSETS_C)
|
||||
FLINT_WEB_SRCS := $(filter-out $(FLINT_DIR)/src/flint_file_dialog.c,$(FLINT_SRCS))
|
||||
FLINT_WINDOWS_SRCS := $(filter-out $(FLINT_DIR)/src/flint_file_dialog.c,$(FLINT_SRCS))
|
||||
FLINT_INCLUDE := -I$(FLINT_DIR)/include
|
||||
FLINT_CURL_CFLAGS ?= $(shell pkg-config --cflags libcurl 2>/dev/null)
|
||||
FLINT_CURL_LDLIBS ?= $(shell pkg-config --libs libcurl 2>/dev/null)
|
||||
@@ -91,11 +113,29 @@ SRC := $(APP_SRCS) $(EMBEDDED_ASSETS_C)
|
||||
APP_INCLUDE := -Isrc -Isrc/app -Isrc/core -Isrc/screens -Isrc/screens/settings -Isrc/session -Isrc/storage -Isrc/platform/android -Isrc/third_party
|
||||
APP_RAYLIB_CONFIG := $(filter-out -DSUPPORT_MODULE_RAUDIO=0 -DSUPPORT_FILEFORMAT_PNG=0 -DSUPPORT_FILEFORMAT_JPG=0 -DSUPPORT_FILEFORMAT_OGG=0 -DSUPPORT_FILEFORMAT_MP3=0,$(RAY_RAYLIB_CONFIG)) -DSUPPORT_MODULE_RAUDIO=1 -DSUPPORT_FILEFORMAT_JPG=1 -DSUPPORT_FILEFORMAT_OGG=1 -DSUPPORT_FILEFORMAT_MP3=1
|
||||
CFLAGS := -Wall -Wextra -std=c99 -Os -D_DEFAULT_SOURCE -D_GNU_SOURCE -ffunction-sections -fdata-sections -DSUPPORT_FILEFORMAT_JPG=1 -DMINIZ_NO_ZLIB_COMPATIBLE_NAMES -DFLINT_EMBEDDED_ONLY=1 $(FLINT_RUNTIME_ASSET_CFLAGS)
|
||||
WINDOWS_CFLAGS := -Wall -Wextra -std=c99 -Os -D_DEFAULT_SOURCE -D_GNU_SOURCE -ffunction-sections -fdata-sections -DSUPPORT_FILEFORMAT_JPG=1 -DMINIZ_NO_ZLIB_COMPATIBLE_NAMES -DFLINT_EMBEDDED_ONLY=1
|
||||
WEB_CFLAGS := $(filter-out -std=c99,$(CFLAGS)) -std=gnu99
|
||||
LDFLAGS := -Wl,--gc-sections -s
|
||||
WINDOWS_LDFLAGS := -Wl,--gc-sections -static -static-libgcc -mwindows
|
||||
WINDOWS_LDLIBS := -lgdi32 -lwinmm -lopengl32 -luser32 -lshell32 -lole32 -lcomdlg32 -lcomctl32 -luuid -lm
|
||||
ifneq ($(strip $(MCFGTHREADS)),)
|
||||
WIN64_THREAD_LDFLAGS := -L$(MCFGTHREADS)/lib
|
||||
else
|
||||
WIN64_THREAD_LDFLAGS :=
|
||||
endif
|
||||
ifneq ($(strip $(WIN32_MCFGTHREADS)),)
|
||||
WIN32_THREAD_LDFLAGS := -L$(WIN32_MCFGTHREADS)/lib
|
||||
else
|
||||
WIN32_THREAD_LDFLAGS :=
|
||||
endif
|
||||
|
||||
BINARY_NAME := $(APP_NAME)-linux-$(ARCH)
|
||||
TARGET := $(LINUX_BIN_DIR)/$(BINARY_NAME)
|
||||
WIN64_BINARY_NAME := $(APP_NAME)-windows-$(WIN64_ARCH).exe
|
||||
WIN64_TARGET := $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)/$(WIN64_BINARY_NAME)
|
||||
WIN32_BINARY_NAME := $(APP_NAME)-windows-$(WIN32_ARCH).exe
|
||||
WIN32_TARGET := $(WINDOWS_BIN_DIR)/$(WIN32_ARCH)/$(WIN32_BINARY_NAME)
|
||||
WINDOWS_DIST := $(WINDOWS_DIST_DIR)/$(APP_NAME)-windows.zip
|
||||
APPIMAGE_NAME := $(APP_NAME)-linux-$(ARCH).AppImage
|
||||
APPIMAGE_TARGET := $(LINUX_DIST_DIR)/$(APPIMAGE_NAME)
|
||||
LINUXDEPLOY ?= linuxdeploy
|
||||
@@ -107,7 +147,8 @@ WEB_ASSET_FILES := $(shell find web-assets -type f 2>/dev/null)
|
||||
UNPACKAGED_AUDIO_DIR := unpackaged_assets/audio
|
||||
MEDITATION_AUDIO_ZIP := web-assets/dl/inbe-meditation-audio-v1.zip
|
||||
|
||||
.PHONY: all native run test dist appimage clean clean-linux clean-raylib android-copy-assets android-debug android-release android-bundle android-install android-install-release android-clean package-unpackaged-assets windows web
|
||||
.PHONY: all native run test dist appimage clean clean-linux clean-raylib android-check-keystore android-copy-assets android-debug android-release android-bundle android-install android-install-release android-clean package-unpackaged-assets windows windows64 windows32 web
|
||||
.NOTPARALLEL: dist windows windows64 windows32 android-release android-bundle
|
||||
|
||||
all: native
|
||||
|
||||
@@ -126,9 +167,11 @@ dist:
|
||||
echo "Set PASSWORD=your-keystore-password for release builds"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
$(MAKE) android-check-keystore PASSWORD="$$password" && \
|
||||
$(MAKE) package-unpackaged-assets && \
|
||||
$(MAKE) web && \
|
||||
$(MAKE) appimage && \
|
||||
$(MAKE) windows && \
|
||||
$(MAKE) android-release PASSWORD="$$password" && \
|
||||
$(MAKE) android-bundle PASSWORD="$$password"
|
||||
|
||||
@@ -155,7 +198,10 @@ $(FLINT_TEXT_SCALING_TEST): tests/flint_text_scaling_test.c flint/src/flint_text
|
||||
tests/flint_text_scaling_test.c flint/src/flint_text.c flint/src/flint_clip.c flint/src/flint_scaling.c \
|
||||
-Wl,--gc-sections -lm
|
||||
|
||||
$(BUILD_OBJ_DIR) $(LINUX_BIN_DIR) $(LINUX_DIST_DIR) $(ANDROID_BUILD_DIR) $(TEST_BIN_DIR) $(WEB_OBJ_DIR) $(WEB_DIST_DIR):
|
||||
$(BUILD_OBJ_DIR) $(LINUX_BIN_DIR) $(LINUX_DIST_DIR) $(LINUX_APPIMAGE_BUILD_DIR) $(WINDOWS_DIST_DIR) $(ANDROID_BUILD_DIR) $(TEST_BIN_DIR) $(WEB_OBJ_DIR) $(WEB_DIST_DIR):
|
||||
mkdir -p $@
|
||||
|
||||
$(WINDOWS_BIN_DIR)/$(WIN64_ARCH) $(WINDOWS_BIN_DIR)/$(WIN32_ARCH):
|
||||
mkdir -p $@
|
||||
|
||||
assets/fonts:
|
||||
@@ -205,6 +251,40 @@ $(WEB_RAYLIB_A): $(RAYLIB_SOURCES) | $(WEB_OBJ_DIR)
|
||||
AR="$(WEB_AR)" \
|
||||
CUSTOM_CFLAGS="$(APP_RAYLIB_CONFIG) -Os -ffunction-sections -fdata-sections"
|
||||
|
||||
$(WIN64_RAYLIB_A): $(RAYLIB_SOURCES)
|
||||
rm -rf $(WINDOWS_OBJ_DIR)/$(WIN64_ARCH)/raylib-src
|
||||
mkdir -p $(WINDOWS_OBJ_DIR)/$(WIN64_ARCH)/raylib-src $(WIN64_RAYLIB_BUILD_DIR)
|
||||
cp -R $(RAYLIB_DIR)/. $(WINDOWS_OBJ_DIR)/$(WIN64_ARCH)/raylib-src/
|
||||
$(MAKE) -j1 -C $(WINDOWS_OBJ_DIR)/$(WIN64_ARCH)/raylib-src \
|
||||
OS=Windows_NT \
|
||||
PLATFORM=PLATFORM_DESKTOP_RGFW \
|
||||
GRAPHICS=GRAPHICS_API_OPENGL_11 \
|
||||
RAYLIB_LIBTYPE=STATIC \
|
||||
RAYLIB_RELEASE_PATH=../raylib \
|
||||
RAYLIB_MODULE_AUDIO=TRUE \
|
||||
RAYLIB_MODULE_MODELS=FALSE \
|
||||
CC="$(WIN64_CC)" \
|
||||
AR="$(WIN64_AR)" \
|
||||
RANLIB="$(WIN64_RANLIB)" \
|
||||
CUSTOM_CFLAGS="$(APP_RAYLIB_CONFIG) -Os -ffunction-sections -fdata-sections"
|
||||
|
||||
$(WIN32_RAYLIB_A): $(RAYLIB_SOURCES)
|
||||
rm -rf $(WINDOWS_OBJ_DIR)/$(WIN32_ARCH)/raylib-src
|
||||
mkdir -p $(WINDOWS_OBJ_DIR)/$(WIN32_ARCH)/raylib-src $(WIN32_RAYLIB_BUILD_DIR)
|
||||
cp -R $(RAYLIB_DIR)/. $(WINDOWS_OBJ_DIR)/$(WIN32_ARCH)/raylib-src/
|
||||
$(MAKE) -j1 -C $(WINDOWS_OBJ_DIR)/$(WIN32_ARCH)/raylib-src \
|
||||
OS=Windows_NT \
|
||||
PLATFORM=PLATFORM_DESKTOP_RGFW \
|
||||
GRAPHICS=GRAPHICS_API_OPENGL_11 \
|
||||
RAYLIB_LIBTYPE=STATIC \
|
||||
RAYLIB_RELEASE_PATH=../raylib \
|
||||
RAYLIB_MODULE_AUDIO=TRUE \
|
||||
RAYLIB_MODULE_MODELS=FALSE \
|
||||
CC="$(WIN32_CC)" \
|
||||
AR="$(WIN32_AR)" \
|
||||
RANLIB="$(WIN32_RANLIB)" \
|
||||
CUSTOM_CFLAGS="$(APP_RAYLIB_CONFIG) -Os -ffunction-sections -fdata-sections"
|
||||
|
||||
$(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H): $(SQLITE_DIR)/configure $(SQLITE_DIR)/manifest | $(BUILD_OBJ_DIR)
|
||||
mkdir -p $(SQLITE_BUILD_DIR)
|
||||
cd $(SQLITE_BUILD_DIR) && ../../../$(SQLITE_DIR)/configure
|
||||
@@ -230,7 +310,41 @@ $(TARGET): Makefile $(SRC) $(FLINT_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H)
|
||||
-lm -lpthread -ldl -lrt \
|
||||
$(LDFLAGS)
|
||||
|
||||
$(APPIMAGE_TARGET): $(TARGET) $(LINUX_APPIMAGE_APPRUN) $(LINUX_APPIMAGE_DESKTOP) $(LINUX_APPIMAGE_ICON) | $(LINUX_DIST_DIR)
|
||||
$(WIN64_TARGET): Makefile $(SRC) $(FLINT_WINDOWS_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WIN64_RAYLIB_A) | $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)
|
||||
$(WIN64_CC) $(WINDOWS_CFLAGS) \
|
||||
$(APP_INCLUDE) \
|
||||
$(FLINT_INCLUDE) \
|
||||
$(SQLITE_INCLUDE) \
|
||||
-I$(RAYLIB_DIR) \
|
||||
-DPLATFORM_DESKTOP \
|
||||
-o $@ \
|
||||
$(SRC) \
|
||||
$(FLINT_WINDOWS_SRCS) \
|
||||
$(SQLITE_SRC) \
|
||||
$(WIN64_RAYLIB_A) \
|
||||
$(WINDOWS_LDLIBS) \
|
||||
$(WIN64_THREAD_LDFLAGS) \
|
||||
$(WINDOWS_LDFLAGS)
|
||||
$(WIN64_STRIP) $@
|
||||
|
||||
$(WIN32_TARGET): Makefile $(SRC) $(FLINT_WINDOWS_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WIN32_RAYLIB_A) | $(WINDOWS_BIN_DIR)/$(WIN32_ARCH)
|
||||
$(WIN32_CC) $(WINDOWS_CFLAGS) \
|
||||
$(APP_INCLUDE) \
|
||||
$(FLINT_INCLUDE) \
|
||||
$(SQLITE_INCLUDE) \
|
||||
-I$(RAYLIB_DIR) \
|
||||
-DPLATFORM_DESKTOP \
|
||||
-o $@ \
|
||||
$(SRC) \
|
||||
$(FLINT_WINDOWS_SRCS) \
|
||||
$(SQLITE_SRC) \
|
||||
$(WIN32_RAYLIB_A) \
|
||||
$(WINDOWS_LDLIBS) \
|
||||
$(WIN32_THREAD_LDFLAGS) \
|
||||
$(WINDOWS_LDFLAGS)
|
||||
$(WIN32_STRIP) $@
|
||||
|
||||
$(APPIMAGE_TARGET): $(TARGET) $(LINUX_APPIMAGE_APPRUN) $(LINUX_APPIMAGE_DESKTOP) $(LINUX_APPIMAGE_ICON) | $(LINUX_DIST_DIR) $(LINUX_APPIMAGE_BUILD_DIR)
|
||||
@command -v linuxdeploy-plugin-appimage >/dev/null || { \
|
||||
echo "linuxdeploy-plugin-appimage is missing. Re-enter the flake shell with: nix develop"; \
|
||||
exit 1; \
|
||||
@@ -240,6 +354,7 @@ $(APPIMAGE_TARGET): $(TARGET) $(LINUX_APPIMAGE_APPRUN) $(LINUX_APPIMAGE_DESKTOP)
|
||||
exit 1; \
|
||||
}
|
||||
rm -rf $(LINUX_APPDIR)
|
||||
rm -rf $(LINUX_DIST_DIR)/*.AppDir
|
||||
rm -f $(LINUX_DIST_DIR)/*.AppImage
|
||||
mkdir -p $(LINUX_APPDIR)/usr/bin $(LINUX_APPDIR)/usr/share/applications $(LINUX_APPDIR)/usr/share/icons/hicolor/512x512/apps
|
||||
cp $(TARGET) $(LINUX_APPDIR)/usr/bin/$(APP_NAME)
|
||||
@@ -249,14 +364,12 @@ $(APPIMAGE_TARGET): $(TARGET) $(LINUX_APPIMAGE_APPRUN) $(LINUX_APPIMAGE_DESKTOP)
|
||||
cp $(LINUX_APPIMAGE_DESKTOP) $(LINUX_APPDIR)/usr/share/applications/$(APP_NAME).desktop
|
||||
cp $(LINUX_APPIMAGE_ICON) $(LINUX_APPDIR)/$(APP_NAME).png
|
||||
cp $(LINUX_APPIMAGE_ICON) $(LINUX_APPDIR)/usr/share/icons/hicolor/512x512/apps/$(APP_NAME).png
|
||||
cd $(LINUX_DIST_DIR) && env -u SOURCE_DATE_EPOCH ARCH=$(ARCH) LDAI_OUTPUT=$(APPIMAGE_NAME) $(LINUXDEPLOY) \
|
||||
cd $(LINUX_APPIMAGE_BUILD_DIR) && env -u SOURCE_DATE_EPOCH ARCH=$(ARCH) LDAI_OUTPUT=$(abspath $(APPIMAGE_TARGET)) $(LINUXDEPLOY) \
|
||||
--appdir $(APP_NAME).AppDir \
|
||||
--executable $(abspath $(LINUX_APPDIR)/usr/bin/$(APP_NAME)) \
|
||||
--desktop-file $(abspath $(LINUX_APPIMAGE_DESKTOP)) \
|
||||
--icon-file $(abspath $(LINUX_APPDIR)/usr/share/icons/hicolor/512x512/apps/$(APP_NAME).png) \
|
||||
--output appimage
|
||||
@found=$$(find $(LINUX_DIST_DIR) -maxdepth 1 -name '*.AppImage' ! -name '$(APPIMAGE_NAME)' | head -n 1); \
|
||||
if [ -n "$$found" ]; then mv "$$found" $@; fi; \
|
||||
test -f $@
|
||||
|
||||
$(WEB_TARGET): Makefile $(SRC) $(FLINT_WEB_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WEB_RAYLIB_A) src/web_shell.html manifest.json $(WEB_ASSET_FILES) | $(WEB_DIST_DIR)
|
||||
@@ -292,22 +405,46 @@ android-copy-assets:
|
||||
rm -rf droid/app/src/main/assets
|
||||
mkdir -p droid/app/src/main/assets
|
||||
|
||||
android-check-keystore:
|
||||
@if [ -z "$(PASSWORD)" ]; then \
|
||||
echo "Set PASSWORD=your-keystore-password for release builds"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@if [ ! -f "$(ANDROID_KEYSTORE)" ]; then \
|
||||
echo "Android release keystore not found: $(ANDROID_KEYSTORE)"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@command -v keytool >/dev/null || { \
|
||||
echo "keytool is missing. Re-enter the Android/JDK build environment."; \
|
||||
exit 1; \
|
||||
}
|
||||
@if ! keytool -list -keystore "$(ANDROID_KEYSTORE)" -storepass "$(PASSWORD)" -alias "$(ANDROID_KEY_ALIAS)" >/dev/null 2>&1; then \
|
||||
echo "Android release keystore password or alias is invalid"; \
|
||||
echo "Checked keystore: $(ANDROID_KEYSTORE)"; \
|
||||
echo "Checked alias: $(ANDROID_KEY_ALIAS)"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
android-debug: android-copy-assets
|
||||
unset ANDROID_HOME; $(GRADLE) -p droid assembleDebug
|
||||
$(MAKE) android-copy-debug-apks
|
||||
|
||||
android-release: android-copy-assets
|
||||
android-release:
|
||||
$(MAKE) android-check-keystore PASSWORD="$(PASSWORD)"
|
||||
$(MAKE) android-copy-assets
|
||||
@if [ -n "$(PASSWORD)" ]; then \
|
||||
unset ANDROID_HOME; $(GRADLE) -p droid assembleRelease -Pkeystore.path="$(ANDROID_KEYSTORE)" -Pkeystore.password="$(PASSWORD)" || exit $$?; \
|
||||
unset ANDROID_HOME; $(GRADLE) -p droid assembleRelease -Pkeystore.path="$(ANDROID_KEYSTORE)" -Pkeystore.alias="$(ANDROID_KEY_ALIAS)" -Pkeystore.password="$(PASSWORD)" || exit $$?; \
|
||||
else \
|
||||
echo "Set PASSWORD=your-keystore-password for release builds"; \
|
||||
exit 1; \
|
||||
fi
|
||||
$(MAKE) android-copy-release-apks
|
||||
|
||||
android-bundle: android-copy-assets
|
||||
android-bundle:
|
||||
$(MAKE) android-check-keystore PASSWORD="$(PASSWORD)"
|
||||
$(MAKE) android-copy-assets
|
||||
@if [ -n "$(PASSWORD)" ]; then \
|
||||
unset ANDROID_HOME; $(GRADLE) -p droid bundleRelease -Pkeystore.path="$(ANDROID_KEYSTORE)" -Pkeystore.password="$(PASSWORD)" || exit $$?; \
|
||||
unset ANDROID_HOME; $(GRADLE) -p droid bundleRelease -Pkeystore.path="$(ANDROID_KEYSTORE)" -Pkeystore.alias="$(ANDROID_KEY_ALIAS)" -Pkeystore.password="$(PASSWORD)" || exit $$?; \
|
||||
else \
|
||||
echo "Set PASSWORD=your-keystore-password for bundle builds"; \
|
||||
exit 1; \
|
||||
@@ -338,7 +475,19 @@ android-copy-release-apks: | $(ANDROID_BUILD_DIR)
|
||||
if [ "$$found" -eq 0 ]; then \
|
||||
echo "No release APKs were produced"; \
|
||||
exit 1; \
|
||||
fi
|
||||
fi; \
|
||||
if [ -z "$(APP_VERSION)" ]; then \
|
||||
echo "Could not read INBE_VERSION_STRING from $(VERSION_FILE)"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
universal="$$(find droid/app/build/outputs/apk/release -maxdepth 1 -name '*universal*release*.apk' | head -n 1)"; \
|
||||
if [ -z "$$universal" ]; then universal="$$(find droid/app/build/outputs/apk/release -maxdepth 1 -name '*release*.apk' | head -n 1)"; fi; \
|
||||
if [ -z "$$universal" ]; then \
|
||||
echo "No release APK was available for versioned copy"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
cp "$$universal" "$(ANDROID_BUILD_DIR)/$(APP_NAME)-$(APP_VERSION).apk"; \
|
||||
cp "$$universal" "$(ANDROID_BUILD_DIR)/$(APP_NAME)-latest.apk"
|
||||
|
||||
android-copy-bundle: | $(ANDROID_BUILD_DIR)
|
||||
@found=0; \
|
||||
@@ -376,9 +525,19 @@ package-unpackaged-assets:
|
||||
rm -f $(MEDITATION_AUDIO_ZIP)
|
||||
cd $(UNPACKAGED_AUDIO_DIR) && find . -mindepth 2 -type f -name '*.ogg' -exec zip -9 -r $(abspath $(MEDITATION_AUDIO_ZIP)) {} + && zip -9 -r $(abspath $(MEDITATION_AUDIO_ZIP)) LICENSE.md MANIFEST.txt
|
||||
|
||||
windows64: $(WIN64_TARGET)
|
||||
|
||||
windows32: $(WIN32_TARGET)
|
||||
|
||||
windows:
|
||||
@echo "Windows packaging was removed with the Flint CLI layer. Add a focused script when it is needed."
|
||||
@exit 1
|
||||
$(MAKE) windows64
|
||||
$(MAKE) windows32
|
||||
mkdir -p $(WINDOWS_DIST_DIR)
|
||||
rm -f $(WINDOWS_DIST_DIR)/$(APP_NAME)-windows-*.zip
|
||||
rm -f $(WINDOWS_DIST)
|
||||
cd $(WINDOWS_BIN_DIR) && zip -9 -j $(abspath $(WINDOWS_DIST)) \
|
||||
$(WIN64_ARCH)/$(WIN64_BINARY_NAME) \
|
||||
$(WIN32_ARCH)/$(WIN32_BINARY_NAME)
|
||||
|
||||
web:
|
||||
$(MAKE) $(WEB_TARGET)
|
||||
|
||||
Generated
+18
-1
@@ -16,9 +16,26 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-sdl2": {
|
||||
"locked": {
|
||||
"lastModified": 1751274312,
|
||||
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-sdl2": "nixpkgs-sdl2"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-sdl2.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs }:
|
||||
outputs = { self, nixpkgs, nixpkgs-sdl2 }:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
@@ -26,6 +27,13 @@
|
||||
mkShell = system:
|
||||
let
|
||||
pkgs = mkPkgs system;
|
||||
sdl2Pkgs = import nixpkgs-sdl2 {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
allowUnsupportedSystem = true;
|
||||
};
|
||||
};
|
||||
aarch64Pkgs = pkgs.pkgsCross.aarch64-multiplatform;
|
||||
|
||||
windowsCrossEnabled = system == "x86_64-linux";
|
||||
@@ -68,7 +76,7 @@
|
||||
ndkPath = "${sdk}/libexec/android-sdk/ndk-bundle";
|
||||
|
||||
pkgConfigPath = pkgs.lib.makeSearchPath "lib/pkgconfig" [
|
||||
pkgs.SDL2.dev
|
||||
sdl2Pkgs.SDL2.dev
|
||||
pkgs.curl.dev
|
||||
pkgs.libdrm.dev
|
||||
pkgs.libgbm
|
||||
@@ -178,8 +186,8 @@ EOF
|
||||
extraOutputsToInstall = [ "dev" ];
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
SDL2
|
||||
SDL2.dev
|
||||
sdl2Pkgs.SDL2
|
||||
sdl2Pkgs.SDL2.dev
|
||||
butler
|
||||
cmake
|
||||
curl
|
||||
|
||||
@@ -112,7 +112,7 @@ flint_runtime_assets_init(const char *app_id)
|
||||
EM_ASM({
|
||||
var root = UTF8ToString($0);
|
||||
var parts = root.split('/').filter(Boolean);
|
||||
var path = '';
|
||||
var path = "";
|
||||
try {
|
||||
for(var i = 0; i < parts.length; i++) {
|
||||
path += '/' + parts[i];
|
||||
|
||||
@@ -2002,8 +2002,11 @@ ui_draw_dropdown_button(int id, int x, int y, int w, int h,
|
||||
int changed = 0;
|
||||
Rectangle btn_bounds = {x, y, w, h};
|
||||
Vector2 mouse = ui_mouse_world();
|
||||
int hover = CheckCollisionPointRec(mouse, btn_bounds) &&
|
||||
!ui_input_captures_click(mouse);
|
||||
int button_inside = CheckCollisionPointRec(mouse, btn_bounds);
|
||||
int hover = button_inside &&
|
||||
(state->open
|
||||
? !ui_base_input_captures_click(mouse, 1)
|
||||
: !ui_input_captures_click(mouse));
|
||||
|
||||
/* Calculate arrow position */
|
||||
int arrow_x = x + w - arrow_pad;
|
||||
|
||||
@@ -70,6 +70,9 @@ Test audio
|
||||
[meditation_music_stop_test_button]
|
||||
Stop test
|
||||
---
|
||||
[meditation_music_attribution]
|
||||
Music by Elijah_K.
|
||||
---
|
||||
[duration_5m]
|
||||
5m
|
||||
---
|
||||
|
||||
@@ -725,7 +725,7 @@ draw_habits_top_bar(InbeApp *app, int draw_menu)
|
||||
: app->icons[UI_ICON_TYPE_CALENDAR];
|
||||
if(ui_draw_icon_btn_padded(view_toggle_x, icon_y, icon_size, icon_padding,
|
||||
toggle_icon, &hover)) {
|
||||
app->habits.view_mode = app->habits.view_mode == HABIT_VIEW_WEEKLY
|
||||
app->habits.view_mode = app->habits.view_mode == HABIT_VIEW_WEEKLY
|
||||
? HABIT_VIEW_CALENDAR
|
||||
: HABIT_VIEW_WEEKLY;
|
||||
app->habits.scroll = 0;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "raylib.h"
|
||||
#include "breath_engine.h"
|
||||
#include "app_fwd.h"
|
||||
#include <stddef.h>
|
||||
|
||||
/* Forward declaration for enums defined elsewhere */
|
||||
@@ -86,9 +87,7 @@ typedef struct HabitLinkedContext {
|
||||
int best_seconds;
|
||||
} HabitLinkedContext;
|
||||
|
||||
/* Forward declarations and external functions */
|
||||
typedef struct InbeApp InbeApp;
|
||||
|
||||
/* External functions */
|
||||
void save_settings(InbeApp *app);
|
||||
|
||||
/* Core habits functions */
|
||||
|
||||
@@ -28,6 +28,14 @@ static const char *const TUTORIAL_KEYS[] = {
|
||||
#define TUTORIAL_STEPS_COUNT (sizeof(TUTORIAL_KEYS) / sizeof(TUTORIAL_KEYS[0]))
|
||||
#define TUTORIAL_LINE_SPACING flint_px(8) /* Normal readable line spacing */
|
||||
|
||||
static Color
|
||||
manual_text_color_for_background(Color background)
|
||||
{
|
||||
int luma = background.r * 299 + background.g * 587 + background.b * 114;
|
||||
|
||||
return luma >= 128000 ? BLACK : WHITE;
|
||||
}
|
||||
|
||||
static void
|
||||
draw_tutorial_hold_preview(InbeApp *app, int center_x, int center_y, int radius)
|
||||
{
|
||||
@@ -35,6 +43,7 @@ draw_tutorial_hold_preview(InbeApp *app, int center_x, int center_y, int radius)
|
||||
char text[CountSize];
|
||||
int font = flint_px(16);
|
||||
int thickness = flint_px(5);
|
||||
Color text_color = theme_get_text();
|
||||
|
||||
count_from_int(text, seconds);
|
||||
if(thickness < 3)
|
||||
@@ -47,12 +56,14 @@ draw_tutorial_hold_preview(InbeApp *app, int center_x, int center_y, int radius)
|
||||
(float)(radius + flint_px(8) - thickness / 2),
|
||||
(float)(radius + flint_px(8) + thickness / 2),
|
||||
-90.0f, -90.0f + sweep, 96, theme_get_text());
|
||||
text_color = manual_text_color_for_background(theme_get_bg());
|
||||
} else {
|
||||
DrawCircle(center_x, center_y, radius, theme_get_circle());
|
||||
DrawCircleLines(center_x, center_y, radius, theme_get_text());
|
||||
text_color = manual_text_color_for_background(theme_get_circle());
|
||||
}
|
||||
|
||||
flint_ui_draw_text_centered(text, center_x, center_y, font, theme_get_text());
|
||||
flint_ui_draw_text_centered(text, center_x, center_y, font, text_color);
|
||||
}
|
||||
|
||||
static FlintUIParagraph
|
||||
|
||||
@@ -2,14 +2,12 @@
|
||||
#define PRACTICE_SCREEN_H
|
||||
|
||||
#include "raylib.h"
|
||||
#include "app_fwd.h"
|
||||
|
||||
#define PRACTICE_CATEGORY_TAB_H 40
|
||||
#define PRACTICE_CATEGORY_TOAST_TICKS 120
|
||||
#define PRACTICE_CONFIG_TAB_LIST (-1)
|
||||
|
||||
/* Forward declarations */
|
||||
typedef struct InbeApp InbeApp;
|
||||
|
||||
int practice_activity_count_for_tab(int tab);
|
||||
int practice_activity_for_tab(int tab, int index);
|
||||
const char *practice_activity_label(int exercise);
|
||||
|
||||
@@ -731,7 +731,7 @@ practice_config_content_height(InbeApp *app, int content_w)
|
||||
if(app == NULL)
|
||||
return 0;
|
||||
if(app->exercise_type == EXERCISE_MEDITATION)
|
||||
return meditation_music_measure_settings(app, 1, 1);
|
||||
return meditation_music_measure_settings(app, content_w, 1, 1);
|
||||
return wim_hof_config_content_height(app, content_w);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "locale.h"
|
||||
#include "theme.h"
|
||||
#include "miniz.h"
|
||||
#include "flint_color.h"
|
||||
#include "flint_runtime_assets.h"
|
||||
#include "flint_text.h"
|
||||
#include "flint_ui.h"
|
||||
@@ -190,6 +191,38 @@ draw_download_progress(InbeApp *app, int x, int y, int w)
|
||||
}
|
||||
}
|
||||
|
||||
static FlintUIParagraph
|
||||
music_attribution_paragraph(int content_w)
|
||||
{
|
||||
return (FlintUIParagraph){
|
||||
.text = locale_get("meditation_music_attribution"),
|
||||
.icon = (Texture2D){0},
|
||||
.icon_type = UI_ICON_TYPE_NONE,
|
||||
.icon_size = 0,
|
||||
.width = content_w,
|
||||
.font = flint_px(FLINT_TEXT_8),
|
||||
.line_gap = flint_px(4),
|
||||
.color = flint_darken(theme_get_text(), 34),
|
||||
};
|
||||
}
|
||||
|
||||
static int
|
||||
music_attribution_height(int content_w)
|
||||
{
|
||||
if(content_w <= 0)
|
||||
return 0;
|
||||
return flint_ui_paragraph_height(music_attribution_paragraph(content_w));
|
||||
}
|
||||
|
||||
static void
|
||||
draw_music_attribution(int content_x, int content_w, int *y)
|
||||
{
|
||||
if(y == NULL || content_w <= 0)
|
||||
return;
|
||||
|
||||
flint_ui_paragraph_draw(music_attribution_paragraph(content_w), content_x, y);
|
||||
}
|
||||
|
||||
static void
|
||||
music_archive_path(InbeApp *app, char *out, size_t out_size)
|
||||
{
|
||||
@@ -445,8 +478,9 @@ meditation_music_update(InbeApp *app)
|
||||
if(app == NULL)
|
||||
return;
|
||||
if(app->meditation_music_test_playing &&
|
||||
(app->inbe.screen != InbeScreenPracticeConfig ||
|
||||
app->exercise_type != EXERCISE_MEDITATION)) {
|
||||
(app->exercise_type != EXERCISE_MEDITATION ||
|
||||
(app->inbe.screen != InbeScreenPracticeConfig &&
|
||||
app->inbe.screen != InbeScreenManual))) {
|
||||
meditation_music_stop(app);
|
||||
return;
|
||||
}
|
||||
@@ -566,15 +600,19 @@ draw_music_picker(InbeApp *app, int content_x, int content_w, int *y,
|
||||
*y += flint_px(28);
|
||||
draw_download_progress(app, content_x, *y, content_w);
|
||||
*y += flint_px(22);
|
||||
return;
|
||||
} else {
|
||||
flint_text_draw(app->meditation_music_status, content_x, *y, flint_ui_font(), theme_get_text());
|
||||
*y += flint_px(34);
|
||||
}
|
||||
flint_text_draw(app->meditation_music_status, content_x, *y, flint_ui_font(), theme_get_text());
|
||||
*y += flint_px(34);
|
||||
}
|
||||
|
||||
draw_music_attribution(content_x, content_w, y);
|
||||
*y += flint_px(10);
|
||||
}
|
||||
|
||||
int
|
||||
meditation_music_measure_settings(InbeApp *app, int show_installed_download, int show_status)
|
||||
meditation_music_measure_settings(InbeApp *app, int content_w,
|
||||
int show_installed_download, int show_status)
|
||||
{
|
||||
int installed;
|
||||
int h = flint_px(76);
|
||||
@@ -598,6 +636,8 @@ meditation_music_measure_settings(InbeApp *app, int show_installed_download, int
|
||||
h += flint_px(34);
|
||||
}
|
||||
|
||||
h += music_attribution_height(content_w) + flint_px(10);
|
||||
|
||||
return h;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@ void meditation_music_update(InbeApp *app);
|
||||
void meditation_music_unload(InbeApp *app);
|
||||
void meditation_music_start_session(InbeApp *app);
|
||||
void meditation_music_stop(InbeApp *app);
|
||||
int meditation_music_measure_settings(InbeApp *app, int show_installed_download, int show_status);
|
||||
int meditation_music_measure_settings(InbeApp *app, int content_w,
|
||||
int show_installed_download, int show_status);
|
||||
void meditation_music_draw_settings(InbeApp *app, int content_x, int content_w, int *y);
|
||||
void meditation_music_draw_guide_settings(InbeApp *app, int content_x, int content_w, int *y);
|
||||
int meditation_music_draw_dropdown_menu(InbeApp *app);
|
||||
|
||||
@@ -19,6 +19,12 @@
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
#define INBE_MKDIR(path) mkdir(path)
|
||||
#else
|
||||
#define INBE_MKDIR(path) mkdir(path, 0700)
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wformat-truncation"
|
||||
@@ -95,7 +101,7 @@ ensure_dir_local(const char *path)
|
||||
p++;
|
||||
while((p = strchr(p, '/')) != NULL) {
|
||||
*p = '\0';
|
||||
if(temp[0] != '\0' && !dir_exists_local(temp) && mkdir(temp, 0700) != 0 && !dir_exists_local(temp)) {
|
||||
if(temp[0] != '\0' && !dir_exists_local(temp) && INBE_MKDIR(temp) != 0 && !dir_exists_local(temp)) {
|
||||
*p = '/';
|
||||
return 0;
|
||||
}
|
||||
@@ -103,7 +109,7 @@ ensure_dir_local(const char *path)
|
||||
p++;
|
||||
}
|
||||
|
||||
return mkdir(path, 0700) == 0 || dir_exists_local(path);
|
||||
return INBE_MKDIR(path) == 0 || dir_exists_local(path);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
Reference in new issue
Block a user