From de007125f2d304a6da9ef6b02dec41e85e3fd967 Mon Sep 17 00:00:00 2001 From: Vladyslav Hrytsenko Date: Sat, 21 Oct 2023 16:48:52 +0300 Subject: [PATCH] added mac make --- MAKE.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/MAKE.sh b/MAKE.sh index 1c9c983..33f36d5 100755 --- a/MAKE.sh +++ b/MAKE.sh @@ -215,12 +215,24 @@ if [ "$(uname)" = "Darwin" ]; then chmod +x tools/ninja.osx chmod +x demos/lua/luajit.osx - export args="-w -Iengine/ -framework cocoa -framework iokit -framework CoreFoundation -framework CoreAudio -framework AudioToolbox $args" + 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 + fi + # User-defined apps if [ -n "$app" ]; then - echo "$app" && $cc -ObjC "$app" engine/v4k.c $args -o "v4k.osx" || rc=1 + echo "$app" && $cc -ObjC "$app" libv4k.dylib $args -o "v4k.osx" || rc=1 + # echo "$app" && $cc -ObjC "$app" engine/v4k.c $args -o "v4k.osx" || rc=1 fi # if [ "$run" == "yes" ]; then @@ -233,17 +245,6 @@ if [ "$(uname)" = "Darwin" ]; then # fi - # # 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 - # # editor # echo editor && cc -o editor tools/editor/editor.c $import $flags $args &