Changeset 4bbe6f6f3955abc5472d692bda44623012848e11

Show
Ignore:
Timestamp:
01/24/03 13:01:03 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1043409663 +0000
git-parent:

[953ef37b0dd76c2f70af72a9a380c5d743eaa864]

git-author:
Sam Hocevar <sam@videolan.org> 1043409663 +0000
Message:
  • ./configure.ac.in: removed the --with-bcbuilder flag.
  • ./INSTALL.win32: updated accordingly.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • INSTALL.win32

    r7fc0df7 r4bbe6f6  
    161161 If you are happy with the GTK interface, then you can skip this section) 
    162162 
    163 1) Compile vlc as usual. 
     1631) Install Borland C++ Builder, you will need bpr2mak and make. 
    164164 
    165 2) From the plugin\win32 directory, use Borland C++ command-line tools 
    166 as follows: 
    167 bpr2mak intfwin.bpr -s \ 
    168   | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -D__PLUGIN__ -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' \ 
    169   > intfwin.mak         // Create a makefile from intfwin.bpr 
    170 make -fintfwin      // It's Borland's make utility ! 
     1652) Make sure you have the bpr2mak and bcmake (NOT make!) commands in $PATH, 
     166they can be symlinks to the Borland bpr2mak and make utilities, or wrappers 
     167that call them through Wine if you are cross-compiling from Linux. 
    171168 
    172 3) This should create a intfwin.so 
    173 You can remove any other generated file. 
    174  
     1693) Configure vlc as usual with the --enable-intfwin flag and build it. 
    175170 
    176171Well done, now you're ready to use vlc! 

  • configure.ac.in

    rdba1461 r4bbe6f6  
    3434AC_PROG_INSTALL 
    3535 
    36 dnl AC_PROG_EGREP only exists in autoconf 2.54+ 
     36dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right 
     37dnl now otherwise it might be set in an obscure if statement. 
    3738AC_EGREP_CPP(foo,foo) 
    3839 
    …… 
    24662467[ if test "x${enable_intfwin}" != "xno" 
    24672468  then 
    2468     AC_ARG_WITH(bcbuilder, 
    2469     [    --with-bcbuilder=PATH Borland C++ Builder installation path]) 
    2470     if test "x${with_bcbuilder}" != "x" 
    2471     then 
    2472       BCBUILDER="${with_bcbuilder}" 
    2473     fi 
     2469    AC_CHECK_TOOL(BPR2MAK, bpr2mak, AC_ERROR(bpr2mak not found)) 
     2470    AC_CHECK_TOOL(BCMAKE, bcmake, AC_ERROR(bcmake not found)) 
    24742471    PLUGINS="${PLUGINS} win32" 
    24752472  fi ]) 
    …… 
    28482845AC_SUBST(MOC) 
    28492846AC_SUBST(WINDRES) 
    2850 AC_SUBST(BCBUILDER) 
    28512847AC_SUBST(XPIDL) 
    28522848AC_SUBST(LIBEXT) 

  • modules/gui/win32/Modules.am

    r8450492 r4bbe6f6  
    1212    cd modules/gui/win32/ && \ 
    1313    rm -f win32.mak && \ 
    14     $(BCBUILDER)/Bin/bpr2mak win32.bpr -s | \ 
     14    $(BPR2MAK) win32.bpr -s | \ 
    1515        sed -e 's@^LIBPATH = .*@&;$$(RELEASELIBPATH)@' \ 
    1616            -e 's@^USERDEFINES = .*@& -DMODULE_NAME=win32@' \ 
    1717        > win32.mak && \ 
    18     $(BCBUILDER)/Bin/make -f win32.mak -b 
     18    $(BCMAKE) -f win32.mak -b 
    1919 
    2020BORLAND_win32 = \ 

  • modules/gui/win32/menu.cpp

    rd48ff8b r4bbe6f6  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002-2003 VideoLAN 
    5  * $Id: menu.cpp,v 1.8 2003/01/23 03:33:34 ipkiss Exp $ 
     5 * $Id: menu.cpp,v 1.9 2003/01/24 12:01:03 sam Exp $ 
    66 * 
    77 * Authors: Olivier Teuliere <ipkiss@via.ecp.fr> 
    …… 
    171171    TMenuItem     * ItemTitle; 
    172172    input_area_t  * p_area; 
    173     int             i_title = Item->Tag; 
     173    unsigned int    i_title = Item->Tag; 
    174174 
    175175    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); 
    …… 
    198198    TMenuItem     * ItemTitle; 
    199199    input_area_t  * p_area; 
    200     int             i_title; 
    201     int             i_chapter = Item->Tag; 
     200    unsigned int    i_title; 
     201    unsigned int    i_chapter = Item->Tag; 
    202202 
    203203    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); 
    …… 
    229229    TMenuItem     * ItemTitle; 
    230230    input_area_t  * p_area; 
    231     int             i_title   = Data2Title( Item->Tag ); 
    232     int             i_chapter = Data2Chapter( Item->Tag ); 
     231    unsigned int    i_title   = Data2Title( Item->Tag ); 
     232    unsigned int    i_chapter = Data2Chapter( Item->Tag ); 
    233233 
    234234    vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); 

  • modules/gui/win32/win32.cpp

    rd48ff8b r4bbe6f6  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002-2003 VideoLAN 
    5  * $Id: win32.cpp,v 1.11 2003/01/23 03:33:34 ipkiss Exp $ 
     5 * $Id: win32.cpp,v 1.12 2003/01/24 12:01:03 sam Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    173173    if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die ) 
    174174    { 
    175         vlc_bool_t b_need_menus = 0; 
     175        vlc_bool_t b_need_menus = VLC_FALSE; 
    176176        input_thread_t  * p_input = p_intf->p_sys->p_input; 
    177177        aout_instance_t * p_aout = NULL; 
    …… 
    184184        { 
    185185            p_intf->p_sys->p_window->ModeManage(); 
    186             b_need_menus = 1; 
     186            b_need_menus = VLC_TRUE; 
    187187            p_intf->p_sys->b_playing = 1; 
    188188        } 
    …… 
    226226        { 
    227227            p_intf->p_sys->b_chapter_update = 1; 
    228             b_need_menus = 1; 
     228            b_need_menus = VLC_TRUE; 
    229229        } 
    230230 
    …… 
    239239            { 
    240240                p_intf->p_sys->b_aout_update = 1; 
    241                 b_need_menus = 1; 
     241                b_need_menus = VLC_TRUE; 
    242242            } 
    243243 
    …… 
    255255            { 
    256256                p_intf->p_sys->b_vout_update = 1; 
    257                 b_need_menus = 1; 
     257                b_need_menus = VLC_TRUE; 
    258258            } 
    259259 
    …… 
    261261        } 
    262262 
    263 //        if( b_need_menus ) 
    264 //            p_intf->p_sys->p_menus->SetupMenus(); 
     263        if( b_need_menus ) 
     264        { 
     265            //p_intf->p_sys->p_menus->SetupMenus(); 
     266        } 
    265267 
    266268        vlc_mutex_unlock( &p_input->stream.stream_lock );