Commit 454b19b8 authored by Damien Fouilleul's avatar Damien Fouilleul

- mozilla, activex, directx: more backporting from 0.8.6

parent ec077666
...@@ -4101,7 +4101,7 @@ then ...@@ -4101,7 +4101,7 @@ then
]) ])
AC_CHECK_HEADERS(d3d9.h, AC_CHECK_HEADERS(d3d9.h,
[ VLC_ADD_PLUGINS([direct3d]) [ VLC_ADD_PLUGINS([direct3d])
VLC_ADD_LDFLAGS([direct3d],[-ld3d9 -lgdi32]) VLC_ADD_LDFLAGS([direct3d],[-lgdi32])
]) ])
else else
AC_MSG_CHECKING(for directX headers in ${with_directx}) AC_MSG_CHECKING(for directX headers in ${with_directx})
...@@ -5274,7 +5274,8 @@ then ...@@ -5274,7 +5274,8 @@ then
fi fi
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ole2.h olectl.h, AC_CHECK_HEADERS(ole2.h olectl.h,
[ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) [ VLC_ADD_CPPFLAGS([activex],[-D_MIDL_USE_GUIDDEF_])
VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi])
AC_CHECK_HEADERS(objsafe.h, AC_CHECK_HEADERS(objsafe.h,
VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
...@@ -5335,7 +5336,7 @@ then ...@@ -5335,7 +5336,7 @@ then
[ [
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]) VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE]) VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
], ],
[], [],
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE] [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
]) ])
......
var version = "0.8.6-rc1";
initInstall( "VideoLAN", "VLC", version, 1);
var tmpFolder = getFolder( "Temporary" );
if ( ! fileExists( tmpFolder) )
{
logComment( "Cannot find Temporary Folder!" );
cancelInstall();
}
setPackageFolder( tmpFolder );
addFile( "http://downloads.videolan.org/pub/videolan/testing/0.8.6-rc1/win32/vlc-0.8.6-rc1-win32.exe" );
var exe = getFolder(tmpFolder, "vlc-0.8.6-rc1-win32.exe");
File.execute( exe );
performInstall();
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