Commit 4ea0f005 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Replace the specific VERSION32 kludge with a clean more reusable solution

parent 14dd475c
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
axvlc.dll=axvlc.dll axvlc.dll=axvlc.dll
[axvlc.dll] [axvlc.dll]
FileVersion=@VERSION32@ FileVersion=@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,0
clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8} clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8}
RegisterServer=no RegisterServer=no
hook=nsiinstaller hook=nsiinstaller
[vlc-@VERSION@-win32.exe] [vlc-@VERSION@-win32.exe]
FileVersion=@VERSION32@ FileVersion=@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,0
file-win32-x86=thiscab file-win32-x86=thiscab
[nsiinstaller] [nsiinstaller]
......
...@@ -4438,6 +4438,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major numb ...@@ -4438,6 +4438,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major numb
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number])
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
dnl Old definitions for version-dependant plugins dnl Old definitions for version-dependant plugins
dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
...@@ -4448,11 +4451,6 @@ dnl New definitions with value matching 0.8.2 release ...@@ -4448,11 +4451,6 @@ dnl New definitions with value matching 0.8.2 release
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__0_8_2", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__0_8_2", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, 0_8_2, [Symbol suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, 0_8_2, [Symbol suffix for module functions])
dnl Version number for ActiveX INF
VERSION32="`echo -n ${VERSION} | sed -e 's/@<:@a-z\-@:>@//g' | sed -e 'y/./,/'`"
VERSION32="`echo -n ${VERSION32}',0'`"
AC_SUBST(VERSION32)
DATA_PATH="${ac_tool_prefix}/share/vlc" DATA_PATH="${ac_tool_prefix}/share/vlc"
AC_SUBST(DATA_PATH) AC_SUBST(DATA_PATH)
PLUGIN_PATH="${ac_tool_prefix}/lib/vlc" PLUGIN_PATH="${ac_tool_prefix}/lib/vlc"
......
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