Skip to content

Commit

Permalink
fix for correct display of build options in qt-gui in menu help->buil…
Browse files Browse the repository at this point in the history
…d options
  • Loading branch information
lherschi committed Aug 17, 2024
1 parent ab5ab39 commit b89f36e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion avidemux/common/ADM_commonUI/DIA_builtin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ uint8_t DIA_builtin(void)
#ifdef USE_VDPAU
adm_vdpau=1;
#endif
#ifdef USE_FONTCONFIG
#ifdef HAVE_FONTCONFIG
adm_fontconfig=1;
#endif

Expand Down
5 changes: 5 additions & 0 deletions avidemux/qt4/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ INCLUDE_DIRECTORIES(${QT_INCLUDES})
ADD_DEFINITIONS(${QT_DEFINITIONS})
#--

INCLUDE(admCheckFreeType)
checkFreeType()
INCLUDE(admCheckFontConfig)
checkFontConfig()

#
##########################################
# Config
Expand Down
4 changes: 2 additions & 2 deletions cmake/config.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
#define PACKAGE "avidemux"
#define ADMLOCALE "${ADM_LOCALE}"

/* FontConfig detected */
#cmakedefine HAVE_FONTCONFIG

#if ${CONFIG_HEADER_TYPE} == ADM_BUILD_CLI || ${CONFIG_HEADER_TYPE} == ADM_BUILD_GTK
/* Define if the GNU gettext() function is already present or preinstalled. */
#cmakedefine HAVE_GETTEXT
#endif

// GTK+ uses X11 framework
#cmakedefine HAVE_GTK_X11
Expand Down

0 comments on commit b89f36e

Please sign in to comment.