Commit 8a9249dd authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in, modules/gui/wxwindows/wxwindows.cpp: other compilation
   fixes for the wxwindows interface on win32.
parent e3d6e004
...@@ -125,8 +125,6 @@ case "x${target_os}" in ...@@ -125,8 +125,6 @@ case "x${target_os}" in
# add ws2_32 for closesocket, select, recv # add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long" CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -fvtable-thunks";
CXXFLAGS="${CXXFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows" LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32" LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32" LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
...@@ -192,17 +190,37 @@ then ...@@ -192,17 +190,37 @@ then
CFLAGS_mingw32_special="-fnative-struct" CFLAGS_mingw32_special="-fnative-struct"
fi fi
CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}"; CFLAGS="${CFLAGS_save}" CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}";
CXXFLAGS_save="${CXXFLAGS_save} ${CFLAGS_mingw32_special}";
CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
dnl Check for fvtable-thunks support for mingw32
if test x$SYS = xmingw32
then
AC_LANG_PUSH(C++)
AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks],
[ac_cv_cxx_fvtable_thunks],
[CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks"
AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes,
ac_cv_cxx_fvtable_thunks=no)])
if test x"$ac_cv_cxx_fvtable_thunks" = x"yes"; then
CXXFLAGS_mingw32_special="-fvtable-thunks"
fi
CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"
CXXFLAGS="${CXXFLAGS_save}"
AC_LANG_POP(C++)
fi fi
dnl Flags for plugin compilation dnl Flags for plugin compilation
case "x${SYS}" in case "x${SYS}" in
xmingw32|xcygwin) xmingw32|xcygwin)
CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}" CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}"
CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special}" CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}" OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}"
CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}" CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}"
CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special}" CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}"
OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}" OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}"
;; ;;
x*) x*)
...@@ -2482,7 +2500,9 @@ AC_SUBST(LDFLAGS) ...@@ -2482,7 +2500,9 @@ AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS_vlc) AC_SUBST(CFLAGS_vlc)
AC_SUBST(CFLAGS_pics) AC_SUBST(CFLAGS_pics)
AC_SUBST(CXXFLAGS_pics)
AC_SUBST(CFLAGS_plugins) AC_SUBST(CFLAGS_plugins)
AC_SUBST(CXXFLAGS_plugins)
AC_SUBST(CFLAGS_builtins) AC_SUBST(CFLAGS_builtins)
AC_SUBST(CPPFLAGS_mozilla) AC_SUBST(CPPFLAGS_mozilla)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.cpp : wxWindows plugin for vlc * wxwindows.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: wxwindows.cpp,v 1.2 2002/11/20 14:24:00 gbazin Exp $ * $Id: wxwindows.cpp,v 1.3 2002/11/20 15:58:15 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#undef _ #undef _
#ifdef WIN32 /* mingw32 hack */ #ifdef WIN32 /* mingw32 hack */
#undef Yield() #undef Yield
#undef CreateDialog() #undef CreateDialog
#endif #endif
#include <wx/wxprec.h> #include <wx/wxprec.h>
......
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