ObjFW  Diff

Differences From Artifact [1fd9ad620c]:

To Artifact [989a042f2a]:


23
24
25
26
27
28
29

30
31
32
33
34
35
36
37
OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstantString"

AC_ARG_WITH(wii,
	AS_HELP_STRING([--with-wii], [build for Wii]))
AS_IF([test x"$with_wii" = x"yes"], [
	OBJCFLAGS="$OBJCFLAGS -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float"
	LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float"

	LIBS="-lfat -lwiiuse -lbte -logc"
])

AX_CHECK_COMPILER_FLAGS(-std=gnu99, [OBJCFLAGS="$OBJCFLAGS -std=gnu99"])
case $OBJC in
	*clang*)
		;;
	*)







>
|







23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstantString"

AC_ARG_WITH(wii,
	AS_HELP_STRING([--with-wii], [build for Wii]))
AS_IF([test x"$with_wii" = x"yes"], [
	OBJCFLAGS="$OBJCFLAGS -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float"
	LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -meabi -mhard-float"
	LIBS="$LIBS -lfat -logc"
	TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte"
])

AX_CHECK_COMPILER_FLAGS(-std=gnu99, [OBJCFLAGS="$OBJCFLAGS -std=gnu99"])
case $OBJC in
	*clang*)
		;;
	*)
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
			])
			;;
	esac

	AS_IF([test x"$with_wii" = x"yes"], [
		dnl Keep this lowercase, as WIILOAD is a variable used by
		dnl wiiload and thus likely already set by the user to something
		dnl that is not the path to the binary.
		AC_CHECK_PROG(wiiload, wiiload, wiiload)

		AS_IF([test x"$wiiload" != x""], [
			AC_SUBST(TESTS, "tests")
			AC_SUBST(TEST_LAUNCHER, "$wiiload")
		])
	])







|







842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
			])
			;;
	esac

	AS_IF([test x"$with_wii" = x"yes"], [
		dnl Keep this lowercase, as WIILOAD is a variable used by
		dnl wiiload and thus likely already set by the user to something
		dnl that is not the path of the wiiload binary.
		AC_CHECK_PROG(wiiload, wiiload, wiiload)

		AS_IF([test x"$wiiload" != x""], [
			AC_SUBST(TESTS, "tests")
			AC_SUBST(TEST_LAUNCHER, "$wiiload")
		])
	])
864
865
866
867
868
869
870


871
872
873
874
875
876
877
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
dnl We use the OBJC compiler as our assembler
AC_SUBST(AS, $OBJC)
AC_SUBST(ASFLAGS)
AC_SUBST(AS_DEPENDS, $OBJC_DEPENDS)



AC_CONFIG_FILES([
	buildsys.mk
	extra.mk
	Info.plist
	utils/objfw-config
	src/bridge/Info.plist







>
>







865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
dnl We use the OBJC compiler as our assembler
AC_SUBST(AS, $OBJC)
AC_SUBST(ASFLAGS)
AC_SUBST(AS_DEPENDS, $OBJC_DEPENDS)

AC_SUBST(TESTS_LIBS)

AC_CONFIG_FILES([
	buildsys.mk
	extra.mk
	Info.plist
	utils/objfw-config
	src/bridge/Info.plist