Commit 1aef7d60 authored by Rafaël Carré's avatar Rafaël Carré

Fix widl/midl detection and widl compilation

parent 7fc3dc54
...@@ -109,8 +109,10 @@ clean-tlb: ...@@ -109,8 +109,10 @@ clean-tlb:
else else
if HAS_WIDL_COMPILER if HAS_WIDL_COMPILER
WINE_SDK_PATH ?= /usr/include/wine/windows
axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
$(WIDL) -I$(WINE_SDK_PATH)/include -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl $(WIDL) -I$(WINE_SDK_PATH) -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl
clean-tlb: clean-tlb:
rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
......
...@@ -104,20 +104,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") ...@@ -104,20 +104,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
dnl dnl
dnl Check widl/midl tools for win32 dnl Check widl/midl tools for win32
WIDL="no"
MIDL="no"
AS_IF([test "${SYS}" = "mingw32"],[ AS_IF([test "${SYS}" = "mingw32"],[
AC_CHECK_PROGS(MIDL, [midl], no) AC_CHECK_PROGS(MIDL, [midl], no)
AC_CHECK_PROGS(WIDL, [widl], no)
dnl FIXME
dnl AC_CHECK_PROGS(WIDL, [widl], no)
dnl
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_CHECK_HEADER(ole2.h,,[AC_MSG_ERROR([required OLE header ole2.h is missing from your system])]) AC_CHECK_HEADER(ole2.h,,[AC_MSG_ERROR([required OLE header ole2.h is missing from your system])])
AC_CHECK_HEADER(olectl.h,,[AC_MSG_ERROR([required OLE header olectl.h is missing from your system])]) AC_CHECK_HEADER(olectl.h,,[AC_MSG_ERROR([required OLE header olectl.h is missing from your system])])
AC_CHECK_HEADERS(objsafe.h,,,[#include <ole2.h>]) AC_CHECK_HEADERS(objsafe.h,,,[#include <ole2.h>])
AC_LANG_POP(C++) AC_LANG_POP(C++)
],[
MIDL="no"
WIDL="no"
]) ])
AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no") AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment