mirror of
https://github.com/videolan/vlc.git
synced 2024-11-24 18:33:38 +08:00
Makefile.am: target 'package-win32-base-exe' is now a bit smarter when looking for makensis, which also cover cygwin. Hence, target 'package-win32-base-exe-cygwin' is now redundant
This commit is contained in:
parent
bb2476fb5b
commit
4c747e4b37
16
Makefile.am
16
Makefile.am
@ -905,13 +905,19 @@ endif
|
||||
|
||||
package-win32-base-exe:
|
||||
# Create package
|
||||
wine C:/Program\ Files/NSIS/makensis.exe \
|
||||
/DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
|
||||
if [ -x makensis ]; then \
|
||||
MAKENSIS=makensis; \
|
||||
elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
|
||||
MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
|
||||
elif [ -x wine ]; then \
|
||||
MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
|
||||
else \
|
||||
echo 'Error: cannot locate makensis tool'; exit 1; \
|
||||
fi; \
|
||||
eval "$$MAKENSIS /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
|
||||
|
||||
package-win32-base-exe-cygwin:
|
||||
package-win32-base-exe-cygwin: package-win32-base-exe
|
||||
# Create package
|
||||
C:/Program\ Files/NSIS/makensis.exe \
|
||||
/DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
|
||||
|
||||
package-win32-base-exe-linux:
|
||||
# Create package
|
||||
|
Loading…
Reference in New Issue
Block a user