joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable FreeType in SDL1 Mac OS X

Browse Source
This commit is contained in:
Jonathan Campbell 2020-11-27 11:41:07 -08:00
parent 875cb64aee
commit 3a7e280cb0
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-macosx
View File

@ -22,16 +22,6 @@ echo Compiling our internal SDL 1.x
#echo Compiling our internal SDLnet 1.x
#(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
# perfer to compile against our own freetype
echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1
new="-I$top/vs2015/freetype/linux-host/include "
nld="-L$top/vs2015/freetype/linux-host/lib "
export CFLAGS="$new$CFLAGS"
export LDFLAGS="$nld$LDFLAGS"
export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
# perfer to compile against our own zlib
echo Compiling our internal zlib
(cd vs2015/zlib && ./build-dosbox.sh) || exit 1
@ -52,6 +42,17 @@ export LDFLAGS="$nld$LDFLAGS"
export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
# perfer to compile against our own freetype
echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1
new="-I$top/vs2015/freetype/linux-host/include/freetype2 "
nld="-L$top/vs2015/freetype/linux-host/lib -lfreetype "
export CFLAGS="$new$CFLAGS"
export LDFLAGS="$nld$LDFLAGS"
export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
export INTERNAL_FREETYPE=1
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure

20
configure.ac
View File

@ -625,16 +625,22 @@ AC_ARG_ENABLE(freetype,AC_HELP_STRING([--disable-freetype],[Disable freetype sup
AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" = "xyes")
if test x$enable_freetype = xyes; then
AC_MSG_CHECKING(for freetype)
pkg-config --exists freetype2; RES=$?
if test x$RES = x0; then
CFLAGS="$CFLAGS "`pkg-config freetype2 --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config freetype2 --cflags`
LIBS="$LIBS "`pkg-config freetype2 --libs`
if test x$INTERNAL_FREETYPE = x1; then
# CFLAGS and LDFLAGS were already updated by build-macosx
AC_DEFINE(C_FREETYPE,1)
AC_MSG_RESULT(yes)
else
enable_freetype=no
AC_MSG_RESULT(no)
pkg-config --exists freetype2; RES=$?
if test x$RES = x0; then
CFLAGS="$CFLAGS "`pkg-config freetype2 --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config freetype2 --cflags`
LIBS="$LIBS "`pkg-config freetype2 --libs`
AC_DEFINE(C_FREETYPE,1)
AC_MSG_RESULT(yes)
else
enable_freetype=no
AC_MSG_RESULT(no)
fi
fi
fi

2
vs2015/freetype/build-dosbox.sh
View File

@ -15,7 +15,7 @@ cd linux-build || exit 1
opts=
../configure "--srcdir=$srcdir" "--prefix=$instdir" --enable-static --disable-shared $opts || exit 1
../configure "--srcdir=$srcdir" "--prefix=$instdir" --enable-static --disable-shared --with-bzip2=no --with-harfbuzz=no --with-png=no $opts || exit 1
make -j || exit 1
make install || exit 1 # will install into ./linux-host

0
vs2015/freetype/builds/unix/install-sh Normal file → Executable file
View File