Breeze builds and runs with no raylib anywhere, on Ziran 7fbc8152 and Kryon b5a61b37, with plot, entity, apps, css and game2d pinned to that Kryon, so the lock has one Kryon and no raylib package. - Linux and Windows run on Kryon's SDL2 and Cairo desktop host; WebP decodes with the linked libwebp (KRYON_WEBP_LINKED). - Android owns its NativeActivity loop on Kryon's android_runtime: Pixmap on the activity's surface, android_touch input and Android's typefaces, paced to the app's frame target. The CMake build drops breeze_raylib, GLES and the raylib link wraps, and links Kryon's fopen wrapper. - The browser reaches Kryon's canvas modules directly. - Audio is Ziran's std audio: its mixer, the SDL, AAudio and OpenSL ES sinks, the WAV, MP3 and Vorbis decoders and the audio package's Opus. The MP3 and Vorbis archives come from Ziran's own codec recipes. The browser keeps Kryon's Web Audio. - Host modules choose the desktop host, Android, the canvas or, for native tests that select none, a headless host with no window, input or audio device. host_keys.zi and text_input_host.zi replace raylib_host.zi and raylib_text_input.zi; the log is one implementation, with logcat on Android and the C runtime's open flags on Windows. - The Makefile, Click packaging, CI and release workflows build no raylib. - Tests: radio, app log, asset files, DPI, legacy sessions, sync recovery and the Android JNI bridge run without raylib stubs; voice playback is a Ziran test of real Ogg Opus narration through Ziran's mixer. Tests that only exercised raylib internals are removed. - AppsControllerSha256 is the controller built from Apps b96d9afe on this graph. Local tests: Linux desktop window, Habits UI and the Ziran and native tests above pass on a private Xvfb; the Android debug APK runs on a Pixel 4a; the Windows package runs under Wine on a private Xvfb. Co-Authored-By: Claude Opus 5.5 <[email protected]>
226 lines
9.9 KiB
Makefile
226 lines
9.9 KiB
Makefile
# Windows build: cross-compiled libraries, the executable, its zip and installer.
|
|
|
|
# Kryon's desktop host on Windows: SDL2, Cairo, Pango, Fontconfig, FreeType,
|
|
# GLib and GdkPixbuf as MinGW import libraries with their runtime DLLs, from
|
|
# Kryon's pinned renderer-desktop-windows artifact.
|
|
WIN64_DESKTOP_SDK := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/desktop-sdk
|
|
WIN64_DESKTOP_READY := $(WIN64_DESKTOP_SDK)/.ready
|
|
WIN64_DESKTOP_LIBS := $(addprefix $(WIN64_DESKTOP_SDK)/lib/,libSDL2.dll.a \
|
|
libpangocairo-1.0.dll.a libpango-1.0.dll.a libcairo.dll.a libfontconfig.dll.a \
|
|
libfreetype.dll.a libgdk_pixbuf-2.0.dll.a libgobject-2.0.dll.a libglib-2.0.dll.a)
|
|
WIN64_DESKTOP_RUNTIME := $(WIN64_DESKTOP_SDK)/runtime.tar
|
|
|
|
$(WIN64_DESKTOP_READY): ziran.lock mk/windows.mk | $(ZIRAN_BIN)
|
|
@set -eu; descriptor=$$($(ZIRAN_BIN) pkg artifact kryon:renderer-desktop-windows \
|
|
--platform windows-x86_64-mingw); artifact=$$(dirname "$$descriptor"); \
|
|
mkdir -p $(WIN64_DESKTOP_SDK)/lib; \
|
|
cp "$$artifact"/lib/*.dll.a $(WIN64_DESKTOP_SDK)/lib/; \
|
|
cp "$$artifact/runtime.tar" $(WIN64_DESKTOP_RUNTIME)
|
|
touch $@
|
|
|
|
$(WIN64_DESKTOP_LIBS) $(WIN64_DESKTOP_RUNTIME): $(WIN64_DESKTOP_READY)
|
|
@test -f $@
|
|
|
|
vendor-prebuilds-windows: $(WIN64_DESKTOP_READY)
|
|
.PHONY: windows-package
|
|
|
|
WIN64_WEBP_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/kryon-webp
|
|
WIN64_WEBP_A := $(WIN64_WEBP_BUILD_DIR)/libkryonwebp.a
|
|
|
|
$(WIN64_WEBP_A): Makefile mk/windows.mk ziran.lock $(KRYON_DIR)/cmake/WebP.cmake $(KRYON_DIR)/cmake/webp/CMakeLists.txt build/packages/libwebp/CMakeLists.txt $(wildcard build/packages/libwebp/src/*/*.c build/packages/libwebp/src/*/*.h)
|
|
$(CMAKE) -S $(KRYON_DIR)/cmake/webp -B $(WIN64_WEBP_BUILD_DIR) \
|
|
-DCMAKE_SYSTEM_NAME=Windows \
|
|
-DCMAKE_SYSTEM_PROCESSOR=$(WIN64_CMAKE_SYSTEM_PROCESSOR) \
|
|
-DCMAKE_C_COMPILER=$(WIN64_CC_PATH) \
|
|
-DCMAKE_AR=$(WIN64_AR_PATH) \
|
|
-DCMAKE_RANLIB=$(WIN64_RANLIB_PATH) \
|
|
-DWEBP_DIR="$(abspath build/packages/libwebp)" \
|
|
$(IMAGE_PACKAGE_DIRS) \
|
|
-DCMAKE_BUILD_TYPE=Release
|
|
$(CMAKE) --build $(WIN64_WEBP_BUILD_DIR) --target kryonwebp --parallel 2
|
|
|
|
# Kryon's desktop raster decodes AVIF with libaom, whose CMake project needs
|
|
# the C++ cross compiler and, for x86-64 SIMD, nasm.
|
|
WIN64_CXX ?= $(patsubst %gcc,%g++,$(patsubst %gcc-win32,%g++-win32,$(patsubst %gcc-posix,%g++-posix,$(WIN64_CC))))
|
|
WIN64_CXX_PATH := $(shell command -v $(WIN64_CXX) 2>/dev/null || printf '%s' $(WIN64_CXX))
|
|
WIN64_AVIF_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/kryon-avif
|
|
WIN64_AVIF_A := $(WIN64_AVIF_BUILD_DIR)/avif/libavif.a
|
|
WIN64_AOM_A := $(WIN64_AVIF_BUILD_DIR)/aom/libaom.a
|
|
|
|
$(WIN64_AVIF_A): Makefile mk/windows.mk ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake) | $(ZIRAN_BIN)
|
|
$(CMAKE) -S $(KRYON_DIR)/cmake/avif -B $(WIN64_AVIF_BUILD_DIR) \
|
|
-DCMAKE_SYSTEM_NAME=Windows \
|
|
-DCMAKE_SYSTEM_PROCESSOR=$(WIN64_CMAKE_SYSTEM_PROCESSOR) \
|
|
-DCMAKE_C_COMPILER=$(WIN64_CC_PATH) \
|
|
-DCMAKE_CXX_COMPILER=$(WIN64_CXX_PATH) \
|
|
-DCMAKE_AR=$(WIN64_AR_PATH) \
|
|
-DCMAKE_RANLIB=$(WIN64_RANLIB_PATH) \
|
|
-DAVIF_DIR="$(abspath build/packages/libavif)" \
|
|
-DAOM_DIR="$(abspath build/packages/libaom)" \
|
|
$(IMAGE_PACKAGE_DIRS) \
|
|
-DCMAKE_BUILD_TYPE=Release
|
|
$(CMAKE) --build $(WIN64_AVIF_BUILD_DIR) --target avif_static aom --parallel 2
|
|
@test -f $@
|
|
|
|
$(WIN64_AOM_A): $(WIN64_AVIF_A)
|
|
@test -f $@
|
|
|
|
# Kryon decodes Ogg Opus narration with the audio package's static libopus,
|
|
# which keeps libopus's stack protector, so the app also links libssp.
|
|
WIN64_OPUS_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/audio-codecs
|
|
WIN64_OPUS_A := $(WIN64_OPUS_BUILD_DIR)/libopus/libopus.a
|
|
# Ziran's mixer decodes MP3 with dr_mp3 and Ogg Vorbis with libvorbisfile.
|
|
WIN64_MP3_A := $(WIN64_OPUS_BUILD_DIR)/libziran_mp3.a
|
|
WIN64_VORBIS_LIBS := $(WIN64_OPUS_BUILD_DIR)/libvorbisfile.a $(WIN64_OPUS_BUILD_DIR)/libvorbis.a $(WIN64_OPUS_BUILD_DIR)/libogg.a
|
|
|
|
$(WIN64_OPUS_A) $(WIN64_MP3_A) $(WIN64_VORBIS_LIBS) &: mk/windows.mk ziran.lock $(AUDIO_PACKAGE_DIR)/native/AudioCodecs.cmake $(AUDIO_PACKAGE_DIR)/native/CMakeLists.txt $(AUDIO_OPUS_DIR)/CMakeLists.txt $(ZIRAN_DIR)/std/native/AudioCodecs.cmake
|
|
$(CMAKE) -S $(AUDIO_PACKAGE_DIR)/native -B $(WIN64_OPUS_BUILD_DIR) \
|
|
-DCMAKE_SYSTEM_NAME=Windows \
|
|
-DCMAKE_SYSTEM_PROCESSOR=$(WIN64_CMAKE_SYSTEM_PROCESSOR) \
|
|
-DCMAKE_C_COMPILER=$(WIN64_CC_PATH) \
|
|
-DCMAKE_AR=$(WIN64_AR_PATH) \
|
|
-DCMAKE_RANLIB=$(WIN64_RANLIB_PATH) \
|
|
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
|
|
-DOPUS_DIR=$(abspath $(AUDIO_OPUS_DIR)) \
|
|
-DSAMPLERATE_DIR=$(abspath $(AUDIO_SAMPLERATE_DIR)) \
|
|
-DZIRAN_STDLIB=$(abspath $(ZIRAN_DIR))/std \
|
|
-DCMAKE_BUILD_TYPE=Release
|
|
$(CMAKE) --build $(WIN64_OPUS_BUILD_DIR) --target opus ziran_mp3 vorbisfile --parallel 2
|
|
@for archive in $(WIN64_OPUS_A) $(WIN64_MP3_A) $(WIN64_VORBIS_LIBS); do test -f $$archive || { echo "Missing $$archive" >&2; exit 1; }; done
|
|
|
|
$(WINDOWS_GEN_STAMP): $(wildcard ziran.local.toml build/packages/*/ziran.toml) Makefile mk/windows.mk ziran.lock $(ZIRAN_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME2D_MODULES) $(MESH_CLIENT_MODULES) $(wildcard build/packages/entity/src/*.zi) $(ZIRAN_STD_MODULES) $(SYNC_RETRY_SOURCE) | build-laws zi-check
|
|
rm -rf $(WINDOWS_GEN_DIR)
|
|
mkdir -p $(WINDOWS_GEN_DIR)
|
|
sh scripts/run-ziran.sh $(ZIRAN_BIN) build --target=c --project --offline $(PACKAGE_FLAGS) \
|
|
--no-main --root . --target-os windows --target-cpu x64 \
|
|
--define PLATFORM_DESKTOP --define _WIN32 --define DESKTOP_HOST --define DESKTOP_TRAY_ENABLED \
|
|
--define KRYON_WEBP_LINKED \
|
|
-o $(WINDOWS_GEN_DIR) $(ZI_SRCS)
|
|
touch $@
|
|
find $(WINDOWS_GEN_DIR) -type f \( -name '*.c' -o -name '*.h' \) -exec touch -r $@ {} +
|
|
|
|
$(WINDOWS_GEN_SRCS): $(WINDOWS_GEN_STAMP)
|
|
@test -f $@
|
|
|
|
$(WINDOWS_BIN_DIR)/$(WIN64_ARCH):
|
|
mkdir -p $@
|
|
|
|
$(WIN64_CURL_A): $(CURL_DIR)/CMakeLists.txt
|
|
rm -rf $(WIN64_CURL_BUILD_DIR)
|
|
$(CMAKE) -S $(CURL_DIR) -B $(WIN64_CURL_BUILD_DIR) \
|
|
-DCMAKE_SYSTEM_NAME=Windows \
|
|
-DCMAKE_C_COMPILER=$(WIN64_CC_PATH) \
|
|
-DCMAKE_AR=$(WIN64_AR_PATH) \
|
|
-DCMAKE_RANLIB=$(WIN64_RANLIB_PATH) \
|
|
-DCMAKE_EXE_LINKER_FLAGS="$(WIN64_THREAD_LDFLAGS)" \
|
|
-DCMAKE_INSTALL_PREFIX=$(abspath $(WIN64_CURL_BUILD_DIR)) \
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
-DBUILD_SHARED_LIBS=OFF \
|
|
-DBUILD_STATIC_LIBS=ON \
|
|
-DBUILD_CURL_EXE=OFF \
|
|
-DCURL_STATICLIB=ON \
|
|
-DCURL_USE_SCHANNEL=ON \
|
|
-DCURL_USE_OPENSSL=OFF \
|
|
-DCURL_USE_LIBPSL=OFF \
|
|
-DCURL_USE_LIBSSH2=OFF \
|
|
-DCURL_USE_GSSAPI=OFF \
|
|
-DUSE_NGHTTP2=OFF \
|
|
-DUSE_LIBIDN2=OFF \
|
|
-DCURL_DISABLE_LDAP=ON \
|
|
-DCURL_DISABLE_LDAPS=ON \
|
|
-DCURL_DISABLE_SMB=ON \
|
|
-DENABLE_CURL_MANUAL=OFF \
|
|
-DBUILD_EXAMPLES=OFF \
|
|
-DBUILD_LIBCURL_DOCS=OFF \
|
|
-DBUILD_MISC_DOCS=OFF \
|
|
-DBUILD_TESTING=OFF
|
|
$(CMAKE) --build $(WIN64_CURL_BUILD_DIR) --target install
|
|
|
|
$(WIN64_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt mk/sync.mk Makefile
|
|
rm -rf $(WIN64_LIBOQS_BUILD_DIR)
|
|
$(CMAKE) -S $(LIBOQS_DIR) -B $(WIN64_LIBOQS_BUILD_DIR) \
|
|
-DCMAKE_SYSTEM_NAME=Windows \
|
|
-DCMAKE_SYSTEM_PROCESSOR=$(WIN64_CMAKE_SYSTEM_PROCESSOR) \
|
|
-DCMAKE_C_COMPILER=$(WIN64_CC_PATH) \
|
|
-DCMAKE_AR=$(WIN64_AR_PATH) \
|
|
-DCMAKE_RANLIB=$(WIN64_RANLIB_PATH) \
|
|
-DCMAKE_EXE_LINKER_FLAGS="$(WIN64_THREAD_LDFLAGS)" \
|
|
-DCMAKE_BUILD_TYPE=$(KRYON_LIBOQS_BUILD_TYPE) \
|
|
-DBUILD_SHARED_LIBS=OFF \
|
|
-DOQS_BUILD_ONLY_LIB=ON \
|
|
-DOQS_USE_OPENSSL=OFF \
|
|
-DOQS_DIST_BUILD=OFF \
|
|
-DOQS_OPT_TARGET=generic \
|
|
$(KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS) \
|
|
-DOQS_MINIMAL_BUILD="$(KRYON_LIBOQS_MINIMAL_BUILD)"
|
|
$(CMAKE) --build $(WIN64_LIBOQS_BUILD_DIR) --target oqs
|
|
|
|
$(WIN64_RESOURCE): windows/$(APP_NAME).rc windows/$(APP_NAME).ico
|
|
mkdir -p $(dir $@)
|
|
$(WIN64_WINDRES) -Iwindows -O coff $< $@
|
|
|
|
$(WIN64_TARGET): Makefile mk/windows.mk $(WINDOWS_SRC) $(WINDOWS_GEN_STAMP) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_FILES) $(EMBEDDED_ASSETS_C) $(WIN64_DESKTOP_LIBS) $(WIN64_WEBP_A) $(WIN64_AVIF_A) $(WIN64_AOM_A) $(WIN64_CURL_A) $(WIN64_LIBOQS_A) $(WIN64_OPUS_A) $(WIN64_MP3_A) $(WIN64_VORBIS_LIBS) $(WIN64_RESOURCE) | $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)
|
|
$(WIN64_CC) $(WINDOWS_CFLAGS) \
|
|
-iquote$(WINDOWS_GEN_DIR) -iquote$(WINDOWS_GEN_DIR)/src $(WINDOWS_APP_INCLUDE) \
|
|
$(KRYON_INCLUDE) \
|
|
$(SQLITE_INCLUDE) \
|
|
$(WIN64_LIBOQS_INCLUDE) \
|
|
-I$(WIN64_CURL_INCLUDE_DIR) \
|
|
-DHAS_LIBOQS=1 \
|
|
-DPLATFORM_DESKTOP \
|
|
-DCURL_STATICLIB \
|
|
-o $@ \
|
|
$(WINDOWS_SRC) $(GENERATED_WINDOWS_C) $(WINDOWS_BUNDLE_RUNTIME) \
|
|
$(SQLITE_SRC) \
|
|
$(WIN64_WEBP_A) \
|
|
$(WIN64_AVIF_A) \
|
|
$(WIN64_AOM_A) \
|
|
$(WIN64_CURL_A) \
|
|
$(WIN64_LIBOQS_A) \
|
|
$(WIN64_MP3_A) $(WIN64_VORBIS_LIBS) \
|
|
$(WIN64_OPUS_A) -lssp \
|
|
$(WIN64_DESKTOP_LIBS) \
|
|
$(WIN64_RESOURCE) $(WINDOWS_LDLIBS) \
|
|
$(WIN64_THREAD_LDFLAGS) \
|
|
$(WINDOWS_LDFLAGS)
|
|
$(WIN64_STRIP) $@
|
|
|
|
windows-runtime-assets-check:
|
|
@:
|
|
|
|
windows64: windows-runtime-assets-check $(WIN64_TARGET)
|
|
|
|
# Windows ships for x86_64 only. 32-bit Windows needs stdcall Win32 calls,
|
|
# which Ziran's C output does not emit.
|
|
# The executable sits in bin/ beside the desktop libraries' DLLs, with their
|
|
# fontconfig data in etc/ and licenses in share/.
|
|
WIN64_PACKAGE_DIR := $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)/package
|
|
|
|
windows-package: windows64 $(WIN64_DESKTOP_RUNTIME)
|
|
rm -rf $(WIN64_PACKAGE_DIR)
|
|
mkdir -p $(WIN64_PACKAGE_DIR)
|
|
tar -xf $(WIN64_DESKTOP_RUNTIME) -C $(WIN64_PACKAGE_DIR)
|
|
cp $(WIN64_TARGET) $(WIN64_PACKAGE_DIR)/bin/$(WIN64_BINARY_NAME)
|
|
|
|
windows: windows-package
|
|
mkdir -p $(WINDOWS_DIST_DIR)
|
|
rm -f $(WINDOWS_DIST_DIR)/$(APP_NAME)-windows-*.zip
|
|
rm -f $(WINDOWS_DIST)
|
|
cd $(WIN64_PACKAGE_DIR) && zip -9 -r $(abspath $(WINDOWS_DIST)) bin etc share
|
|
|
|
WINDOWS_SETUP := $(WINDOWS_DIST_DIR)/$(APP_NAME)-windows-setup-$(APP_VERSION).exe
|
|
WINDOWS_SETUP_SCRIPT := packaging/windows/$(APP_NAME)-setup.nsi
|
|
|
|
windows-setup-check:
|
|
@command -v makensis >/dev/null || { \
|
|
echo "makensis is missing. Install NSIS (apt install nsis)."; \
|
|
exit 1; \
|
|
}
|
|
|
|
windows-setup: windows windows-setup-check
|
|
rm -f $(WINDOWS_SETUP)
|
|
makensis -DVERSION=$(APP_VERSION) \
|
|
-DPACKAGE_DIR=$(abspath $(WIN64_PACKAGE_DIR)) \
|
|
-DOUT=$(abspath $(WINDOWS_SETUP)) $(WINDOWS_SETUP_SCRIPT)
|
|
test -f $(WINDOWS_SETUP)
|