Pictures back to GNUmakefile, nmake didn't understand it

diff --git a/GNUmakefile b/GNUmakefile
index 4a7892676b0494ec9d48a57effc1e766975d42ac..a82057cc8342d6274bce6c5bc1adbe2e2638f3bf 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,6 +16,28 @@ ifndef VERBOSE
 Q = @
 endif
 
+# Pictures for linux builds
+PICTURES = -Wl,--format=binary
+PICTURES += -Wl,other/vdrhires.png
+PICTURES += -Wl,other/wallpaper720p.jpg
+PICTURES += -Wl,other/properties.png
+PICTURES += -Wl,other/radio.png
+PICTURES += -Wl,other/timers.png
+PICTURES += -Wl,other/tv.png
+PICTURES += -Wl,other/recordings.png
+PICTURES += -Wl,other/restart.png
+PICTURES += -Wl,other/hd1080i.png
+PICTURES += -Wl,other/hd720p.png
+PICTURES += -Wl,other/sd576i.png
+PICTURES += -Wl,other/txtoff.png
+PICTURES += -Wl,other/txton.png
+PICTURES += -Wl,other/dolbyoff.png
+PICTURES += -Wl,other/dolbyon.png
+PICTURES += -Wl,other/recording.png
+PICTURES += -Wl,other/recfolder.png
+PICTURES += -Wl,other/defposter.png
+PICTURES += -Wl,--format=default
+
 ifeq ($(vomp_platform),raspberry)
 $(info Raspberry Pi native compiler)
 CC=clang-9

diff --git a/objects.mk b/objects.mk
index 686108be4c0b441fc6ef29c8c52179c9bebff8dd..4a8c452163bd9854bda9871009e79e8b0386e48d 100644 (file)
--- a/objects.mk
+++ b/objects.mk
@@ -32,25 +32,3 @@ OBJ_WINLEGACY = osdvector.o surfacevector.o osdwinpixel.o surfacewin.o
                 fonts/helvB24.o fonts/helvB18.o
 
 OBJ_WINCURRENT = osdvector.o surfacevector.o osdwinvector.o
-
-# Pictures for linux builds
-PICTURES = -Wl,--format=binary
-PICTURES += -Wl,other/vdrhires.png
-PICTURES += -Wl,other/wallpaper720p.jpg
-PICTURES += -Wl,other/properties.png
-PICTURES += -Wl,other/radio.png
-PICTURES += -Wl,other/timers.png
-PICTURES += -Wl,other/tv.png
-PICTURES += -Wl,other/recordings.png
-PICTURES += -Wl,other/restart.png
-PICTURES += -Wl,other/hd1080i.png
-PICTURES += -Wl,other/hd720p.png
-PICTURES += -Wl,other/sd576i.png
-PICTURES += -Wl,other/txtoff.png
-PICTURES += -Wl,other/txton.png
-PICTURES += -Wl,other/dolbyoff.png
-PICTURES += -Wl,other/dolbyon.png
-PICTURES += -Wl,other/recording.png
-PICTURES += -Wl,other/recfolder.png
-PICTURES += -Wl,other/defposter.png
-PICTURES += -Wl,--format=default