From fd090c6672ee85df16679e2e7c5ccc1908d6bbbf Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:00:02 -0500 Subject: adding linux + unix makefile for cgltf --- vendor/cgltf/cgltf.odin | 10 +++++----- vendor/cgltf/src/Makefile | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 vendor/cgltf/src/Makefile diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index 6e05c0b90..e244bc30c 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -1,12 +1,12 @@ -//+build windows package cgltf -when ODIN_OS == .Windows { - foreign import lib "lib/cgltf.lib" -} - import "core:c" +when ODIN_OS == .Windows { foreign import lib "lib/cgltf.lib" } +else when ODIN_OS == .Linux { foreign import lib "../lib/cgltf.a" } +else when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/cgltf.a" } +else { foreign import lib "system:cgltf" } + file_type :: enum c.int { invalid, diff --git a/vendor/cgltf/src/Makefile b/vendor/cgltf/src/Makefile new file mode 100644 index 000000000..d359c4739 --- /dev/null +++ b/vendor/cgltf/src/Makefile @@ -0,0 +1,20 @@ +OS=$(shell uname) + +ifeq ($(OS), Darwin) +all: darwin +else +all: unix +endif + +unix: + mkdir -p ../lib + $(CC) -c -O2 -Os -fPIC cgltf.c + $(AR) rcs ../lib/cgltf.a cgltf.o + rm *.o + +darwin: + mkdir -p ../lib + $(CC) -arch x86_64 -c -O2 -Os -fPIC cgltf.c -o cgltf-x86_64.o -mmacosx-version-min=10.12 + $(CC) -arch arm64 -c -O2 -Os -fPIC cgltf.c -o cgltf-arm64.o -mmacosx-version-min=10.12 + lipo -create cgltf-x86_64.o cgltf-arm64.o -output ../lib/darwin/cgltf.a + rm *.o -- cgit v1.2.3 From 4956f9dad39a083ca46ae1f6904086702854ea81 Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:04:43 -0500 Subject: fix typo --- vendor/cgltf/cgltf.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index e244bc30c..5e7f16b50 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -3,8 +3,8 @@ package cgltf import "core:c" when ODIN_OS == .Windows { foreign import lib "lib/cgltf.lib" } -else when ODIN_OS == .Linux { foreign import lib "../lib/cgltf.a" } -else when ODIN_OS == .Darwin { foreign import lib "../lib/darwin/cgltf.a" } +else when ODIN_OS == .Linux { foreign import lib "lib/cgltf.a" } +else when ODIN_OS == .Darwin { foreign import lib "lib/darwin/cgltf.a" } else { foreign import lib "system:cgltf" } -- cgit v1.2.3 From ab68e4c6c40c0f661a7ca45c0ebeedaccf9d8319 Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:06:58 -0500 Subject: change ordering --- vendor/cgltf/cgltf.odin | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index 5e7f16b50..595fe4640 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -1,12 +1,11 @@ package cgltf -import "core:c" - when ODIN_OS == .Windows { foreign import lib "lib/cgltf.lib" } else when ODIN_OS == .Linux { foreign import lib "lib/cgltf.a" } else when ODIN_OS == .Darwin { foreign import lib "lib/darwin/cgltf.a" } else { foreign import lib "system:cgltf" } +import "core:c" file_type :: enum c.int { invalid, -- cgit v1.2.3 From 594078cc1d8b10e4f0baa256dd213ded38bb582e Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:08:14 -0500 Subject: fix whitespace --- core/math/linalg/glsl/linalg_glsl.odin | 2 +- vendor/cgltf/cgltf.odin | 1 + vendor/cgltf/lib/cgltf.a | Bin 0 -> 115048 bytes vendor/stb/lib/stb_image.a | Bin 0 -> 95722 bytes vendor/stb/lib/stb_image_resize.a | Bin 0 -> 34524 bytes vendor/stb/lib/stb_image_write.a | Bin 0 -> 32798 bytes vendor/stb/lib/stb_rect_pack.a | Bin 0 -> 5090 bytes vendor/stb/lib/stb_truetype.a | Bin 0 -> 64272 bytes 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 vendor/cgltf/lib/cgltf.a create mode 100644 vendor/stb/lib/stb_image.a create mode 100644 vendor/stb/lib/stb_image_resize.a create mode 100644 vendor/stb/lib/stb_image_write.a create mode 100644 vendor/stb/lib/stb_rect_pack.a create mode 100644 vendor/stb/lib/stb_truetype.a diff --git a/core/math/linalg/glsl/linalg_glsl.odin b/core/math/linalg/glsl/linalg_glsl.odin index 0d91ad4a3..a0940590f 100644 --- a/core/math/linalg/glsl/linalg_glsl.odin +++ b/core/math/linalg/glsl/linalg_glsl.odin @@ -1864,4 +1864,4 @@ adjugate :: builtin.adjugate hermitian_adjoint :: builtin.hermitian_adjoint minor :: builtin.matrix_minor determinant :: builtin.determinant -trace :: builtin.matrix_trace \ No newline at end of file +trace :: builtin.matrix_trace diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index 595fe4640..99fa24049 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -7,6 +7,7 @@ else { foreign import lib "system:cgltf" } import "core:c" + file_type :: enum c.int { invalid, gltf, diff --git a/vendor/cgltf/lib/cgltf.a b/vendor/cgltf/lib/cgltf.a new file mode 100644 index 000000000..138aefefc Binary files /dev/null and b/vendor/cgltf/lib/cgltf.a differ diff --git a/vendor/stb/lib/stb_image.a b/vendor/stb/lib/stb_image.a new file mode 100644 index 000000000..58161b20c Binary files /dev/null and b/vendor/stb/lib/stb_image.a differ diff --git a/vendor/stb/lib/stb_image_resize.a b/vendor/stb/lib/stb_image_resize.a new file mode 100644 index 000000000..53222dced Binary files /dev/null and b/vendor/stb/lib/stb_image_resize.a differ diff --git a/vendor/stb/lib/stb_image_write.a b/vendor/stb/lib/stb_image_write.a new file mode 100644 index 000000000..0a5d511cf Binary files /dev/null and b/vendor/stb/lib/stb_image_write.a differ diff --git a/vendor/stb/lib/stb_rect_pack.a b/vendor/stb/lib/stb_rect_pack.a new file mode 100644 index 000000000..2f215da5e Binary files /dev/null and b/vendor/stb/lib/stb_rect_pack.a differ diff --git a/vendor/stb/lib/stb_truetype.a b/vendor/stb/lib/stb_truetype.a new file mode 100644 index 000000000..ee58e7e2d Binary files /dev/null and b/vendor/stb/lib/stb_truetype.a differ -- cgit v1.2.3 From 29d4bdc80b306a28ca6a1a39da2d6418ccf4443c Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:09:08 -0500 Subject: Revert "fix whitespace" This reverts commit 594078cc1d8b10e4f0baa256dd213ded38bb582e. --- core/math/linalg/glsl/linalg_glsl.odin | 2 +- vendor/cgltf/cgltf.odin | 1 - vendor/cgltf/lib/cgltf.a | Bin 115048 -> 0 bytes vendor/stb/lib/stb_image.a | Bin 95722 -> 0 bytes vendor/stb/lib/stb_image_resize.a | Bin 34524 -> 0 bytes vendor/stb/lib/stb_image_write.a | Bin 32798 -> 0 bytes vendor/stb/lib/stb_rect_pack.a | Bin 5090 -> 0 bytes vendor/stb/lib/stb_truetype.a | Bin 64272 -> 0 bytes 8 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 vendor/cgltf/lib/cgltf.a delete mode 100644 vendor/stb/lib/stb_image.a delete mode 100644 vendor/stb/lib/stb_image_resize.a delete mode 100644 vendor/stb/lib/stb_image_write.a delete mode 100644 vendor/stb/lib/stb_rect_pack.a delete mode 100644 vendor/stb/lib/stb_truetype.a diff --git a/core/math/linalg/glsl/linalg_glsl.odin b/core/math/linalg/glsl/linalg_glsl.odin index a0940590f..0d91ad4a3 100644 --- a/core/math/linalg/glsl/linalg_glsl.odin +++ b/core/math/linalg/glsl/linalg_glsl.odin @@ -1864,4 +1864,4 @@ adjugate :: builtin.adjugate hermitian_adjoint :: builtin.hermitian_adjoint minor :: builtin.matrix_minor determinant :: builtin.determinant -trace :: builtin.matrix_trace +trace :: builtin.matrix_trace \ No newline at end of file diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index 99fa24049..595fe4640 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -7,7 +7,6 @@ else { foreign import lib "system:cgltf" } import "core:c" - file_type :: enum c.int { invalid, gltf, diff --git a/vendor/cgltf/lib/cgltf.a b/vendor/cgltf/lib/cgltf.a deleted file mode 100644 index 138aefefc..000000000 Binary files a/vendor/cgltf/lib/cgltf.a and /dev/null differ diff --git a/vendor/stb/lib/stb_image.a b/vendor/stb/lib/stb_image.a deleted file mode 100644 index 58161b20c..000000000 Binary files a/vendor/stb/lib/stb_image.a and /dev/null differ diff --git a/vendor/stb/lib/stb_image_resize.a b/vendor/stb/lib/stb_image_resize.a deleted file mode 100644 index 53222dced..000000000 Binary files a/vendor/stb/lib/stb_image_resize.a and /dev/null differ diff --git a/vendor/stb/lib/stb_image_write.a b/vendor/stb/lib/stb_image_write.a deleted file mode 100644 index 0a5d511cf..000000000 Binary files a/vendor/stb/lib/stb_image_write.a and /dev/null differ diff --git a/vendor/stb/lib/stb_rect_pack.a b/vendor/stb/lib/stb_rect_pack.a deleted file mode 100644 index 2f215da5e..000000000 Binary files a/vendor/stb/lib/stb_rect_pack.a and /dev/null differ diff --git a/vendor/stb/lib/stb_truetype.a b/vendor/stb/lib/stb_truetype.a deleted file mode 100644 index ee58e7e2d..000000000 Binary files a/vendor/stb/lib/stb_truetype.a and /dev/null differ -- cgit v1.2.3 From 89404147f65b1703f50f9d56cabf8752447cdb8c Mon Sep 17 00:00:00 2001 From: Gabriel Pariat Date: Sat, 27 Jan 2024 14:10:32 -0500 Subject: fix whitespace --- vendor/cgltf/cgltf.odin | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/cgltf/cgltf.odin b/vendor/cgltf/cgltf.odin index 595fe4640..99fa24049 100644 --- a/vendor/cgltf/cgltf.odin +++ b/vendor/cgltf/cgltf.odin @@ -7,6 +7,7 @@ else { foreign import lib "system:cgltf" } import "core:c" + file_type :: enum c.int { invalid, gltf, -- cgit v1.2.3 From b539bb26935a29a4c59b8d241f76eb352e94f839 Mon Sep 17 00:00:00 2001 From: Pariatech <145340081+Pariatech@users.noreply.github.com> Date: Wed, 13 Mar 2024 07:37:42 -0400 Subject: Update vendor/cgltf/src/Makefile missing darwin folder Co-authored-by: Laytan --- vendor/cgltf/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/cgltf/src/Makefile b/vendor/cgltf/src/Makefile index d359c4739..ede3d158e 100644 --- a/vendor/cgltf/src/Makefile +++ b/vendor/cgltf/src/Makefile @@ -13,7 +13,7 @@ unix: rm *.o darwin: - mkdir -p ../lib + mkdir -p ../lib/darwin $(CC) -arch x86_64 -c -O2 -Os -fPIC cgltf.c -o cgltf-x86_64.o -mmacosx-version-min=10.12 $(CC) -arch arm64 -c -O2 -Os -fPIC cgltf.c -o cgltf-arm64.o -mmacosx-version-min=10.12 lipo -create cgltf-x86_64.o cgltf-arm64.o -output ../lib/darwin/cgltf.a -- cgit v1.2.3