Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged 2374

Browse Source
This commit is contained in:
Moritz Bunkus 2004-10-17 15:16:11 +00:00
parent b70463e7ca
commit cc67f57fad
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.in
View File

@ -73,7 +73,6 @@ MINGW_LIBS = @MINGW_LIBS@
OGG_LIBS = @OGG_LIBS@
VORBIS_LIBS = @VORBIS_LIBS@
WXWINDOWS_CFLAGS = @WXWINDOWS_CFLAGS@
WXWINDOWS_LDFLAGS = @WXWINDOWS_LDFLAGS@
WXWINDOWS_LIBS = @WXWINDOWS_LIBS@
ZLIB_LIBS = @ZLIB_LIBS@
LIBINTL_LIBS = @LIBINTL_LIBS@
@ -303,7 +302,7 @@ mkvinfo_SOURCES = $(wildcard src/mkvinfo*.cpp)
mkvinfo_OBJECTS := $(patsubst %.cpp,%.o,$(mkvinfo_SOURCES))
mkvinfo_DEPENDENCIES += $(DEP_COMMON)
mkvinfo_LDADD = -lmtxcommon -lmatroska -lebml \
$(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) \
$(WXWINDOWS_LIBS) \
$(ICONV_LIBS) $(LIBINTL_LIBS)
mkvextract_SOURCES = $(wildcard src/extract/*.cpp)
@ -321,7 +320,7 @@ mmg_SOURCES = $(wildcard src/mmg/*.cpp)
mmg_OBJECTS := $(patsubst %.cpp,%.o,$(mmg_SOURCES))
mmg_DEPENDENCIES += $(DEP_COMMON)
mmg_LDADD = -lmtxcommon -lmatroska -lebml -lexpat $(ICONV_LIBS) \
$(WXWINDOWS_LDFLAGS) $(WXWINDOWS_LIBS) $(LIBINTL_LIBS)
$(WXWINDOWS_LIBS) $(LIBINTL_LIBS)
src/mkvmerge: $(mkvmerge_OBJECTS) $(mkvmerge_DEPENDENCIES)
@echo ' LINK ' $@

4
configure.in
View File

@ -739,14 +739,13 @@ dnl
if test "$wxwver_ok" = "1" ; then
WXWINDOWS_CFLAGS=`wx-config --cxxflags`
WXWINDOWS_LDFLAGS=`wx-config --ldflags`
WXWINDOWS_LIBS=`wx-config --libs`
AC_CACHE_VAL(am_cv_wx_compilation, [
AC_LANG_PUSH(C++)
ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CXXFLAGS="$CXXFLAGS $WXWINDOWS_CFLAGS"
LIBS="$LDFLAGS $WXWINDOWS_LDFLAGS $WXWINDOWS_LIBS"
LIBS="$LDFLAGS $WXWINDOWS_LIBS"
AC_TRY_LINK([
#include <wx/dnd.h>
#include <wx/treectrl.h>
@ -778,7 +777,6 @@ wxTreeItemId id;
fi
AC_SUBST(WXWINDOWS_CFLAGS)
AC_SUBST(WXWINDOWS_LDFLAGS)
AC_SUBST(WXWINDOWS_LIBS)
AC_SUBST(MMG_SUBDIRS)
AC_SUBST(USE_WXWINDOWS)