From 0ca8a5e1868b1d1b25beb828c380d71f583c6678 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Wed, 21 Sep 2022 16:45:01 +0200 Subject: [PATCH] Add vendor:zlib to examples/all; prefix vendor packages. --- examples/all/all_vendor.odin | 47 +++++++++++++++------------ vendor/OpenGL/constants.odin | 2 +- vendor/OpenGL/enums.odin | 2 +- vendor/OpenGL/helpers.odin | 2 +- vendor/OpenGL/impl.odin | 2 +- vendor/OpenGL/wrappers.odin | 2 +- vendor/botan/bindings/botan.odin | 2 +- vendor/botan/blake2b/blake2b.odin | 2 +- vendor/botan/gost/gost.odin | 2 +- vendor/botan/keccak/keccak.odin | 2 +- vendor/botan/md4/md4.odin | 2 +- vendor/botan/md5/md5.odin | 2 +- vendor/botan/ripemd/ripemd.odin | 2 +- vendor/botan/sha1/sha1.odin | 2 +- vendor/botan/sha2/sha2.odin | 2 +- vendor/botan/sha3/sha3.odin | 2 +- vendor/botan/shake/shake.odin | 2 +- vendor/botan/siphash/siphash.odin | 2 +- vendor/botan/skein512/skein512.odin | 2 +- vendor/botan/sm3/sm3.odin | 2 +- vendor/botan/streebog/streebog.odin | 2 +- vendor/botan/tiger/tiger.odin | 2 +- vendor/botan/whirlpool/whirlpool.odin | 2 +- vendor/commonmark/cmark.odin | 2 +- vendor/commonmark/doc.odin | 2 +- vendor/ggpo/ggpo.odin | 2 +- vendor/zlib/zlib.odin | 2 +- 27 files changed, 53 insertions(+), 46 deletions(-) diff --git a/examples/all/all_vendor.odin b/examples/all/all_vendor.odin index 7da2e501b..11fcfeac6 100644 --- a/examples/all/all_vendor.odin +++ b/examples/all/all_vendor.odin @@ -1,29 +1,32 @@ package all -import botan "vendor:botan" -import ENet "vendor:ENet" -import ggpo "vendor:ggpo" -import gl "vendor:OpenGL" -import glfw "vendor:glfw" -import microui "vendor:microui" -import miniaudio "vendor:miniaudio" -import PM "vendor:portmidi" -import rl "vendor:raylib" -import exr "vendor:OpenEXRCore" +import botan "vendor:botan" +import cm "vendor:commonmark" +import ENet "vendor:ENet" +import ggpo "vendor:ggpo" +import gl "vendor:OpenGL" +import glfw "vendor:glfw" +import microui "vendor:microui" +import miniaudio "vendor:miniaudio" +import PM "vendor:portmidi" +import rl "vendor:raylib" +import exr "vendor:OpenEXRCore" +import zlib "vendor:zlib" -import SDL "vendor:sdl2" -import SDLNet "vendor:sdl2/net" -import IMG "vendor:sdl2/image" -import MIX "vendor:sdl2/mixer" -import TTF "vendor:sdl2/ttf" +import SDL "vendor:sdl2" +import SDLNet "vendor:sdl2/net" +import IMG "vendor:sdl2/image" +import MIX "vendor:sdl2/mixer" +import TTF "vendor:sdl2/ttf" -import vk "vendor:vulkan" +import vk "vendor:vulkan" -import NS "vendor:darwin/Foundation" -import MTL "vendor:darwin/Metal" -import CA "vendor:darwin/QuartzCore" +import NS "vendor:darwin/Foundation" +import MTL "vendor:darwin/Metal" +import CA "vendor:darwin/QuartzCore" _ :: botan +_ :: cm _ :: ENet _ :: ggpo _ :: gl @@ -33,12 +36,16 @@ _ :: miniaudio _ :: PM _ :: rl _ :: exr +_ :: zlib + _ :: SDL _ :: SDLNet _ :: IMG _ :: MIX _ :: TTF + _ :: vk + _ :: NS _ :: MTL -_ :: CA +_ :: CA \ No newline at end of file diff --git a/vendor/OpenGL/constants.odin b/vendor/OpenGL/constants.odin index c7d8b9542..798cf2cde 100644 --- a/vendor/OpenGL/constants.odin +++ b/vendor/OpenGL/constants.odin @@ -1,4 +1,4 @@ -package odin_gl +package vendor_gl GL_DEBUG :: #config(GL_DEBUG, ODIN_DEBUG) diff --git a/vendor/OpenGL/enums.odin b/vendor/OpenGL/enums.odin index 3802b7e76..8583ce4fb 100644 --- a/vendor/OpenGL/enums.odin +++ b/vendor/OpenGL/enums.odin @@ -1,4 +1,4 @@ -package odin_gl +package vendor_gl GL_Enum :: enum u64 { FALSE = 0, diff --git a/vendor/OpenGL/helpers.odin b/vendor/OpenGL/helpers.odin index 61c68ace5..900710f3d 100644 --- a/vendor/OpenGL/helpers.odin +++ b/vendor/OpenGL/helpers.odin @@ -1,4 +1,4 @@ -package odin_gl +package vendor_gl // Helper for loading shaders into a program diff --git a/vendor/OpenGL/impl.odin b/vendor/OpenGL/impl.odin index e9adda4bd..783b509a0 100644 --- a/vendor/OpenGL/impl.odin +++ b/vendor/OpenGL/impl.odin @@ -1,4 +1,4 @@ -package odin_gl +package vendor_gl loaded_up_to: [2]int loaded_up_to_major := 0 diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin index ba6ff369c..46511c7d7 100644 --- a/vendor/OpenGL/wrappers.odin +++ b/vendor/OpenGL/wrappers.odin @@ -1,4 +1,4 @@ -package odin_gl +package vendor_gl #assert(size_of(bool) == size_of(u8)) diff --git a/vendor/botan/bindings/botan.odin b/vendor/botan/bindings/botan.odin index a12706e95..2217eda5a 100644 --- a/vendor/botan/bindings/botan.odin +++ b/vendor/botan/bindings/botan.odin @@ -1,4 +1,4 @@ -package botan_bindings +package vendor_botan /* Copyright 2021 zhibog diff --git a/vendor/botan/blake2b/blake2b.odin b/vendor/botan/blake2b/blake2b.odin index 67238ec74..18fd89bd8 100644 --- a/vendor/botan/blake2b/blake2b.odin +++ b/vendor/botan/blake2b/blake2b.odin @@ -1,4 +1,4 @@ -package botan_blake2b +package vendor_botan_blake2b /* Copyright 2021 zhibog diff --git a/vendor/botan/gost/gost.odin b/vendor/botan/gost/gost.odin index 6bf1c5b97..bccc4d463 100644 --- a/vendor/botan/gost/gost.odin +++ b/vendor/botan/gost/gost.odin @@ -1,4 +1,4 @@ -package gost +package vendor_gost /* Copyright 2021 zhibog diff --git a/vendor/botan/keccak/keccak.odin b/vendor/botan/keccak/keccak.odin index 28e7374ba..4c82edc92 100644 --- a/vendor/botan/keccak/keccak.odin +++ b/vendor/botan/keccak/keccak.odin @@ -1,4 +1,4 @@ -package keccak +package vendor_keccak /* Copyright 2021 zhibog diff --git a/vendor/botan/md4/md4.odin b/vendor/botan/md4/md4.odin index 174676a82..ddb7d5940 100644 --- a/vendor/botan/md4/md4.odin +++ b/vendor/botan/md4/md4.odin @@ -1,4 +1,4 @@ -package md4 +package vendor_md4 /* Copyright 2021 zhibog diff --git a/vendor/botan/md5/md5.odin b/vendor/botan/md5/md5.odin index 01e099062..9ea489669 100644 --- a/vendor/botan/md5/md5.odin +++ b/vendor/botan/md5/md5.odin @@ -1,4 +1,4 @@ -package md5 +package vendor_md5 /* Copyright 2021 zhibog diff --git a/vendor/botan/ripemd/ripemd.odin b/vendor/botan/ripemd/ripemd.odin index 230e4c0d9..33f0ba692 100644 --- a/vendor/botan/ripemd/ripemd.odin +++ b/vendor/botan/ripemd/ripemd.odin @@ -1,4 +1,4 @@ -package ripemd +package vendor_ripemd /* Copyright 2021 zhibog diff --git a/vendor/botan/sha1/sha1.odin b/vendor/botan/sha1/sha1.odin index 1f74c8fc2..96520f09e 100644 --- a/vendor/botan/sha1/sha1.odin +++ b/vendor/botan/sha1/sha1.odin @@ -1,4 +1,4 @@ -package sha1 +package vendor_sha1 /* Copyright 2021 zhibog diff --git a/vendor/botan/sha2/sha2.odin b/vendor/botan/sha2/sha2.odin index 4c201cc26..d583298ee 100644 --- a/vendor/botan/sha2/sha2.odin +++ b/vendor/botan/sha2/sha2.odin @@ -1,4 +1,4 @@ -package sha2 +package vendor_sha2 /* Copyright 2021 zhibog diff --git a/vendor/botan/sha3/sha3.odin b/vendor/botan/sha3/sha3.odin index 4c1b87dda..5f82be49c 100644 --- a/vendor/botan/sha3/sha3.odin +++ b/vendor/botan/sha3/sha3.odin @@ -1,4 +1,4 @@ -package sha3 +package vendor_sha3 /* Copyright 2021 zhibog diff --git a/vendor/botan/shake/shake.odin b/vendor/botan/shake/shake.odin index f1023b90e..b973fee24 100644 --- a/vendor/botan/shake/shake.odin +++ b/vendor/botan/shake/shake.odin @@ -1,4 +1,4 @@ -package shake +package vendor_shake /* Copyright 2021 zhibog diff --git a/vendor/botan/siphash/siphash.odin b/vendor/botan/siphash/siphash.odin index c2b7b64f4..81ac71cd5 100644 --- a/vendor/botan/siphash/siphash.odin +++ b/vendor/botan/siphash/siphash.odin @@ -1,4 +1,4 @@ -package siphash +package vendor_siphash /* Copyright 2022 zhibog diff --git a/vendor/botan/skein512/skein512.odin b/vendor/botan/skein512/skein512.odin index 4fed07853..41ffaefff 100644 --- a/vendor/botan/skein512/skein512.odin +++ b/vendor/botan/skein512/skein512.odin @@ -1,4 +1,4 @@ -package skein512 +package vendor_skein512 /* Copyright 2021 zhibog diff --git a/vendor/botan/sm3/sm3.odin b/vendor/botan/sm3/sm3.odin index 75cf40679..52fe9a488 100644 --- a/vendor/botan/sm3/sm3.odin +++ b/vendor/botan/sm3/sm3.odin @@ -1,4 +1,4 @@ -package sm3 +package vendor_sm3 /* Copyright 2021 zhibog diff --git a/vendor/botan/streebog/streebog.odin b/vendor/botan/streebog/streebog.odin index 20b4e6adb..fdc07923f 100644 --- a/vendor/botan/streebog/streebog.odin +++ b/vendor/botan/streebog/streebog.odin @@ -1,4 +1,4 @@ -package streebog +package vendor_streebog /* Copyright 2021 zhibog diff --git a/vendor/botan/tiger/tiger.odin b/vendor/botan/tiger/tiger.odin index f24dc7019..3d7e064d0 100644 --- a/vendor/botan/tiger/tiger.odin +++ b/vendor/botan/tiger/tiger.odin @@ -1,4 +1,4 @@ -package tiger +package vendor_tiger /* Copyright 2021 zhibog diff --git a/vendor/botan/whirlpool/whirlpool.odin b/vendor/botan/whirlpool/whirlpool.odin index a7c1abbe8..c32ff20c0 100644 --- a/vendor/botan/whirlpool/whirlpool.odin +++ b/vendor/botan/whirlpool/whirlpool.odin @@ -1,4 +1,4 @@ -package whirlpool +package vendor_whirlpool /* Copyright 2021 zhibog diff --git a/vendor/commonmark/cmark.odin b/vendor/commonmark/cmark.odin index 313435870..fba12436d 100644 --- a/vendor/commonmark/cmark.odin +++ b/vendor/commonmark/cmark.odin @@ -4,7 +4,7 @@ Original authors: John MacFarlane, Vicent Marti, Kārlis Gaņģis, Nick Wellnhofer. See LICENSE for license details. */ -package commonmark +package vendor_commonmark import "core:c" import "core:c/libc" diff --git a/vendor/commonmark/doc.odin b/vendor/commonmark/doc.odin index 24f6780f3..f37dc8153 100644 --- a/vendor/commonmark/doc.odin +++ b/vendor/commonmark/doc.odin @@ -5,7 +5,7 @@ Original authors: John MacFarlane, Vicent Marti, Kārlis Gaņģis, Nick Wellnhofer. See LICENSE for license details. */ -package commonmark +package vendor_commonmark /* Parsing - Simple interface: diff --git a/vendor/ggpo/ggpo.odin b/vendor/ggpo/ggpo.odin index c727e4a67..d17c33638 100644 --- a/vendor/ggpo/ggpo.odin +++ b/vendor/ggpo/ggpo.odin @@ -1,4 +1,4 @@ -package ggpo +package vendor_ggpo foreign import lib "GGPO.lib" diff --git a/vendor/zlib/zlib.odin b/vendor/zlib/zlib.odin index f5357d28e..8a046a401 100644 --- a/vendor/zlib/zlib.odin +++ b/vendor/zlib/zlib.odin @@ -1,4 +1,4 @@ -package zlib +package vendor_zlib import "core:c"