Changeset be8ca6e9a9924ccdf8c72449b85bdb97e05e87a6

Show
Ignore:
Timestamp:
11/10/02 19:04:24 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1036951464 +0000
git-parent:

[74e8f4f6ac00d56ac3cbc2412fb19fe489ac5218]

git-author:
Sam Hocevar <sam@videolan.org> 1036951464 +0000
Message:
  • ALL: WinCE compilation fixes (mostly nonexistent headers). A lot of
    work is still needed for missing functions. I only touched libvlc for
    the moment, plugins will come in a long long while.
  • ./bootstrap: moved MSVC project files generation here; use --update-msvc.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.am

    r5d02f37 rbe8ca6e  
    277277    msvc/vlc.dsp.in \ 
    278278    msvc/vlc.dsp.out \ 
     279    msvc/vlc.vcp \ 
     280    msvc/vlc.vcw \ 
     281    msvc/vlc.vcp.in \ 
     282    msvc/vlc.vcp.out \ 
    279283    msvc/config.h \ 
    280284    msvc/modules_builtin_msvc.h \ 
    281285    $(NULL) 
    282286 
    283 
    284 # rule to rebuild vlc.dsp - not for the faint of heart 
    285 
    286 update-vlc.dsp: FORCE 
    287     rm -f msvc/vlc.dsp 
    288 #   Top of the project file 
    289     cat msvc/vlc.dsp.in > msvc/vlc.dsp 
    290 #   The source files 
    291     echo '# Begin Group "Source Files" 
    292 ' >> msvc/vlc.dsp 
    293     echo '# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 
    294 ' >> msvc/vlc.dsp 
    295     echo '# Begin Group "vlc" 
    296 ' >> msvc/vlc.dsp 
    297     for file in $(vlc_SOURCES) ; do \ 
    298         echo '# Begin Source File 
    299 ' >> msvc/vlc.dsp ; \ 
    300         echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" 
    301 %' >> msvc/vlc.dsp ; \ 
    302         echo '# End Source File 
    303 ' >> msvc/vlc.dsp ; \ 
    304     done ; \ 
    305     echo '# End Group 
    306 ' >> msvc/vlc.dsp 
    307     echo '# Begin Group "libvlc" 
    308 ' >> msvc/vlc.dsp 
    309     for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep -v "/.*/"` ; do \ 
    310         echo '# Begin Source File 
    311 ' >> msvc/vlc.dsp ; \ 
    312         echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" 
    313 %' >> msvc/vlc.dsp ; \ 
    314         echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    315 ' >> msvc/vlc.dsp ; \ 
    316         echo '# End Source File 
    317 ' >> msvc/vlc.dsp ; \ 
    318     done ; \ 
    319     for subdir in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` ; do \ 
    320         echo '# Begin Group "'$$subdir'" 
    321 ' >> msvc/vlc.dsp ; \ 
    322         for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/$$subdir/"` ; do \ 
    323             echo '# Begin Source File 
    324 ' >> msvc/vlc.dsp ; \ 
    325             echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" 
    326 %' >> msvc/vlc.dsp ; \ 
    327             echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    328 ' >> msvc/vlc.dsp ; \ 
    329             echo '!IF "$$(CFG)" == "vlc - Win32 Release" 
    330 ' >> msvc/vlc.dsp ; \ 
    331             echo '# PROP Intermediate_Dir "Release\'$$subdir'" 
    332 ' >> msvc/vlc.dsp ; \ 
    333             echo '# PROP Output_Dir "Release\'$$subdir'" 
    334 ' >> msvc/vlc.dsp ; \ 
    335             echo '!ELSEIF "$$(CFG)" == "vlc - Win32 Debug" 
    336 ' >> msvc/vlc.dsp ; \ 
    337             echo '# PROP Intermediate_Dir "Debug\'$$subdir'" 
    338 ' >> msvc/vlc.dsp ; \ 
    339             echo '# PROP Output_Dir "Debug\'$$subdir'" 
    340 ' >> msvc/vlc.dsp ; \ 
    341             echo '!ENDIF 
    342 ' >> msvc/vlc.dsp ; \ 
    343             echo '# End Source File 
    344 ' >> msvc/vlc.dsp ; \ 
    345         done ; \ 
    346         echo '# End Group 
    347 ' >> msvc/vlc.dsp ; \ 
    348     done 
    349     echo '# End Group 
    350 ' >> msvc/vlc.dsp 
    351     echo '# End Group 
    352 ' >> msvc/vlc.dsp 
    353 #   The modules 
    354     echo 'no modules yet' 
    355 #   The headers 
    356     echo '# Begin Group "Header Files" 
    357 ' >> msvc/vlc.dsp 
    358     echo '# PROP Default_Filter "h;hpp;hxx;hm;inl" 
    359 ' >> msvc/vlc.dsp 
    360     for file in $(HEADERS_include) $(HEADERS_include_built) ; do \ 
    361         echo '# Begin Source File 
    362 ' >> msvc/vlc.dsp ; \ 
    363         echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" 
    364 %' >> msvc/vlc.dsp ; \ 
    365         echo '# End Source File 
    366 ' >> msvc/vlc.dsp ; \ 
    367     done 
    368     echo '# Begin Group "vlc" 
    369 ' >> msvc/vlc.dsp 
    370     for file in $(dist_pkginclude_HEADERS) ; do \ 
    371         echo '# Begin Source File 
    372 ' >> msvc/vlc.dsp ; \ 
    373         echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" 
    374 %' >> msvc/vlc.dsp ; \ 
    375         echo '# End Source File 
    376 ' >> msvc/vlc.dsp ; \ 
    377     done 
    378     echo '# End Group 
    379 ' >> msvc/vlc.dsp 
    380     echo '# End Group 
    381 ' >> msvc/vlc.dsp 
    382 #   Bottom of the project file - handles resource files too 
    383     cat msvc/vlc.dsp.out >> msvc/vlc.dsp 
     287show-vlc-sources: FORCE 
     288    @echo X: $(vlc_SOURCES) 
     289 
     290show-libvlc-sources: FORCE 
     291    @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_strndup) 
     292 
     293show-libvlc-headers: FORCE 
     294    @echo X: $(HEADERS_include) $(HEADERS_include_built) 
     295 
     296show-libvlc-pkg-headers: FORCE 
     297    @echo X: $(dist_pkginclude_HEADERS) 
    384298 
    385299############################################################################### 
     
    400314 
    401315if HAVE_BEOS 
    402 SOURCES_libvlc_beos = $(OPT_SOURCES_libvlc_beos) 
     316OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) 
    403317endif 
    404318if HAVE_DARWIN 
    405 SOURCES_libvlc_darwin = $(OPT_SOURCES_libvlc_darwin) 
     319OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) 
    406320endif 
    407321if HAVE_WIN32 
    408 SOURCES_libvlc_win32 = $(OPT_SOURCES_libvlc_win32) 
     322OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) 
    409323endif 
    410324if BUILD_DIRENT 
    411 SOURCES_libvlc_dirent = $(OPT_SOURCES_libvlc_dirent) 
     325OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) 
    412326endif 
    413327if BUILD_GETOPT 
    414 SOURCES_libvlc_getopt = $(OPT_SOURCES_libvlc_getopt) 
     328OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) 
    415329endif 
    416330if BUILD_STRNDUP 
    417 SOURCES_libvlc_strndup = $(OPT_SOURCES_libvlc_strndup) 
     331OPT_SOURCES_libvlc_strndup = $(SOURCES_libvlc_strndup) 
    418332endif 
    419333if BUILD_MOZILLA 
     
    422336 
    423337EXTRA_DIST += \ 
    424     $(OPT_SOURCES_libvlc_beos) \ 
    425     $(OPT_SOURCES_libvlc_darwin) \ 
    426     $(OPT_SOURCES_libvlc_win32) \ 
    427     $(OPT_SOURCES_libvlc_dirent) \ 
    428     $(OPT_SOURCES_libvlc_getopt) \ 
    429     $(OPT_SOURCES_libvlc_strndup) \ 
    430     $(NULL) 
    431  
    432 OPT_SOURCES_libvlc_beos = \ 
     338    $(SOURCES_libvlc_beos) \ 
     339    $(SOURCES_libvlc_darwin) \ 
     340    $(SOURCES_libvlc_win32) \ 
     341    $(SOURCES_libvlc_dirent) \ 
     342    $(SOURCES_libvlc_getopt) \ 
     343    $(SOURCES_libvlc_strndup) \ 
     344    $(NULL) 
     345 
     346SOURCES_libvlc_beos = \ 
    433347    src/misc/beos_specific.cpp \ 
    434348    $(NULL) 
    435349 
    436 OPT_SOURCES_libvlc_darwin = \ 
     350SOURCES_libvlc_darwin = \ 
    437351    src/misc/darwin_specific.c \ 
    438352    $(NULL) 
    439353 
    440 OPT_SOURCES_libvlc_win32 = \ 
     354SOURCES_libvlc_win32 = \ 
    441355    src/misc/win32_specific.c \ 
    442356    $(NULL) 
    443357 
    444 OPT_SOURCES_libvlc_dirent = \ 
     358SOURCES_libvlc_dirent = \ 
    445359    src/extras/dirent.c \ 
    446360    src/extras/dirent.h \ 
    447361    $(NULL) 
    448362 
    449 OPT_SOURCES_libvlc_getopt = \ 
     363SOURCES_libvlc_getopt = \ 
    450364    src/extras/getopt.c \ 
    451365    src/extras/getopt.h \ 
     
    453367    $(NULL) 
    454368 
    455 OPT_SOURCES_libvlc_strndup = \ 
     369SOURCES_libvlc_strndup = \ 
    456370    src/extras/strndup.c 
    457371    $(NULL) 
    458372 
    459 SOURCES_libvlc = \ 
     373SOURCES_libvlc_common = \ 
    460374    src/libvlc.c \ 
    461375    src/libvlc.h \ 
     
    492406    src/misc/netutils.c \ 
    493407    src/misc/iso_lang.c \ 
    494     src/misc/iso-639.def
     408    src/misc/iso-639_def.h
    495409    src/misc/messages.c \ 
    496410    src/misc/objects.c \ 
    497411    src/misc/variables.c \ 
    498412    src/misc/error.c \ 
    499     $(SOURCES_libvlc_beos) \ 
    500     $(SOURCES_libvlc_darwin) \ 
    501     $(SOURCES_libvlc_win32) \ 
    502     $(SOURCES_libvlc_dirent) \ 
    503     $(SOURCES_libvlc_getopt) \ 
    504     $(SOURCES_libvlc_strndup) \ 
     413    $(NULL) 
     414 
     415SOURCES_libvlc = \ 
     416    $(SOURCES_libvlc_common) \ 
     417    $(OPT_SOURCES_libvlc_beos) \ 
     418    $(OPT_SOURCES_libvlc_darwin) \ 
     419    $(OPT_SOURCES_libvlc_win32) \ 
     420    $(OPT_SOURCES_libvlc_dirent) \ 
     421    $(OPT_SOURCES_libvlc_getopt) \ 
     422    $(OPT_SOURCES_libvlc_strndup) \ 
    505423    $(NULL) 
    506424 
  • bootstrap

    r05ac379 rbe8ca6e  
    22 
    33##  bootstrap file for vlc, the VideoLAN Client 
    4 ##  $Id: bootstrap,v 1.24 2002/11/09 16:34:52 sam Exp $ 
     4##  $Id: bootstrap,v 1.25 2002/11/10 18:04:22 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
     
    1616### 
    1717do_po=no 
     18do_msvc=no 
    1819while test $# -gt 0; do 
    1920  case "$1" in 
     21    --update-msvc) 
     22      do_msvc=yes 
     23      ;; 
    2024    --update-po) 
    2125      do_po=yes 
    2226      ;; 
    2327    *) 
    24       echo "unknown option $1" 
     28      echo "$0: unknown option $1" 
     29      echo "recognized flags are --update-msvc and --update-po" 
     30      exit 1 
    2531      ;; 
    2632  esac 
    2733  shift 
    2834done 
     35 
     36## 
     37##  Update the MSVC project files 
     38## 
     39if test "$do_msvc" = "no" 
     40then 
     41  echo "not updating MSVC project file. use --update-msvc to force doing it." 
     42else 
     43  if test ! -f Makefile 
     44  then 
     45    echo "no Makefile found, did you run ./configure?" 
     46    exit 1 
     47  fi 
     48 
     49  #  The evil ^M 
     50  M=' 
     51' 
     52 
     53  #  Sources that get built under Win32 
     54  VLC_SOURCES=`make show-vlc-sources | grep '^X: ' | cut -b3-` 
     55  LIBVLC_SOURCES=`make show-libvlc-sources | grep '^X: ' | cut -b3-` 
     56  LIBVLC_HEADERS=`make show-libvlc-headers | grep '^X: ' | cut -b3-` 
     57  LIBVLC_PKG_HEADERS=`make show-libvlc-pkg-headers | grep '^X: ' | cut -b3-` 
     58 
     59  for target in msvc/vlc.vcp msvc/vlc.dsp 
     60  do 
     61    rm -f ${target} 
     62    #  Top of the project file 
     63    cat ${target}.in > ${target} 
     64    #  The source files 
     65    cat >> ${target} << EOF 
     66# Begin Group "Source Files"${M} 
     67# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"${M} 
     68# Begin Group "vlc"${M} 
     69EOF 
     70    for file in ${VLC_SOURCES} 
     71    do 
     72      cat >> ${target} << EOF 
     73# Begin Source File${M} 
     74SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     75# End Source File${M} 
     76EOF 
     77    done 
     78    cat >> ${target} << EOF 
     79# End Group${M} 
     80# Begin Group "libvlc"${M} 
     81EOF 
     82    for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` 
     83    do 
     84      cat >> ${target} << EOF 
     85# Begin Source File${M} 
     86SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     87# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} 
     88# End Source File${M} 
     89EOF 
     90    done 
     91    for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` 
     92    do 
     93      cat >> ${target} << EOF 
     94# Begin Group "${subdir}"${M} 
     95EOF 
     96      for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` 
     97      do 
     98      if test "${target}" = "msvc/vlc.vcp" 
     99      then 
     100        cat >> ${target} << EOF 
     101# Begin Source File${M} 
     102SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     103# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} 
     104!IF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Release"${M} 
     105# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     106# PROP Output_Dir "Release\\${subdir}"${M} 
     107!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE MIPS) Debug"${M} 
     108# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     109# PROP Output_Dir "Debug\\${subdir}"${M} 
     110!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Release"${M} 
     111# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     112# PROP Output_Dir "Release\\${subdir}"${M} 
     113!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH4) Debug"${M} 
     114# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     115# PROP Output_Dir "Debug\\${subdir}"${M} 
     116!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Release"${M} 
     117# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     118# PROP Output_Dir "Release\\${subdir}"${M} 
     119!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE SH3) Debug"${M} 
     120# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     121# PROP Output_Dir "Debug\\${subdir}"${M} 
     122!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Release"${M} 
     123# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     124# PROP Output_Dir "Release\\${subdir}"${M} 
     125!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE ARM) Debug"${M} 
     126# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     127# PROP Output_Dir "Debug\\${subdir}"${M} 
     128!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Release"${M} 
     129# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     130# PROP Output_Dir "Release\\${subdir}"${M} 
     131!ELSEIF "\$(CFG)" == "vlc - Win32 (WCE x86em) Debug"${M} 
     132# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     133# PROP Output_Dir "Debug\\${subdir}"${M} 
     134!ENDIF${M} 
     135# End Source File${M} 
     136EOF 
     137        else 
     138          cat >> ${target} << EOF 
     139# Begin Source File${M} 
     140SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     141# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} 
     142!IF "\$(CFG)" == "vlc - Win32 Release"${M} 
     143# PROP Intermediate_Dir "Release\\${subdir}"${M} 
     144# PROP Output_Dir "Release\\${subdir}"${M} 
     145!ELSEIF "\$(CFG)" == "vlc - Win32 Debug"${M} 
     146# PROP Intermediate_Dir "Debug\\${subdir}"${M} 
     147# PROP Output_Dir "Debug\\${subdir}"${M} 
     148!ENDIF${M} 
     149# End Source File${M} 
     150EOF 
     151        fi 
     152      done 
     153      cat >> ${target} << EOF 
     154# End Group${M} 
     155EOF 
     156    done 
     157    cat >> ${target} << EOF 
     158# End Group${M} 
     159# End Group${M} 
     160EOF 
     161    #  The modules 
     162    echo 'no modules yet' 
     163    #  The headers 
     164    cat >> ${target} << EOF 
     165# Begin Group "Header Files"${M} 
     166# PROP Default_Filter "h;hpp;hxx;hm;inl"${M} 
     167EOF 
     168    for file in ${LIBVLC_HEADERS} 
     169    do 
     170      cat >> ${target} << EOF 
     171# Begin Source File${M} 
     172SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     173# End Source File${M} 
     174EOF 
     175    done 
     176    cat >> ${target} << EOF 
     177# Begin Group "vlc"${M} 
     178EOF 
     179    for file in ${LIBVLC_PKG_HEADERS} 
     180    do 
     181      cat >> ${target} << EOF 
     182# Begin Source File${M} 
     183SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     184# End Source File${M} 
     185EOF 
     186    done 
     187    cat >> ${target} << EOF 
     188# End Group${M} 
     189# End Group${M} 
     190EOF 
     191    #  Bottom of the project file - handles resource files too 
     192    cat ${target}.out >> ${target} 
     193  done 
     194 
     195  exit 0 
     196fi 
     197 
     198## 
     199##  Update the potfiles because no one ever does it 
     200## 
     201if test "$do_po" = "no" 
     202then 
     203  echo "not updating potfiles. use --update-po to force doing it." 
     204else 
     205  cd po 
     206  make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//' 
     207  cd .. 
     208 
     209  exit 0 
     210fi 
    29211 
    30212## 
     
    299481        -e 's#_("/dev/dvd")#"/dev/dvd"#' \ 
    300482        -e 's#_(\("./."\))#\1#' \ 
    301    < modules/gui/gtk/$file >> /tmp/$$.$file.bak 
     483        < modules/gui/gtk/$file >> /tmp/$$.$file.bak 
    302484    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file 
    303485fi 
     
    310492    sed -e 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by bootstrap/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < modules/gui/gtk/$file > /tmp/$$.$file.bak 
    311493    mv -f /tmp/$$.$file.bak modules/gui/gtk/$file 
    312 fi 
    313  
    314 ## 
    315 ##  Don't update the MSVC project file 
    316 ## 
    317 echo "not updating MSVC project file. run 'make update-vlc.dsp' for this." 
    318  
    319 ## 
    320 ##  Update the potfiles because no one ever does it 
    321 ## 
    322 if test "$do_po" = "no" 
    323 then 
    324   echo "not updating potfiles. use --update-po to force doing it." 
    325 else 
    326   cd po 
    327   make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//' 
    328   cd .. 
    329494fi 
    330495 
  • configure.ac.in

    r5d02f37 rbe8ca6e  
    317317 
    318318dnl Check for headers 
    319 AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h) 
    320 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h
     319AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h) 
     320AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h
    321321AC_CHECK_HEADERS(dlfcn.h image.h) 
    322322AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h) 
  • doc/fortunes.txt

    r141414b rbe8ca6e  
    354354  -- #videolan 
    355355% 
     356<Meuuh> at the salsa lesson tonight, a girl told me that she was very happy to          dance with me 
     357<Meuuh> do you think it means something ? 
     358<Dnumgis> Probably that she finally found someone that was worse at dancing  
     359          than she 
     360 
     361  -- #videolan 
     362% 
     363<hal_3k> damn 
     364<hal_3k> why didn't you use LGPL? 
     365<sam> why don't you use GPL? 
     366 
     367  -- #videolan 
     368% 
  • include/main.h

    rbf7985b rbe8ca6e  
    44 ***************************************************************************** 
    55 * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN 
    6  * $Id: main.h,v 1.49 2002/10/14 16:46:55 sam Exp $ 
     6 * $Id: main.h,v 1.50 2002/11/10 18:04:22 sam Exp $ 
    77 * 
    88 * Authors: Vincent Seguin <seguin@via.ecp.fr> 
     
    5858#if defined( SYS_BEOS ) 
    5959    vlc_object_t *         p_appthread; 
    60 #elif defined( WIN32 ) 
     60#elif defined( WIN32 ) && !defined( UNDER_CE ) 
    6161    SIGNALOBJECTANDWAIT    SignalObjectAndWait; 
    6262    vlc_bool_t             b_fast_mutex; 
     
    8484    /* Fast memcpy plugin used */ 
    8585    module_t *             p_memcpy_module; 
     86#if defined( WIN32 ) 
     87    void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t ); 
     88    void* ( __cdecl *pf_memset ) ( void *, int, size_t ); 
     89#else 
    8690    void* ( *pf_memcpy ) ( void *, const void *, size_t ); 
    8791    void* ( *pf_memset ) ( void *, int, size_t ); 
     92#endif 
    8893 
    8994    /* Shared data - these structures are accessed directly from p_vlc by 
  • include/vlc_threads.h

    rf5991d1 rbe8ca6e  
    44 ***************************************************************************** 
    55 * Copyright (C) 1999, 2002 VideoLAN 
    6  * $Id: vlc_threads.h,v 1.16 2002/10/28 22:31:50 gbazin Exp $ 
     6 * $Id: vlc_threads.h,v 1.17 2002/11/10 18:04:22 sam Exp $ 
    77 * 
    88 * Authors: Jean-Marc Dressler <polux@via.ecp.fr> 
     
    2929 
    3030#if defined(GPROF) || defined(DEBUG) 
    31 #   include <sys/time.h> 
     31#   ifdef HAVE_SYS_TIME_H 
     32#       include <sys/time.h> 
     33#   endif 
    3234#endif 
    3335 
     
    3840#   include <st.h> 
    3941 
    40 #elif defined( WIN32 )                                          /* Win32 API */ 
    41 #   include <process.h> 
     42#elif defined( WIN32 ) 
     43#   if defined( UNDER_CE ) 
     44                                                                /* WinCE API */ 
     45#   else 
     46#       include <process.h>                                     /* Win32 API */ 
     47#   endif 
    4248 
    4349#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )  /* pthreads (like Linux & BSD) */ 
  • include/vlc_threads_funcs.h

    r3a68b7e rbe8ca6e  
    44 ***************************************************************************** 
    55 * Copyright (C) 1999, 2002 VideoLAN 
    6  * $Id: vlc_threads_funcs.h,v 1.7 2002/10/27 17:23:17 titer Exp $ 
     6 * $Id: vlc_threads_funcs.h,v 1.8 2002/11/10 18:04:22 sam Exp $ 
    77 * 
    88 * Authors: Jean-Marc Dressler <polux@via.ecp.fr> 
     
    233233        PulseEvent( p_condvar->event ); 
    234234    } 
     235#   ifndef UNDER_CE 
    235236    else if( p_condvar->i_win9x_cv == 1 ) 
    236237    { 
     
    264265        } 
    265266    } 
     267#   endif 
    266268    return 0; 
    267269 
     
    367369        } 
    368370    } 
     371#   ifndef UNDER_CE 
    369372    else if( p_condvar->i_win9x_cv == 1 ) 
    370373    { 
     
    400403        } 
    401404    } 
     405#   endif 
    402406    return 0; 
    403407 
  • modules/misc/testsuite/test4.c

    rce7d29b rbe8ca6e  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: test4.c,v 1.3 2002/10/17 13:15:30 sam Exp $ 
     5 * $Id: test4.c,v 1.4 2002/11/10 18:04:22 sam Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
     
    4242 * Local prototypes. 
    4343 *****************************************************************************/ 
     44static int    Foo       ( vlc_object_t *, char *, char * ); 
     45 
    4446static int    Callback  ( vlc_object_t *, char *, char * ); 
    4547static int    MyCallback( vlc_object_t *, char const *, 
     
    5759vlc_module_begin(); 
    5860    set_description( _("Miscellaneous stress tests") ); 
     61    var_Create( p_module->p_libvlc, "foo-test", VLC_VAR_COMMAND ); 
     62    var_Set( p_module->p_libvlc, "foo-test", (vlc_value_t)(void*)Foo ); 
    5963    var_Create( p_module->p_libvlc, "callback-test", VLC_VAR_COMMAND ); 
    6064    var_Set( p_module->p_libvlc, "callback-test", (vlc_value_t)(void*)Callback ); 
     
    6468    var_Set( p_module->p_libvlc, "signal", (vlc_value_t)(void*)Signal ); 
    6569vlc_module_end(); 
     70 
     71/***************************************************************************** 
     72 * Foo: put anything here 
     73 *****************************************************************************/ 
     74static int Foo( vlc_object_t *p_this, char *psz_cmd, char *psz_arg ) 
     75{ 
     76    vlc_value_t val; 
     77    int i, i_vals; 
     78    vlc_value_t *p_vals; 
     79 
     80    var_Create( p_this, "honk", VLC_VAR_STRING | VLC_VAR_ISLIST ); 
     81 
     82    val.psz_string = "foo"; 
     83    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val ); 
     84    val.psz_string = "bar"; 
     85    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val ); 
     86    val.psz_string = "baz"; 
     87    var_Change( p_this, "honk", VLC_VAR_ADDCHOICE, &val ); 
     88    var_Change( p_this, "honk", VLC_VAR_SETDEFAULT, &val ); 
     89 
     90    var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string ); 
     91 
     92    val.psz_string = "foo"; 
     93    var_Set( p_this, "honk", val ); 
     94 
     95    var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string ); 
     96 
     97    val.psz_string = "blork"; 
     98    var_Set( p_this, "honk", val ); 
     99 
     100    var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string ); 
     101 
     102    val.psz_string = "baz"; 
     103    var_Change( p_this, "honk", VLC_VAR_DELCHOICE, &val ); 
     104 
     105    var_Get( p_this, "honk", &val ); printf( "value: %s\n", val.psz_string ); 
     106 
     107    var_Change( p_this, "honk", VLC_VAR_GETLIST, &val ); 
     108    i_vals = ((vlc_value_t*)val.p_address)[0].i_int; 
     109    p_vals = &((vlc_value_t*)val.p_address)[1]; 
     110    for( i = 0 ; i < i_vals ; i++ ) 
     111    { 
     112        printf( "value %i: %s\n", i, p_vals[i].psz_string ); 
     113    } 
     114    var_Change( p_this, "honk", VLC_VAR_FREELIST, &val ); 
     115 
     116    var_Destroy( p_this, "honk" ); 
     117 
     118    return VLC_SUCCESS; 
     119} 
    66120 
    67121/***************************************************************************** 
  • modules/video_output/ggi.c

    r5a64fbd rbe8ca6e  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000, 2001 VideoLAN 
    5  * $Id: ggi.c,v 1.1 2002/08/13 11:59:36 sam Exp $ 
     5 * $Id: ggi.c,v 1.2 2002/11/10 18:04:22 sam Exp $ 
    66 * 
    77 * Authors: Vincent Seguin <seguin@via.ecp.fr> 
     
    274274    gii_event_mask mask; 
    275275    gii_event      event; 
     276    vlc_value_t    val; 
    276277 
    277278    mask = emKeyboard | emPtrButtonPress | emPtrButtonRelease; 
     
    292293                    case 'Q': 
    293294                    case GIIUC_Escape: 
    294                         /* FIXME pass message ! */ 
    295295                        p_vout->p_vlc->b_die = 1; 
    296296                        break; 
     
    305305                switch( event.pbutton.button ) 
    306306                { 
     307                    case GII_PBUTTON_LEFT: 
     308                        val.b_bool = VLC_TRUE; 
     309                        var_Set( p_vout, "mouse-clicked", val ); 
     310                        break; 
     311 
    307312                    case GII_PBUTTON_RIGHT: 
    308313                        { 
  • msvc/vlc.dsp

    rce9fc04 rbe8ca6e  
    182182# Begin Group "extras" 
    183183# Begin Source File 
    184 SOURCE="..\src\extras\strndup.c" 
     184SOURCE="..\src\extras\dirent.c" 
    185185# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    186186!IF "$(CFG)" == "vlc - Win32 Release" 
     
    193193# End Source File 
    194194# Begin Source File 
    195 SOURCE="..\src\extras\dirent.c
     195SOURCE="..\src\extras\dirent.h
    196196# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    197197!IF "$(CFG)" == "vlc - Win32 Release" 
     
    204204# End Source File 
    205205# Begin Source File 
    206 SOURCE="..\src\extras\dirent.h
     206SOURCE="..\src\extras\getopt.c
    207207# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    208208!IF "$(CFG)" == "vlc - Win32 Release" 
     
    215215# End Source File 
    216216# Begin Source File 
    217 SOURCE="..\src\extras\getopt.c
     217SOURCE="..\src\extras\getopt.h
    218218# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    219219!IF "$(CFG)" == "vlc - Win32 Release" 
     
    226226# End Source File 
    227227# Begin Source File 
    228 SOURCE="..\src\extras\getopt.h
     228SOURCE="..\src\extras\getopt1.c
    229229# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    230230!IF "$(CFG)" == "vlc - Win32 Release" 
     
    237237# End Source File 
    238238# Begin Source File 
    239 SOURCE="..\src\extras\getopt1.c" 
     239SOURCE="..\src\extras\strndup.c" 
    240240# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
    241241!IF "$(CFG)" == "vlc - Win32 Release" 
  • msvc/vlc.vcp

    rce9fc04 rbe8ca6e  
    374374# Name "vlc - Win32 (WCE x86em) Release" 
    375375# Name "vlc - Win32 (WCE x86em) Debug" 
     376 
    376377# Begin Group "Source Files" 
    377  
    378378# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 
    379 # Begin Source File 
    380  
    381 SOURCE=..\src\vlc.c 
    382  
    383 !IF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Release" 
    384  
    385 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug" 
    386  
    387 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Release" 
    388  
    389 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH4) Debug" 
    390  
    391 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Release" 
    392  
    393 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE SH3) Debug" 
    394  
    395 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Release" 
    396  
    397 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE ARM) Debug" 
    398  
    399 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Release" 
    400  
    401 !ELSEIF  "$(CFG)" == "vlc - Win32 (WCE x86em) Debug" 
    402  
    403 !ENDIF  
    404  
    405 # End Source File 
     379# Begin Group "vlc" 
     380# Begin Source File 
     381SOURCE="..\src\vlc.c" 
     382# End Source File 
     383# End Group 
     384# Begin Group "libvlc" 
     385# Begin Source File 
     386SOURCE="..\src\libvlc.c" 
     387# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     388# End Source File 
     389# Begin Source File 
     390SOURCE="..\src\libvlc.h" 
     391# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     392# End Source File 
     393# Begin Group "audio_output" 
     394# Begin Source File 
     395SOURCE="..\src\audio_output\common.c" 
     396# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     397!IF "$(CFG)" == "vlc - Win32 (WCE MIPS) Release" 
     398# PROP Intermediate_Dir "Release\audio_output" 
     399# PROP Output_Dir "Release\audio_output" 
     400!ELSEIF "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug" 
     401# PROP Intermediate_Dir "Debug\audio_output" 
     402# PROP Output_Dir "Debug\audio_output" 
     403!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Release" 
     404# PROP Intermediate_Dir "Release\audio_output" 
     405# PROP Output_Dir "Release\audio_output" 
     406!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Debug" 
     407# PROP Intermediate_Dir "Debug\audio_output" 
     408# PROP Output_Dir "Debug\audio_output" 
     409!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Release" 
     410# PROP Intermediate_Dir "Release\audio_output" 
     411# PROP Output_Dir "Release\audio_output" 
     412!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Debug" 
     413# PROP Intermediate_Dir "Debug\audio_output" 
     414# PROP Output_Dir "Debug\audio_output" 
     415!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Release" 
     416# PROP Intermediate_Dir "Release\audio_output" 
     417# PROP Output_Dir "Release\audio_output" 
     418!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Debug" 
     419# PROP Intermediate_Dir "Debug\audio_output" 
     420# PROP Output_Dir "Debug\audio_output" 
     421!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Release" 
     422# PROP Intermediate_Dir "Release\audio_output" 
     423# PROP Output_Dir "Release\audio_output" 
     424!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Debug" 
     425# PROP Intermediate_Dir "Debug\audio_output" 
     426# PROP Output_Dir "Debug\audio_output" 
     427!ENDIF 
     428# End Source File 
     429# Begin Source File 
     430SOURCE="..\src\audio_output\dec.c" 
     431# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     432!IF "$(CFG)" == "vlc - Win32 (WCE MIPS) Release" 
     433# PROP Intermediate_Dir "Release\audio_output" 
     434# PROP Output_Dir "Release\audio_output" 
     435!ELSEIF "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug" 
     436# PROP Intermediate_Dir "Debug\audio_output" 
     437# PROP Output_Dir "Debug\audio_output" 
     438!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Release" 
     439# PROP Intermediate_Dir "Release\audio_output" 
     440# PROP Output_Dir "Release\audio_output" 
     441!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Debug" 
     442# PROP Intermediate_Dir "Debug\audio_output" 
     443# PROP Output_Dir "Debug\audio_output" 
     444!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Release" 
     445# PROP Intermediate_Dir "Release\audio_output" 
     446# PROP Output_Dir "Release\audio_output" 
     447!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Debug" 
     448# PROP Intermediate_Dir "Debug\audio_output" 
     449# PROP Output_Dir "Debug\audio_output" 
     450!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Release" 
     451# PROP Intermediate_Dir "Release\audio_output" 
     452# PROP Output_Dir "Release\audio_output" 
     453!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Debug" 
     454# PROP Intermediate_Dir "Debug\audio_output" 
     455# PROP Output_Dir "Debug\audio_output" 
     456!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Release" 
     457# PROP Intermediate_Dir "Release\audio_output" 
     458# PROP Output_Dir "Release\audio_output" 
     459!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Debug" 
     460# PROP Intermediate_Dir "Debug\audio_output" 
     461# PROP Output_Dir "Debug\audio_output" 
     462!ENDIF 
     463# End Source File 
     464# Begin Source File 
     465SOURCE="..\src\audio_output\filters.c" 
     466# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     467!IF "$(CFG)" == "vlc - Win32 (WCE MIPS) Release" 
     468# PROP Intermediate_Dir "Release\audio_output" 
     469# PROP Output_Dir "Release\audio_output" 
     470!ELSEIF "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug" 
     471# PROP Intermediate_Dir "Debug\audio_output" 
     472# PROP Output_Dir "Debug\audio_output" 
     473!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Release" 
     474# PROP Intermediate_Dir "Release\audio_output" 
     475# PROP Output_Dir "Release\audio_output" 
     476!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Debug" 
     477# PROP Intermediate_Dir "Debug\audio_output" 
     478# PROP Output_Dir "Debug\audio_output" 
     479!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Release" 
     480# PROP Intermediate_Dir "Release\audio_output" 
     481# PROP Output_Dir "Release\audio_output" 
     482!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Debug" 
     483# PROP Intermediate_Dir "Debug\audio_output" 
     484# PROP Output_Dir "Debug\audio_output" 
     485!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Release" 
     486# PROP Intermediate_Dir "Release\audio_output" 
     487# PROP Output_Dir "Release\audio_output" 
     488!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Debug" 
     489# PROP Intermediate_Dir "Debug\audio_output" 
     490# PROP Output_Dir "Debug\audio_output" 
     491!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Release" 
     492# PROP Intermediate_Dir "Release\audio_output" 
     493# PROP Output_Dir "Release\audio_output" 
     494!ELSEIF "$(CFG)" == "vlc - Win32 (WCE x86em) Debug" 
     495# PROP Intermediate_Dir "Debug\audio_output" 
     496# PROP Output_Dir "Debug\audio_output" 
     497!ENDIF 
     498# End Source File 
     499# Begin Source File 
     500SOURCE="..\src\audio_output\input.c" 
     501# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" 
     502!IF "$(CFG)" == "vlc - Win32 (WCE MIPS) Release" 
     503# PROP Intermediate_Dir "Release\audio_output" 
     504# PROP Output_Dir "Release\audio_output" 
     505!ELSEIF "$(CFG)" == "vlc - Win32 (WCE MIPS) Debug" 
     506# PROP Intermediate_Dir "Debug\audio_output" 
     507# PROP Output_Dir "Debug\audio_output" 
     508!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Release" 
     509# PROP Intermediate_Dir "Release\audio_output" 
     510# PROP Output_Dir "Release\audio_output" 
     511!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH4) Debug" 
     512# PROP Intermediate_Dir "Debug\audio_output" 
     513# PROP Output_Dir "Debug\audio_output" 
     514!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Release" 
     515# PROP Intermediate_Dir "Release\audio_output" 
     516# PROP Output_Dir "Release\audio_output" 
     517!ELSEIF "$(CFG)" == "vlc - Win32 (WCE SH3) Debug" 
     518# PROP Intermediate_Dir "Debug\audio_output" 
     519# PROP Output_Dir "Debug\audio_output" 
     520!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Release" 
     521# PROP Intermediate_Dir "Release\audio_output" 
     522# PROP Output_Dir "Release\audio_output" 
     523!ELSEIF "$(CFG)" == "vlc - Win32 (WCE ARM) Debug" 
     524# PROP Intermediate_Dir "Debug\audio_output" 
     525# PROP Output_Dir "Debug\au