mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2025-01-30 14:07:05 +00:00
Let configure find the windres tool
The windres tool used for cross-compiled mingw builds should be detected by configure. Until now it was assumed that it was simply called "windres" and not prefixed like the other compiler components (e.g. i386-mingw32msvc-gcc).
This commit is contained in:
parent
dcd1146139
commit
3b82fc8711
@ -57,6 +57,7 @@ PROFILING_LIBS = @PROFILING_LIBS@
|
||||
RANLIB = @RANLIB@
|
||||
STRIP = @STRIP@
|
||||
UIC = @UIC@
|
||||
WINDRES = @WINDRES@
|
||||
|
||||
# Variable stuff as set by configure
|
||||
BZ2_LIBS = @BZ2_LIBS@
|
||||
@ -178,7 +179,7 @@ LINKSHARED = $(CXX) $(LDFLAGS) $(LIBDIRS) $(SYSTEM_LIBDIRS) \
|
||||
-shared -Wl,--export-all
|
||||
CXXCOMPILE = $(CXX) $(CXXFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
|
||||
CCOMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(SYSTEM_INCLUDES)
|
||||
RCCOMPILE = windres $(WXWIDGETS_INCLUDES) -Isrc/mmg
|
||||
RCCOMPILE = $(WINDRES) $(WXWIDGETS_INCLUDES) -Isrc/mmg
|
||||
|
||||
ALL_SOURCES=$(wildcard avilib-0.6.10/*.c) $(wildcard avilib-0.6.10/*.cpp) \
|
||||
$(wildcard librmff/*.c) \
|
||||
|
@ -13,6 +13,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
AC_CHECK_TOOL(STRIP, strip, :)
|
||||
AC_CHECK_TOOL(AR, ar, :)
|
||||
AC_CHECK_TOOL(LD, ld, :)
|
||||
AC_CHECK_TOOL(WINDRES, windres, :)
|
||||
|
||||
dnl Check for headers
|
||||
AC_HEADER_STDC()
|
||||
|
Loading…
Reference in New Issue
Block a user