Changeset 50fd98c4a02156cf6a57112b7593386af560f938

Show
Ignore:
Timestamp:
07/25/03 15:24:29 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1059139469 +0000
git-parent:

[2b616a2310e6a23fc79809c8e880318be496f22b]

git-author:
Gildas Bazin <gbazin@videolan.org> 1059139469 +0000
Message:

* INSTALL.win32: updated build instructions (btw since the last build changes, mingw+msys can be used again to compile VLC).
* modules/gui/wxwindows/wxwindows.cpp: oops.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • INSTALL.win32

    r8dc4cae r50fd98c  
    1 $Id: INSTALL.win32,v 1.17 2003/07/06 16:22:15 gbazin Exp $ 
     1$Id: INSTALL.win32,v 1.18 2003/07/25 13:24:29 gbazin Exp $ 
    22 
    33INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player 
    …… 
    1818your current directory. 
    1919 
    20 If you want to play a DVD, run VLC and click on the Disc option in the 
    21 interface. You then have to type your drive letter followed by a colon in 
    22 the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive). 
    23  
    2420Additional documentation is available at http://www.videolan.org/doc/ 
    2521 
    …… 
    3733  (MSYS is a minimal build environnement to compile unixish projects under 
    3834  windoze. It provides all the common unix tools like sh, gmake...) 
    39   Please note that there is currenlty a bug in MSYS which requires you to 
    40   edit the acgeneral.m4 file and replace the value of ac_max_sed_lines to 
    41   something higher, for instance 976. 
     35  Please note that the gettext utilities are not included in the default 
     36  MSYS/MINGW packages so you won't be able to build VLC with i18n support. 
    4237 
    4338- natively on Windows, using Microsoft Visual C++. Even though we provide some 
    …… 
    7368 
    7469http://www.mingw.org/download.shtml 
    75 http://prdownloads.sf.net/mingw/MSYS-1.0.9-2003.14.18-1.exe 
    76 http://prdownloads.sf.net/mingw/MinGW-2.0.0-3.exe 
     70http://prdownloads.sf.net/mingw/MSYS-1.0.9.exe 
     71http://prdownloads.sf.net/mingw/MinGW-3.0.0-rc3.exe 
    7772http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe 
    7873 
    …… 
    8984http://www.videolan.org/pub/testing/contrib/ 
    9085 
    91 I also provide a package with all the libraries already compiled so it is 
     86We also provide a package with all the libraries already compiled so it is 
    9287actually really easy to compile a full-featured version of vlc (these compiled 
    9388libraries will only work with mingw or cygwin): 
    94 http://www.videolan.org/pub/testing/win32/contrib-20030622-win32-bin.tar.bz2 
     89http://www.videolan.org/pub/testing/win32/contrib-20030725-win32-bin.tar.bz2 
    9590All you need to do is extract it in your root directory (the include files 
    9691and libraries will be put in /usr/win32). You can do this with the following 
    97 command: "tar xjvf contrib-20030622-win32-bin.tar.bz2 -C /" 
     92command: "tar xjvf contrib-20030725-win32-bin.tar.bz2 -C /" 
    9893 
    9994A complete list of the libraries on which we depend can be found here: 
    …… 
    113108 
    114109  ./bootstrap && \ 
    115   CPPFLAGS=-I/usr/win32/include LDFLAGS=-L/usr/win32/lib \ 
     110  CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \ 
     111  LDFLAGS=-L/usr/win32/lib \ 
    116112  CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \ 
    117113  ./configure --host=i586-mingw32msvc --build=i386-linux \ 
    118114      --disable-sdl --disable-gtk \ 
    119       --with-included-gettext --enable-nls \ 
    120       --enable-mad \ 
    121       --enable-ffmpeg \ 
    122       --enable-dvdread --enable-dvdplay \ 
     115      --enable-nls \ 
     116      --enable-ffmpeg --with-ffmpeg-mp3lame \ 
    123117      --enable-faad \ 
    124118      --enable-flac \ 
    125119      --enable-theora \ 
    126120      --with-wx-config-path=/usr/win32/bin \ 
    127       --with-skins-wx-config-path=/usr/win32/bin \ 
    128121      --with-freetype-config-path=/usr/win32/bin \ 
    129122      --enable-debug 
    …… 
    133126something like this: 
    134127  ./bootstrap && \ 
    135   CPPFLAGS=-I/usr/win32/include LDFLAGS=-L/usr/win32/lib \ 
     128  CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \ 
     129  LDFLAGS=-L/usr/win32/lib \ 
    136130  CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \ 
    137131  ./configure \ 
    138132      --disable-sdl --disable-gtk \ 
    139       --with-included-gettext --enable-nls \ 
    140       --enable-mad \ 
    141       --enable-ffmpeg \ 
    142       --enable-dvdread --enable-dvdplay \ 
     133      --enable-nls \ 
     134      --enable-ffmpeg --with-ffmpeg-mp3lame \ 
    143135      --enable-faad \ 
    144136      --enable-flac \ 
    145137      --enable-theora \ 
    146138      --with-wx-config-path=/usr/win32/bin \ 
    147       --with-skins-wx-config-path=/usr/win32/bin \ 
    148139      --with-freetype-config-path=/usr/win32/bin \ 
    149140      --enable-debug 
    …… 
    155146lines: 
    156147  ./bootstrap && \ 
    157   CPPFLAGS=-I/usr/win32/include LDFLAGS=-L/usr/win32/lib \ 
     148  CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \ 
     149  LDFLAGS=-L/usr/win32/lib \ 
    158150  ./configure \ 
    159151      --disable-sdl --disable-gtk \ 
    160       --with-included-gettext --enable-nls \ 
    161       --enable-mad \ 
    162       --enable-ffmpeg \ 
    163       --enable-dvdread --enable-dvdplay \ 
     152      --enable-nls \ 
     153      --enable-ffmpeg --with-ffmpeg-mp3lame \ 
    164154      --enable-faad \ 
    165155      --enable-flac \ 
    166156      --enable-theora \ 
    167157      --with-wx-config-path=/usr/win32/bin \ 
    168       --with-skins-wx-config-path=/usr/win32/bin \ 
    169158      --with-freetype-config-path=/usr/win32/bin \ 
    170159      --enable-debug 

  • modules/gui/wxwindows/wxwindows.cpp

    rd78e17c r50fd98c  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: wxwindows.cpp,v 1.25 2003/07/25 11:33:24 gbazin Exp $ 
     5 * $Id: wxwindows.cpp,v 1.26 2003/07/25 13:24:29 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    4848 
    4949/* Temporary hack */ 
    50 #if defined(WIN32) && definded(_WX_INIT_H_) 
     50#if defined(WIN32) && defined(_WX_INIT_H_) 
    5151/* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */ 
    5252extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,