sync depot
commit
81c497c237
|
@ -27,3 +27,4 @@ tools/assimp/
|
||||||
v4k.code-workspace
|
v4k.code-workspace
|
||||||
tests/out
|
tests/out
|
||||||
tests/diff
|
tests/diff
|
||||||
|
mtb.ini
|
||||||
|
|
20
MAKE.sh
20
MAKE.sh
|
@ -222,15 +222,17 @@ if [ "$(uname)" = "Darwin" ]; then
|
||||||
export args="-w -Iengine/ -framework cocoa -framework iokit -framework CoreFoundation -framework CoreAudio -framework AudioToolbox $args $flags"
|
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
|
echo build=$build, type=$dll, cc=$cc, args=$args
|
||||||
|
|
||||||
# framework (as dynamic library)
|
if [ ! -f libv4k.dylib ]; then
|
||||||
if [ "$dll" = "dll" ]; then
|
# framework (as dynamic library)
|
||||||
echo libv4k && cc -ObjC -dynamiclib -o libv4k.dylib engine/v4k.c $flags $args
|
if [ "$dll" = "dll" ]; then
|
||||||
cp libv4k.dylib demos/lua
|
echo libv4k && cc -ObjC -dynamiclib -o libv4k.dylib engine/v4k.c $flags $args
|
||||||
export import=libv4k.dylib
|
cp libv4k.dylib demos/lua
|
||||||
else
|
export import=libv4k.dylib
|
||||||
# framework
|
else
|
||||||
echo v4k && cc -c -ObjC engine/v4k.c $flags $args
|
# framework
|
||||||
export import=v4k.o
|
echo v4k && cc -c -ObjC engine/v4k.c $flags $args
|
||||||
|
export import=v4k.o
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# User-defined apps
|
# User-defined apps
|
||||||
|
|
2
depot
2
depot
|
@ -1 +1 @@
|
||||||
Subproject commit a5a6e91459692414ab3589db6f19ac1a92a56a21
|
Subproject commit d971c6bfdfddbb39dd4f4cb233e48419dd4aedc3
|
Loading…
Reference in New Issue