Drop paths into the removed vendor trees
Kryon no longer vendors utf8proc, Monocypher, liboqs, or raylib; each is its own Ziran package. The native build stops passing include paths and a sync crypto list that point into Kryon's old vendor tree, the secondary window test reads raylib's headers from its package, and the Firefox add-on source zip leaves out liboqs's and raylib's docs, tests, and examples from their package folders.
This commit is contained in:
1 parent
9715467d7f
commit
250938e668
4 files changed
+9
-10
No files matched your search
@@ -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
|
||||
|
||||
@@ -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/*'
|
||||
)
|
||||
|
||||
|
||||
@@ -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.
|
||||
"""
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user