sync depot

main
Dominik Madarász 2024-08-07 10:53:55 +02:00
commit 81c497c237
3 changed files with 13 additions and 10 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ tools/assimp/
v4k.code-workspace
tests/out
tests/diff
mtb.ini

20
MAKE.sh
View File

@ -222,15 +222,17 @@ if [ "$(uname)" = "Darwin" ]; then
export args="-w -Iengine/ -framework cocoa -framework iokit -framework CoreFoundation -framework CoreAudio -framework AudioToolbox $args $flags"
echo build=$build, type=$dll, cc=$cc, args=$args
# framework (as dynamic library)
if [ "$dll" = "dll" ]; then
echo libv4k && cc -ObjC -dynamiclib -o libv4k.dylib engine/v4k.c $flags $args
cp libv4k.dylib demos/lua
export import=libv4k.dylib
else
# framework
echo v4k && cc -c -ObjC engine/v4k.c $flags $args
export import=v4k.o
if [ ! -f libv4k.dylib ]; then
# framework (as dynamic library)
if [ "$dll" = "dll" ]; then
echo libv4k && cc -ObjC -dynamiclib -o libv4k.dylib engine/v4k.c $flags $args
cp libv4k.dylib demos/lua
export import=libv4k.dylib
else
# framework
echo v4k && cc -c -ObjC engine/v4k.c $flags $args
export import=v4k.o
fi
fi
# User-defined apps

2
depot

@ -1 +1 @@
Subproject commit a5a6e91459692414ab3589db6f19ac1a92a56a21
Subproject commit d971c6bfdfddbb39dd4f4cb233e48419dd4aedc3