Changeset 84d44cbdc41b4695784bcdd68bbc855fc79f075c

Show
Ignore:
Timestamp:
11/12/04 11:38:27 (4 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1100255907 +0000
git-parent:

[698feb97ec53ab36b0cb83c2c793f5d103a5fcf4]

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

* toolbox, src/vlc.c: use src/vlc.c in the WinCE project files.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/vlc.c

    r698feb9 r84d44cb  
    158158 
    159159#if defined(UNDER_CE) 
     160#include "vlc_common.h" 
    160161/***************************************************************************** 
    161162 * WinMain: parse command line, start interface and spawn threads. (WinCE only) 
     
    167168    int argc, i_ret; 
    168169 
    169     WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, lpCmdLine, -1, 
     170    WideCharToMultiByte( CP_ACP, 0, lpCmdLine, -1, 
    170171                         psz_cmdline, MAX_PATH, NULL, NULL ); 
    171172 
     
    174175    if( !argv ) return -1; 
    175176 
    176     if( argc ) memmove( argv + 1, argv, argc ); 
    177     argv[0] = strdup(""); /* Fake program path */ 
     177    if( argc ) memmove( argv + 1, argv, argc * sizeof(char *) ); 
     178    argv[0] = ""; /* Fake program path */ 
    178179 
    179     i_ret = main( argc, argv ); 
     180    i_ret = main( argc + 1, argv ); 
    180181 
    181182    /* No need to free the argv memory */ 
  • toolbox

    r7965eb3 r84d44cb  
    340340    perl -pe 'if(/�SOURCES�/){last;}' < ${target}.in > ${target} 
    341341    #  The source files 
    342     if test "${target}" = "evc/vlc.vcp" 
    343     then 
    344342      cat >> ${target} << EOF 
    345343# Begin Source File${M} 
    346 SOURCE="..\\evc\\vlc.c"${M} 
    347 # End Source File${M} 
    348 EOF 
    349     else 
    350       cat >> ${target} << EOF 
    351 # Begin Source File${M} 
    352344SOURCE="..\\src\\vlc.c"${M} 
    353345# End Source File${M} 
    354346EOF 
    355     fi 
    356347    #  Bottom of the project file - handles resource files too 
    357348    perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
     
    367358if test "${action}" = "po" 
    368359then 
    369   # create a fake file containing win32 strings 
    370   rm -f modules/gui/win32/strings.cpp 
    371   #printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp 
    372   #find modules/gui/win32 -name '*.dfm' | while read file 
    373   #do 
    374   #  printf "\n/*\n * from $file:\n */\n\n" >> modules/gui/win32/strings.cpp 
    375   #  perl -ne 'chop; chop; if( / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file | grep -v '"-*"' | grep -v '"http://' | grep -v '"vlcs"' >> modules/gui/win32/strings.cpp || exit 1 
    376   #done 
    377360  # find out the source files 
    378361  rm -f po/POTFILES.in