js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use OBJCXXFLAGS to generate deps for .mm

Browse source
This commit is contained in:
Jonathan Schleifer 2018-03-11 00:06:17 +01:00
parent 43a9c14622
commit a44616d977
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildsys.mk.in
View file

@ -206,7 +206,7 @@ depend: pre-depend ${SRCS}
{ rm -f $@; false; } { rm -f $@; false; }
.mm.mm.dep: .mm.mm.dep:
${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${OBJCXXFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }

4
m4/buildsys.m4
View file

@ -297,10 +297,10 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
AC_REQUIRE([BUILDSYS_CHECK_IOS]) AC_REQUIRE([BUILDSYS_CHECK_IOS])
AC_REQUIRE([BUILDSYS_SHARED_LIB]) AC_REQUIRE([BUILDSYS_SHARED_LIB])
AC_CHECK_TOOL(CODESIGN, codesign)
case "$host_os" in case "$host_os" in
darwin*) darwin*)
AC_CHECK_TOOL(CODESIGN, codesign)
AS_IF([test x"$host_is_ios" = x"yes"], [ AS_IF([test x"$host_is_ios" = x"yes"], [
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}' FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'