diff --git a/Makefile b/Makefile index 28a9bb42d..7bf075bb6 100644 --- a/Makefile +++ b/Makefile @@ -4,21 +4,18 @@ BUILDTYPE ?= Release PYTHON ?= python V ?= 1 -all: out/Makefile llmr +all: llmr -config.gypi: configure - $(PYTHON) ./configure - -llmr: config.gypi out/Makefile llmr.gyp +llmr: config.gypi src llmr.gyp $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-osx # build OS X app with pure make app: config.gypi src macosx/llmr-app.gyp deps/run_gyp macosx/llmr-app.gyp -Goutput_dir=./out/ --depth=. --generator-output=./build/macosx-make -f make - make -C build/macosx-make + make -C build/macosx-make V=$(V) open build/macosx-make/out/Release/llmr.app -xcode: config.gypi llmr.gyp config.gypi +xcode: config.gypi llmr.gyp deps/run_gyp llmr.gyp -Goutput_dir=./out/ --depth=. --generator-output=./ -f xcode # build OS X with xcodebuild @@ -27,8 +24,6 @@ xapp: xcode config.gypi src macosx/llmr-app.gyp xcodebuild -project ./macosx/llmr-app.xcodeproj open macosx/build/Release/llmr.app -out/Makefile: common.gypi llmr.gyp config.gypi - clean: -rm -rf out -rm -rf build