From 1de3aaadeb184b695bb25ad4456bd953434c207d Mon Sep 17 00:00:00 2001
From: Stuart Carnie <stuart.carnie@gmail.com>
Date: Fri, 7 Sep 2018 20:32:57 -0700
Subject: [PATCH] chore: Call Makefile.app to generate Qt moc files

---
 Makefile.apple                                     |  4 ++--
 .../RetroArch_Metal.xcodeproj/project.pbxproj      | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile.apple b/Makefile.apple
index e7f76d96e0..8e7ae5f49a 100644
--- a/Makefile.apple
+++ b/Makefile.apple
@@ -6,14 +6,14 @@ ifneq ($(MOC_HEADERS),)
 	MOC_SRC := $(join $(addsuffix moc_,$(dir $(MOC_HEADERS))), $(notdir $(MOC_HEADERS:.h=.cpp)))
 endif
 
-Q ?= $(error missing moc)
+MOC ?= $(error missing moc path)
 
 .PHONY: generate
 
 $(MOC_SRC):
 	@$(if $(Q), $(shell echo echo MOC $<),)
 	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(Q)$(MOC) -o $(MOC_TMP) $<
+	$(MOC) -o $(MOC_TMP) $<
 
 $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
 
diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
index 449099d9e3..0fc5f86384 100644
--- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
@@ -1510,6 +1510,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 05422E562140C8DB00F09961 /* Build configuration list for PBXNativeTarget "RetroArchQT" */;
 			buildPhases = (
+				053FC2782143764B00D98D46 /* ShellScript */,
 				05422E3D2140C8DB00F09961 /* Resources */,
 				05422E422140C8DB00F09961 /* Sources */,
 				05422E492140C8DB00F09961 /* Frameworks */,
@@ -1609,6 +1610,19 @@
 			shellScript = "BINARY=${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\nVER=Versions/${QT_VERSION}\nfor name in {QtConcurrent,QtCore,QtWidgets,QtNetwork,QtGui}; do\n    echo updating install path for ${name}.framework\n    install_name_tool -change ${QT_FRAMEWORK_PATH}/${name}.framework/${VER}/${name} @executable_path/../Frameworks/${name}.framework/${VER}/${name} ${BINARY}\ndone";
 			showEnvVarsInLog = 0;
 		};
+		053FC2782143764B00D98D46 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_QT=1 MOC=${QT_INSTALL}/bin/moc generate";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */