From fcf64c8f3e2030c134854344c624e5e3572e2b87 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 8 Jan 2018 07:46:38 +0300
Subject: [PATCH] odd things happening with Makefile...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/Makefile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile
index 172fd740..e234f038 100755
--- a/ui (gen4)/Makefile	
+++ b/ui (gen4)/Makefile	
@@ -15,21 +15,16 @@ APP_NAME=ImageGrid.Viewer
 ELECTRON_DOWNOAD_URL=https://github.com/electron/electron/releases/download
 
 
-# XXX autodetect this....
-TARGET_OS=win32
-
-
-# XXX get this automatically...
+# XXX get these automatically...
 # 	...also might be good to make this flexible and use these as parameters...
-ELECTRON_VERSION=1.7.10
-
-
+TARGET_OS=win32
+# XXX for some reson these break the rules below...
+#ELECTRON_VERSION=`electron -v`
+#ELECTRON_VERSION=$(shell electron -v)
+ELECTRON_VERSION=v1.8.1
 NODE_VERSION=`node --version`
 
 
-UNAME := $(shell uname)
-
-
 
 #**********************************************************************
 
@@ -143,11 +138,11 @@ $(BUILD_DIR)/app.asar: $(BUILD_DIR)/$(APP_NAME)
 
 # get the electron binary...
 # XXX for some odd reason this is deleted adter extraction...
-.PRECIOUS: $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip
-$(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip:
+.PRECIOUS: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip
+$(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip:
 	@mkdir -p $(@D)
 	wget \
-		-nc "$(ELECTRON_DOWNOAD_URL)/v$(ELECTRON_VERSION)/$(@F)" \
+		-nc "$(ELECTRON_DOWNOAD_URL)/$(ELECTRON_VERSION)/$(@F)" \
 		-O "$@"
 
 
@@ -157,7 +152,7 @@ $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip:
 # build the app dir...
 # XXX this is electron-specific...
 .PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%
-$(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip $(BUILD_DIR)/app.asar
+$(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip $(BUILD_DIR)/app.asar
 	unzip -u "$<" -d "$@" 
 	chmod +x "$@/"*dll "$@/"*exe
 	cp "$(BUILD_DIR)/app.asar" "$@/resources/"