Stop packaging command-line Mac tools as a bundle.
Review URL: http://codereview.appspot.com/4894046
git-svn-id: http://skia.googlecode.com/svn/trunk@2113 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/Makefile b/Makefile
index f5fa963..a3ac806 100644
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,8 @@
$(MAKE) -C out $@ BUILDTYPE=$(BUILDTYPE)
endif
ifneq (,$(findstring Darwin, $(uname)))
+ rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'make clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi
xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE)
- mkdir -p out/$(BUILDTYPE)
- rm -f out/$(BUILDTYPE)/$@
- ln -s $(CWD)/xcodebuild/$(BUILDTYPE)/$@.app/Contents/MacOS/$@ out/$(BUILDTYPE)/$@
+ ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE)
endif
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index 8980ce8..f2f6e1c 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -1,7 +1,6 @@
# target_defaults used for executable targets that generate a console app
{
'target_defaults': {
- 'mac_bundle' : 1,
'msvs_settings': {
'VCLinkerTool': {
#Allows for creation / output to console.