libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 02:00:41 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

chore: Call Makefile.app to generate Qt moc files

Browse Source
This commit is contained in:
Stuart Carnie 2018-09-07 20:32:57 -07:00
parent 61d56e07fa
commit 1de3aaadeb
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.apple
View File

@ -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))

14
pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
View File

@ -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 */