Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GUI] fix for correct display of build options in qt-gui in menu help->build options #343

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[GUI] fix for correct display of build options in qt-gui in menu help->build options #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion avidemux/common/ADM_commonUI/DIA_builtin.cpp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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