mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
* configure.ac: libpng (logo plugin) needs to be linked with zlib.
* modules/gui/wxwindows/*: a couple of compilation fixes for wxWindows cvs.
This commit is contained in:
parent
7f0f36d866
commit
d78e17ca4f
@ -1,5 +1,5 @@
|
||||
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)
|
||||
|
||||
@ -1966,7 +1966,7 @@ dnl
|
||||
dnl png
|
||||
dnl
|
||||
AC_CHECK_HEADERS(png.h, [
|
||||
AX_ADD_LDFLAGS([logo],[-lpng])
|
||||
AX_ADD_LDFLAGS([logo],[-lpng -lz])
|
||||
AX_ADD_PLUGINS([logo])])
|
||||
|
||||
dnl
|
||||
|
@ -2,7 +2,7 @@
|
||||
* open.cpp : wxWindows plugin for vlc
|
||||
*****************************************************************************
|
||||
* 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>
|
||||
*
|
||||
@ -294,7 +294,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
|
||||
OnNetTypeChange( dummy_event );
|
||||
|
||||
/* Update MRL */
|
||||
wxNotebookEvent event = wxNotebookEvent( wxEVT_NULL, 0, i_access_method );
|
||||
wxNotebookEvent event( wxEVT_NULL, 0, i_access_method );
|
||||
OnPageChange( event );
|
||||
|
||||
/* Place everything in sizers */
|
||||
|
@ -2,7 +2,7 @@
|
||||
* wxwindows.cpp : wxWindows plugin for vlc
|
||||
*****************************************************************************
|
||||
* 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>
|
||||
*
|
||||
@ -34,12 +34,6 @@
|
||||
#ifdef WIN32 /* mingw32 hack */
|
||||
#undef Yield
|
||||
#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
|
||||
|
||||
/* Let vlc take care of the i18n stuff */
|
||||
@ -53,6 +47,11 @@ extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
|
||||
#include "wxwindows.h"
|
||||
|
||||
/* 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__
|
||||
int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user