Changeset 649c93388de52ab1d798f1bae283afb58df68c19

Show
Ignore:
Timestamp:
03/20/08 19:11:53 (4 months ago)
Author:
Sam Hocevar <sam@zoy.org>
git-committer:
Sam Hocevar <sam@zoy.org> 1206036713 +0000
git-parent:

[8b5869976eae2be0bee9e9c9d0ab4f8d7a258bc0]

git-author:
Sam Hocevar <sam@zoy.org> 1206036713 +0000
Message:

Minor Windows ME build fixes.

Add a --disable-wince option so that we can disable this (probably broken)
plugin's build when mingwce is detected. Also, add -lmmtimer to the libvlc
link flags because this is where timeGetTime() lies.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r16c69ad r649c933  
    306306        VLC_ADD_LDFLAGS([libvlc vlc],[-e WinMainCRTStartup]) 
    307307        VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync],[-lws2]) 
     308        VLC_ADD_LIBS([libvlc],[-lmmtimer]) 
    308309   fi 
    309310    ;; 
    …… 
    52205221dnl  WinCE GUI module 
    52215222dnl 
    5222 if test "${SYS}" = "mingwce"; then 
    5223   VLC_ADD_BUILTINS([wince]) 
    5224   VLC_ADD_CXXFLAGS([wince],[]) 
    5225   VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) 
    5226   dnl Gross hack 
    5227   VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) 
    5228 elif test "${SYS}" = "mingw32"; then 
    5229   VLC_ADD_CXXFLAGS([wince],[]) 
    5230   VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) 
    5231   dnl Gross hack 
    5232   VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) 
     5223AC_ARG_ENABLE(wince, 
     5224  [  --enable-wince          Windows CE interface (default enabled with MinGW)]) 
     5225if test "${enable_wince}" != "no"; then 
     5226  if test "${SYS}" = "mingwce"; then 
     5227    VLC_ADD_BUILTINS([wince]) 
     5228    VLC_ADD_CXXFLAGS([wince],[]) 
     5229    VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) 
     5230    dnl Gross hack 
     5231    VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) 
     5232  elif test "${SYS}" = "mingw32"; then 
     5233    VLC_ADD_CXXFLAGS([wince],[]) 
     5234    VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) 
     5235    dnl Gross hack 
     5236    VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) 
     5237  fi 
    52335238fi 
    52345239