API tools faq
paste
Advertisement
dominus

Untitled

dominus
Sep 3rd, 2023
1,198
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.66 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/configure.ac b/configure.ac
  2. index 85559d7f7..bc9575719 100644
  3. --- a/configure.ac
  4. +++ b/configure.ac
  5. @@ -428,20 +428,6 @@ if test x$enable_android_apk = xno -a x$enable_exult = xyes; then
  6.     PKG_CHECK_MODULES(OGG, ogg >= 1.0 vorbis >= 1.0.1 vorbisfile, , AC_MSG_ERROR([*** must have Ogg/Vorbis installed!]))
  7.  fi
  8.  
  9. -# ---------------------------------------------------------------------
  10. -# Icu (for ES)
  11. -# ---------------------------------------------------------------------
  12. -
  13. -if test x$enable_android_apk = xno; then
  14. -   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  15. -fi
  16. -
  17. -# ---------------------------------------------------------------------
  18. -# Gtk (for ES)
  19. -# ---------------------------------------------------------------------
  20. -
  21. -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  22. -
  23.  # ---------------------------------------------------------------------
  24.  # Gdk-Pixbuf (for Gnome shp thumbnailer)
  25.  # ---------------------------------------------------------------------
  26. @@ -589,7 +575,6 @@ fi
  27.  
  28.  
  29.  # zipped savegame support
  30. -
  31.  AC_ARG_ENABLE(zip-support, AS_HELP_STRING([--enable-zip-support], [Enable zipped savegame support @<:@default yes@:>@]),,enable_zip_support=yes)
  32.  
  33.  if test x$enable_zip_support = xyes ; then
  34. @@ -668,7 +653,6 @@ else
  35.  fi
  36.  
  37.  # Midi Sfx
  38. -
  39.  AC_ARG_ENABLE(midi-sfx, AS_HELP_STRING([--enable-midi-sfx], [Support for Midi Sfx (sounds horrible) @<:@default no@:>@]),,enable_midi_sfx=no)
  40.  AC_MSG_CHECKING([whether to enable midi sfx])
  41.  if test x$enable_midi_sfx = xyes; then
  42. @@ -679,8 +663,58 @@ else
  43.  fi
  44.  
  45.  # ---------------------------------------------------------------------
  46. -# support for Exult Studio
  47. +# Exult Studio
  48.  # ---------------------------------------------------------------------
  49. +
  50. +AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  51. +AC_MSG_CHECKING([whether to build Exult Studio])
  52. +
  53. +if test x$enable_android_apk = xno -a x$enable_exult_studio = xyes; then
  54. +# Icu
  55. +   PKG_CHECK_MODULES(ICU, icu-uc, have_icu=yes, have_icu=no)
  56. +# Gtk
  57. +   PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16, have_gtk=yes, have_gtk=no)
  58. +# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  59. +   AC_PATH_PROG(FT2CONFIG, freetype-config)
  60. +   if test -n "$FT2CONFIG"; then
  61. +       FREETYPE2_LIBS=`$FT2CONFIG --libs`
  62. +       SAVED_LDFLAGS="$LDFLAGS"
  63. +       LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  64. +       AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  65. +       LDFLAGS="$SAVED_LDFLAGS"
  66. +       FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  67. +       if test x$have_freetype = xyes; then
  68. +           AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  69. +       else
  70. +           FREETYPE2_LIBS=
  71. +           FREETYPE2_INCLUDES=
  72. +       fi
  73. +       AC_SUBST(FREETYPE2_LIBS)
  74. +       AC_SUBST(FREETYPE2_INCLUDES)
  75. +   fi
  76. +fi
  77. +
  78. +# Exult Studio
  79. +if test x$enable_exult_studio = xyes; then
  80. +   AC_MSG_RESULT(yes)
  81. +   if test x$have_gtk = xno; then
  82. +       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  83. +       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  84. +       exit 1
  85. +   fi
  86. +   if test x$have_icu = xno; then
  87. +       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  88. +       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  89. +       exit 1
  90. +   fi
  91. +   AM_CONDITIONAL(BUILD_STUDIO, true)
  92. +   AM_CONDITIONAL(BUILD_SHAPES, true)
  93. +else
  94. +   AM_CONDITIONAL(BUILD_STUDIO, false)
  95. +   AC_MSG_RESULT(no)
  96. +fi
  97. +
  98. +# support for Exult Studio
  99.  AC_MSG_CHECKING([whether to enable support for Exult Studio])
  100.  AC_ARG_ENABLE(exult-studio-support, AS_HELP_STRING([--enable-exult-studio-support], [Enable ExultStudio support @<:@default no@:>@]),,enable_exult_studio_support=no)
  101.  if test "$WINDOWING_SYSTEM" != -DXWIN -a "$WINDOWING_SYSTEM" != -D_WIN32 -a "$WINDOWING_SYSTEM" != -DMACOSX; then
  102. @@ -692,6 +726,10 @@ if test "$WINDOWING_SYSTEM" != -DMACOSX; then
  103.     enable_macosx_x11_studio_support=no
  104.  fi
  105.  
  106. +if test x$enable_exult_studio = xyes; then
  107. +   enable_exult_studio_support=yes
  108. +fi
  109. +
  110.  if test x$enable_exult_studio_support = xyes ; then
  111.     AC_MSG_RESULT(yes)
  112.     AC_DEFINE(USE_EXULTSTUDIO, 1, [Use Exult Studio])
  113. @@ -1035,47 +1073,6 @@ else
  114.     AC_MSG_RESULT(yes)
  115.  fi
  116.  
  117. -# Freetype2 (optional, used in ExultStudio, shapes/fontgen.cc)
  118. -AC_PATH_PROG(FT2CONFIG, freetype-config)
  119. -if test -n "$FT2CONFIG"; then
  120. -   FREETYPE2_LIBS=`$FT2CONFIG --libs`
  121. -   SAVED_LDFLAGS="$LDFLAGS"
  122. -   LDFLAGS="$LDFLAGS $FREETYPE2_LIBS"
  123. -   AC_CHECK_FUNC(FT_Init_FreeType, have_freetype=yes, have_freetype=no)
  124. -   LDFLAGS="$SAVED_LDFLAGS"
  125. -   FREETYPE2_INCLUDES=`$FT2CONFIG --cflags`
  126. -   if test x$have_freetype = xyes; then
  127. -       AC_DEFINE(HAVE_FREETYPE2, 1, [Have freetype2])
  128. -   else
  129. -       FREETYPE2_LIBS=
  130. -       FREETYPE2_INCLUDES=
  131. -   fi
  132. -   AC_SUBST(FREETYPE2_LIBS)
  133. -   AC_SUBST(FREETYPE2_INCLUDES)
  134. -fi
  135. -
  136. -# exult-studio
  137. -AC_ARG_ENABLE(exult-studio, AS_HELP_STRING([--enable-exult-studio], [Build Exult Studio @<:@default no@:>@]),,enable_exult_studio=no)
  138. -AC_MSG_CHECKING([whether to build Exult Studio])
  139. -if test x$enable_exult_studio = xyes; then
  140. -   AC_MSG_RESULT(yes)
  141. -   if test x$have_gtk = xno; then
  142. -       echo "Exult Studio requires the GTK+ (aka the GIMP Tool Kit), but it is not installed."
  143. -       echo "Please try again, either with the GTK+ installed as 3.16 or newer, or with '--disable-exult-studio'."
  144. -       exit 1
  145. -   fi
  146. -   if test x$have_icu = xno; then
  147. -       echo "Exult Studio requires the ICU (aka the International Components for Unicode), but it is not installed."
  148. -       echo "Please try again, either with the ICU installed, or with '--disable-exult-studio'."
  149. -       exit 1
  150. -   fi
  151. -   AM_CONDITIONAL(BUILD_STUDIO, true)
  152. -   AM_CONDITIONAL(BUILD_SHAPES, true)
  153. -else
  154. -   AM_CONDITIONAL(BUILD_STUDIO, false)
  155. -   AC_MSG_RESULT(no)
  156. -fi
  157. -
  158.  # Usecode debugger
  159.  AC_ARG_WITH([usecode-debugger],
  160.              AS_HELP_STRING([--with-usecode-debugger=no|console|yes],
  161. @@ -1324,14 +1321,14 @@ if test x$enable_android_apk = xno; then
  162.         PKG_CHECK_EXISTS(zlib,
  163.             echo zlib....................... : `$PKG_CONFIG --modversion zlib`)
  164.     fi
  165. -   if test x$have_icu = xyes; then
  166. +   if test x$enable_exult_studio = xyes; then
  167.         echo ICU........................ : `$PKG_CONFIG --modversion icu-uc`
  168.     fi
  169. -   if test x$have_gtk = xyes; then
  170. +   if test x$enable_exult_studio = xyes; then
  171.         echo GLIB....................... : `$PKG_CONFIG --modversion glib-2.0`
  172.         echo GTK+....................... : `$PKG_CONFIG --modversion gtk+-3.0`
  173.     fi
  174. -   if test x$have_gdk_pixbuf = xyes; then
  175. +   if test x$have_gdk_pixbuf = xyes -a x$enable_gimp_plugin = xyes; then
  176.         echo GDK-Pixbuf................. : `$PKG_CONFIG --modversion gdk-pixbuf-2.0`
  177.     fi
  178.     echo
  179.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!