From 20b70f0c690e993ea98ae79b624dc89962bea87e Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Wed, 29 Jan 2020 15:59:39 +0000
Subject: [PATCH] Pictures back to GNUmakefile, nmake didn't understand it

---
 GNUmakefile | 22 ++++++++++++++++++++++
 objects.mk  | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 4a78926..a82057c 100644
--- 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 686108b..4a8c452 100644
--- 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
-- 
2.39.5