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

fix freetype build

Browse Source
This commit is contained in:
Wengier
2021-03-07 03:23:19 -05:00
parent e070f9ed58
commit a13ff3b34c
6 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build-debug-macosx
View File

@@ -45,12 +45,6 @@ export CXXFLAGS="$new$CXXFLAGS -g3"
# perfer to compile against our own freetype # perfer to compile against our own freetype
echo Compiling our internal freetype echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 (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 -g3 "
export LDFLAGS="$nld$LDFLAGS -g3"
export CPPFLAGS="$new$CPPFLAGS -g3 "
export CXXFLAGS="$new$CXXFLAGS -g3"
export INTERNAL_FREETYPE=1 export INTERNAL_FREETYPE=1
# now compile ourself # now compile ourself

6
build-debug-macosx-sdl2
View File

@@ -42,12 +42,6 @@ export CXXFLAGS="$new$CXXFLAGS -g3"
# perfer to compile against our own freetype # perfer to compile against our own freetype
echo Compiling our internal freetype echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 (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 -g3"
export LDFLAGS="$nld$LDFLAGS -g3"
export CPPFLAGS="$new$CPPFLAGS -g3"
export CXXFLAGS="$new$CXXFLAGS -g3"
export INTERNAL_FREETYPE=1 export INTERNAL_FREETYPE=1
# now compile ourself # now compile ourself

6
build-macosx
View File

@@ -45,12 +45,6 @@ export CXXFLAGS="$new$CXXFLAGS"
# perfer to compile against our own freetype # perfer to compile against our own freetype
echo Compiling our internal freetype echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 (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 export INTERNAL_FREETYPE=1
# now compile ourself # now compile ourself

6
build-macosx-sdl2
View File

@@ -42,12 +42,6 @@ export CXXFLAGS="$new$CXXFLAGS"
# perfer to compile against our own freetype # perfer to compile against our own freetype
echo Compiling our internal freetype echo Compiling our internal freetype
(cd vs2015/freetype && ./build-dosbox.sh) || exit 1 (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 export INTERNAL_FREETYPE=1
# now compile ourself # now compile ourself

17
configure.ac
View File

@@ -649,21 +649,24 @@ AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" = "xyes")
if test x$enable_freetype = xyes; then if test x$enable_freetype = xyes; then
AC_MSG_CHECKING(for freetype) AC_MSG_CHECKING(for freetype)
if test x$INTERNAL_FREETYPE = x1; then if test x$INTERNAL_FREETYPE = x1; then
# CFLAGS and LDFLAGS were already updated by build-macosx CFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CFLAGS"
AC_DEFINE(C_FREETYPE,1) LDFLAGS="-L$top/vs2015/freetype/linux-host/lib -lfreetype $LDFLAGS"
AC_MSG_RESULT(yes) CPPFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CPPFLAGS"
CXXFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CXXFLAGS"
else else
pkg-config --exists freetype2; RES=$? pkg-config --exists freetype2; RES=$?
if test x$RES = x0; then if test x$RES = x0; then
CFLAGS="$CFLAGS "`pkg-config freetype2 --cflags` CFLAGS="$CFLAGS "`pkg-config freetype2 --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config freetype2 --cflags` CPPFLAGS="$CPPFLAGS "`pkg-config freetype2 --cflags`
LIBS="$LIBS "`pkg-config freetype2 --libs` LIBS="$LIBS "`pkg-config freetype2 --libs`
else
CFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CFLAGS"
LDFLAGS="-L$top/vs2015/freetype/linux-host/lib -lfreetype $LDFLAGS"
CPPFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CPPFLAGS"
CXXFLAGS="-I$pwd/vs2015/freetype/linux-host/include/freetype2 $CXXFLAGS"
fi
AC_DEFINE(C_FREETYPE,1) AC_DEFINE(C_FREETYPE,1)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else
enable_freetype=no
AC_MSG_RESULT(no)
fi
fi fi
fi fi

2
src/dos/dos.cpp
View File

@@ -1840,7 +1840,7 @@ static Bitu DOS_21Handler(void) {
if (DOS_Execute(name1,SegPhys(es)+reg_bx,reg_al)) { if (DOS_Execute(name1,SegPhys(es)+reg_bx,reg_al)) {
strcpy(appname, name1); strcpy(appname, name1);
strncpy(appargs, ctail.buffer, ctail.count); strncpy(appargs, ctail.buffer, ctail.count);
appargs[ctail.count]=0; *(appargs+ctail.count)=0;
} else { } else {
reg_ax=dos.errorcode; reg_ax=dos.errorcode;
CALLBACK_SCF(true); CALLBACK_SCF(true);