Commit 05afe6ae authored by Damien Fouilleul's avatar Damien Fouilleul

all: support for unicode version of wxwidgets for win32, needs testing for other platform

parent c377d1bc
...@@ -3881,6 +3881,12 @@ then ...@@ -3881,6 +3881,12 @@ then
fi fi
VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`]) VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`])
VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`]) VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
if ${WX_CONFIG} --unicode
then
# wxwidgets should provide the following flags but does not
# the following is required to compile for win32
VLC_ADD_CXXFLAGS([wxwidgets],[-D_UNICODE -DUNICODE])
fi
if test "$have_libcdio" = "yes" if test "$have_libcdio" = "yes"
then then
VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS]) VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS])
......
...@@ -718,7 +718,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent ) ...@@ -718,7 +718,7 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
for( char drive_letter = 'A'; drive_letter <= 'Z'; ++drive_letter ) for( char drive_letter = 'A'; drive_letter <= 'Z'; ++drive_letter )
{ {
char drive_name[3] = {drive_letter, ':', 0}; char drive_name[3] = {drive_letter, ':', 0};
UINT type = GetDriveType( drive_name ); UINT type = GetDriveTypeA( drive_name );
if( type == DRIVE_CDROM ) if( type == DRIVE_CDROM )
{ {
psz_default_device[0] = drive_letter; psz_default_device[0] = drive_letter;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment