From: masakih <masakih@users.sourceforge.jp>
Date: Sun, 1 Apr 2018 13:22:27 +0000 (+0900)
Subject: xcode-selectのpathを参照するようにした
X-Git-Tag: 1.9b46~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=65f2d0be7092da3ca6ce1a420c90ea8fd52202f7;p=kcd%2FKCD.git

xcode-selectのpathを参照するようにした
---

diff --git a/Makefile b/Makefile
index 8443b54a..912315ff 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ APP_NAME=$(BUILD_PATH)/$(DEPLOYMENT)/$(PRODUCT_NAME)
 SCHEME=KCD
 INFO_PLIST=KCD/KCD-Info.plist
 
+XCODEBUILD=$(shell xcrun -f xcodebuild)
+
 LOCALIZE_FILES=KCD/LocalizedStrings.swift
 
 VER_CMD=grep -A1 'CFBundleShortVersionString' $(INFO_PLIST) | tail -1 | tr -d "'\t</string>" 
@@ -34,7 +36,7 @@ deploy:
 	test -z "`git status --porcelain`"
 
 release: Carthage updateRevision
-	xcodebuild -derivedDataPath=build -configuration $(DEPLOYMENT)
+	$(XCODEBUILD) -derivedDataPath=build -configuration $(DEPLOYMENT)
 	$(MAKE) restoreInfoPlist
 
 package: deploy release
@@ -51,11 +53,11 @@ restoreInfoPlist:
 	if [ -f $(INFO_PLIST).bak ] ; then mv -f $(INFO_PLIST).bak $(INFO_PLIST) ; fi
 
 build/Release/EquipmentEnhancementListBuilder: EquipmentEnhancementListBuilder/main.swift KCD/EnhancementListItem.swift
-	xcodebuild -derivedDataPath=build -configuration $(DEPLOYMENT) -target EquipmentEnhancementListBuilder
+	$(XCODEBUILD) -derivedDataPath=build -configuration $(DEPLOYMENT) -target EquipmentEnhancementListBuilder
 
 buildEquipmentEnhancementList: build/Release/EquipmentEnhancementListBuilder
 	./build/Release/EquipmentEnhancementListBuilder ./KCD
 
-Carthage:
-	carthage update
+Carthage: cartfile
+	DEVELOPER_DIR=$(shell xcode-select -p) carthage update
 	rm -rf Carthage/Build/*OS