buildsys  Check-in [d4067433d9]

Overview
Comment:Use OBJCXXFLAGS to generate deps for .mm
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d4067433d95f896c77e10503553ca2842e09351db7003b23d2b2386424df5b68
User & Date: js on 2018-03-10 23:06:17
Other Links: manifest | tags
Context
2018-04-28
23:39
Replace MORPHOS_LIB with more generic AMIGA_LIB check-in: 7dd727fb42 user: js tags: trunk
2018-03-10
23:06
Use OBJCXXFLAGS to generate deps for .mm check-in: d4067433d9 user: js tags: trunk
2018-02-11
15:17
Fall back to using no colors if tput is missing check-in: a84dc775f5 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified buildsys.mk.in from [d8bd8eec39] to [5dc591f912].

︙
202
203
204
205
206
207
208
209

210
211
212
213
214
215
216

202
203
204
205
206
207
208

209
210
211
212
213
214
215
216








-
+









.m.m.dep:
	${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \
	{ rm -f $@; false; }

.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:/' >$@ || \
	{ rm -f $@; false; }

.S.S.dep:
	${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
	sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \
	{ rm -f $@; false; }
︙

Modified m4/buildsys.m4 from [a1d6e933db] to [a3d1ffa425].

︙
293
294
295
296
297
298
299
300
301
302
303


304
305
306
307
308
309
310

293
294
295
296
297
298
299


300
301
302
303
304
305
306
307
308
309
310








-
-


+
+








])

AC_DEFUN([BUILDSYS_FRAMEWORK], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_REQUIRE([BUILDSYS_CHECK_IOS])
	AC_REQUIRE([BUILDSYS_SHARED_LIB])

	AC_CHECK_TOOL(CODESIGN, codesign)

	case "$host_os" in
		darwin*)
			AC_CHECK_TOOL(CODESIGN, codesign)

			AS_IF([test x"$host_is_ios" = x"yes"], [
				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='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
				FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
			])
︙