Commit c748554d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: makefile simplification for peflags, osdmenu and lua

Using find.
parent d6b0077c
...@@ -809,27 +809,13 @@ package-win32-base-debug: package-win-common ...@@ -809,27 +809,13 @@ package-win32-base-debug: package-win-common
#Enable DEP and ASLR for all the binaries #Enable DEP and ASLR for all the binaries
if USE_PEFLAGS if USE_PEFLAGS
find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \ find $(win32_destdir) -type f -name '*dll' -print -o -name '*exe' -print -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
$(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \
done
endif endif
if BUILD_LUA if BUILD_LUA
# Copy the lua scripts (HTTP) # Copy the lua scripts (HTTP)
mkdir -p "$(win32_lua_destdir)/http/images" mkdir -p $(win32_lua_destdir)
mkdir -p "$(win32_lua_destdir)/http/requests" cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
mkdir -p "$(win32_lua_destdir)/http/js"
mkdir -p "$(win32_lua_destdir)/http/dialogs"
cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/
cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/
cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/
cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/
cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/
cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/
#Lua Scripts #Lua Scripts
$(INSTALL) -d $(win32_lua_destdir) $(INSTALL) -d $(win32_lua_destdir)
...@@ -878,21 +864,12 @@ endif ...@@ -878,21 +864,12 @@ endif
if BUILD_HTTPD if BUILD_HTTPD
cp -r $(destdir)/share/vlc/http $(win32_http_destdir) cp -r $(destdir)/share/vlc/http $(win32_http_destdir)
endif endif
if BUILD_SKINS if BUILD_SKINS
cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins
endif endif
if BUILD_OSDMENU if BUILD_OSDMENU
#OSD Menu #OSD Menu
mkdir -p "$(win32_destdir)/osdmenu" cp -r $(destdir)/share/vlc/osdmenu "$(win32_destdir)/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
for dir in default default/selected default/selection default/volume ;do \
mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
done; \
done
for file in $(win32_destdir)/osdmenu/*.cfg; do \ for file in $(win32_destdir)/osdmenu/*.cfg; do \
sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \ sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \ sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
......
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