freetype

Author: Wengier

build-debug-macosx

@@ -45,6 +45,12 @@ export CXXFLAGS="$new$CXXFLAGS -g3"
 # 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 -g3 "
+export LDFLAGS="$nld$LDFLAGS -g3"
+export CPPFLAGS="$new$CPPFLAGS -g3 "
+export CXXFLAGS="$new$CXXFLAGS -g3"
 export INTERNAL_FREETYPE=1
 
 # now compile ourself

build-debug-macosx-sdl2

@@ -42,6 +42,12 @@ export CXXFLAGS="$new$CXXFLAGS -g3"
 # 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 -g3"
+export LDFLAGS="$nld$LDFLAGS -g3"
+export CPPFLAGS="$new$CPPFLAGS -g3"
+export CXXFLAGS="$new$CXXFLAGS -g3"
 export INTERNAL_FREETYPE=1
 
 # now compile ourself

build-macosx

@@ -45,6 +45,12 @@ 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

build-macosx-sdl2

@@ -42,6 +42,12 @@ 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

build-mingw

@@ -48,6 +48,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

build-mingw-lowend

@@ -43,6 +43,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

build-mingw-sdl2

@@ -46,6 +46,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

build-mingw-sdldraw

@@ -43,6 +43,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

configure.ac

@@ -653,24 +653,21 @@ AM_CONDITIONAL(C_FREETYPE, test "x$enable_freetype" = "xyes")
 if test x$enable_freetype = xyes; then
   AC_MSG_CHECKING(for freetype)
   if test x$INTERNAL_FREETYPE = x1; then
-    CFLAGS="$CFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
-    LDFLAGS="$LDFLAGS -L$top/vs2015/freetype/linux-host/lib -lfreetype"
-    CPPFLAGS="$CPPFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
-    CXXFLAGS="$CXXFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
+    # CFLAGS and LDFLAGS were already updated by build-macosx
+    AC_DEFINE(C_FREETYPE,1)
+    AC_MSG_RESULT(yes)
   else
     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
-      CFLAGS="$CFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
-      LDFLAGS="$LDFLAGS -L$top/vs2015/freetype/linux-host/lib -lfreetype"
-      CPPFLAGS="$CPPFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
-      CXXFLAGS="$CXXFLAGS -I$pwd/vs2015/freetype/linux-host/include/freetype2"
+      enable_freetype=no
+      AC_MSG_RESULT(no)
     fi
-    AC_DEFINE(C_FREETYPE,1)
-    AC_MSG_RESULT(yes)
   fi
 fi
 

src/gui/sdl_mapper.cpp

@@ -1894,7 +1894,6 @@ class CFCSBindGroup : public  CStickBindGroup {
         }
     }
 
-
 private:
     Uint8 old_hat_position;
 
@@ -1943,7 +1942,6 @@ class CFCSBindGroup : public  CStickBindGroup {
     }
 };
 
-
 class CCHBindGroup : public  CStickBindGroup {
 public:
     CCHBindGroup(Bitu _stick,Bitu _emustick) : CStickBindGroup (_stick,_emustick){