diff --git a/Makefile b/Makefile index 117052c1a..956a4fef2 100644 --- a/Makefile +++ b/Makefile @@ -259,10 +259,9 @@ KRYON_WEB_SRCS := $(KRYON_SRCS) KRYON_WEB_SRCS := $(filter-out $(KRYON_DIR)/src/backend/dom_%.c,$(KRYON_WEB_SRCS)) KRYON_WINDOWS_SRCS := $(filter-out $(KRYON_DIR)/src/file_dialog/file_dialog.c,$(KRYON_SRCS)) KRYON_CLICK_SRCS := $(filter-out $(KRYON_DIR)/src/file_dialog/file_dialog.c,$(KRYON_SRCS)) -KRYON_INCLUDE := -I$(KRYON_GENERATED_INCLUDE_DIR) -I$(KRYON_GENERATED_SRC_DIR) -I$(KRYON_DIR)/include -I$(KRYON_DIR)/src/ui -I$(KRYON_DIR)/src/platform -I$(KRYON_DIR)/src/backend -I$(KRYON_GENERATED_SRC_DIR)/runtime -I$(KRYON_DIR)/vendor/utf8proc -DUTF8PROC_STATIC -I$(KRYON_DIR)/build/packages/monocypher/src -I$(KRYON_DIR)/build/packages/monocypher/src/optional +KRYON_INCLUDE := -I$(KRYON_GENERATED_INCLUDE_DIR) -I$(KRYON_GENERATED_SRC_DIR) -I$(KRYON_DIR)/include -I$(KRYON_DIR)/src/ui -I$(KRYON_DIR)/src/platform -I$(KRYON_DIR)/src/backend -I$(KRYON_GENERATED_SRC_DIR)/runtime KRYON_INCLUDE += -I$(ZIRAN_DIR)/include KRYON_SYNC_ACCOUNT_C := $(KRYON_DIR)/src/sync/sync_account.c -KRYON_SYNC_CRYPTO_C := $(KRYON_DIR)/src/sync/sync_crypto.c $(KRYON_DIR)/src/sync/monocypher.c $(KRYON_DIR)/src/sync/monocypher_ed25519.c KRYON_SYNC_C := $(KRYON_DIR)/src/sync/sync.c KRYON_SYNC_TRANSPORT_C := $(KRYON_DIR)/src/sync/sync_transport.c KRYON_SYNC_ACCOUNT_H := $(KRYON_DIR)/include/sync/account.h diff --git a/scripts/build-firefox-addons-source-zip.sh b/scripts/build-firefox-addons-source-zip.sh index 8ee03f481..79c2d3d18 100755 --- a/scripts/build-firefox-addons-source-zip.sh +++ b/scripts/build-firefox-addons-source-zip.sh @@ -78,11 +78,11 @@ rm -f "$OUT_ABS" '*/build/packages/sqlite/test/*' \ '*/build/packages/kryon/docs/site/*' \ '*/build/packages/kryon/fonts/noto/*' \ - '*/build/packages/kryon/vendor/liboqs/docs/*' \ - '*/build/packages/kryon/vendor/liboqs/tests/*' \ - '*/build/packages/kryon/vendor/raylib/examples/*' \ - '*/build/packages/kryon/vendor/raylib/logo/*' \ - '*/build/packages/kryon/vendor/raylib/projects/*' \ + '*/build/packages/liboqs/docs/*' \ + '*/build/packages/liboqs/tests/*' \ + '*/build/packages/raylib/examples/*' \ + '*/build/packages/raylib/logo/*' \ + '*/build/packages/raylib/projects/*' \ '*/tmp/*' ) diff --git a/scripts/seed-package-sources.py b/scripts/seed-package-sources.py index 6d5c53178..5b8592a12 100644 --- a/scripts/seed-package-sources.py +++ b/scripts/seed-package-sources.py @@ -11,8 +11,8 @@ package name in: $ZIRAN_PACKAGE_SOURCES when set ../srclib F-Droid's srclib layout, when present -Submodules of a seeded package (Kryon's vendor/raylib) are filled from a local -source with the submodule's name the same way. Anything not found is left for +Submodules of a seeded package are filled from a local source with the +submodule's name the same way. Anything not found is left for `ziran fetch` to download, and a checkout without the locked commit is never used. """ diff --git a/tests/secondary_window_host_zi_test.sh b/tests/secondary_window_host_zi_test.sh index a97567030..c697cdf21 100644 --- a/tests/secondary_window_host_zi_test.sh +++ b/tests/secondary_window_host_zi_test.sh @@ -16,7 +16,7 @@ export PKG_CONFIG_PATH="/home/wao/.local/sdl2/lib/pkgconfig${PKG_CONFIG_PATH:+:$ # shellcheck disable=SC2046 "${CC:-cc}" -std=c11 -Wall -Wextra \ -I"$root/build/packages/ziran/include" -iquote "$work/c" \ - -I"$root/build/packages/kryon/vendor/raylib/src" $(pkg-config --cflags sdl2) \ + -I"$root/build/packages/raylib/src" $(pkg-config --cflags sdl2) \ "$root/tests/secondary_window_host_test.c" \ "$work/c/platform/secondary_window_host.c" "$raylib" \ $(pkg-config --libs sdl2) -lGL -lm -ldl -lpthread -o "$work/test"