Commit d78e17ca authored by gbazin's avatar gbazin
Browse files

* configure.ac: libpng (logo plugin) needs to be linked with zlib.

* modules/gui/wxwindows/*: a couple of compilation fixes for wxWindows cvs.
parent 7f0f36d8
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.41 2003/07/23 22:02:56 jpsaman Exp $ dnl $Id: configure.ac,v 1.42 2003/07/25 11:33:24 gbazin Exp $
AC_INIT(vlc,0.6.1-test1) AC_INIT(vlc,0.6.1-test1)
...@@ -1966,7 +1966,7 @@ dnl ...@@ -1966,7 +1966,7 @@ dnl
dnl png dnl png
dnl dnl
AC_CHECK_HEADERS(png.h, [ AC_CHECK_HEADERS(png.h, [
AX_ADD_LDFLAGS([logo],[-lpng]) AX_ADD_LDFLAGS([logo],[-lpng -lz])
AX_ADD_PLUGINS([logo])]) AX_ADD_PLUGINS([logo])])
dnl dnl
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc * open.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.32 2003/07/24 21:50:28 gbazin Exp $ * $Id: open.cpp,v 1.33 2003/07/25 11:33:24 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -294,7 +294,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -294,7 +294,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
OnNetTypeChange( dummy_event ); OnNetTypeChange( dummy_event );
/* Update MRL */ /* Update MRL */
wxNotebookEvent event = wxNotebookEvent( wxEVT_NULL, 0, i_access_method ); wxNotebookEvent event( wxEVT_NULL, 0, i_access_method );
OnPageChange( event ); OnPageChange( event );
/* Place everything in sizers */ /* Place everything in sizers */
......
...@@ -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.24 2003/07/24 23:21:18 gbazin Exp $ * $Id: wxwindows.cpp,v 1.25 2003/07/25 11:33:24 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
#ifdef WIN32 /* mingw32 hack */ #ifdef WIN32 /* mingw32 hack */
#undef Yield #undef Yield
#undef CreateDialog #undef CreateDialog
/* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
#ifdef _WX_INIT_H_
extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
#endif
#endif #endif
/* Let vlc take care of the i18n stuff */ /* Let vlc take care of the i18n stuff */
...@@ -53,6 +47,11 @@ extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL, ...@@ -53,6 +47,11 @@ extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
#include "wxwindows.h" #include "wxwindows.h"
/* Temporary hack */ /* Temporary hack */
#if defined(WIN32) && definded(_WX_INIT_H_)
/* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
#endif
#ifdef __DARWIN__ #ifdef __DARWIN__
int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE ); int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );
#endif #endif
......
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