From 12a82bd7e133bffe8233277d4de93664b4edd0bb Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 10 Jan 2018 05:18:46 +0300 Subject: [PATCH] minor tweaks + docs... Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index 109b9e74..df3a975a 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -20,6 +20,7 @@ # # # ToDo: +# - might be a good idea to do a no-bin target -- exclude native... # - add a cli-only build # - installers: # - msi @@ -29,6 +30,21 @@ # - upstream clean build: git clone -> make dist # # +# Variables to control the build: +# APP_NAME - Application name +# APP_BIN - App binary name (ignored for MacOS) +# +# ARCH - target achitecture (ia32, x86) +# TARGET_OS - target OS (win32, linux, darwin) +# ELECTRON_DOWNOAD_URL +# - URL to download electron pinary +# NOTE: cross compilation is at this time not supported, if you try it +# and it works then 1) you are very lucky and 2) tell me about it =) +# ...at least the node native packages (sharp) will likely either +# fail or win get compiled to the wrong arch and not be used and +# for the most part ImageGrid is cleaver about and will simply not +# load the depending features... +# # #********************************************************************** # variables... @@ -56,7 +72,7 @@ ifeq ($(OS),Windows_NT) DLLs = "$@/"*dll # NOTE: this is electron naming convention... - TARGET_OS = win32 + TARGET_OS ?= win32 # set arch... ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) @@ -72,7 +88,7 @@ ifeq ($(OS),Windows_NT) else ifeq ($(shell uname -s),Linux) - TARGET_OS = linux + TARGET_OS ?= linux ARCH ?= x64 APP_BIN ?= ig @@ -80,7 +96,7 @@ else ASAR_PATH = resources endif ifeq ($(shell uname -s),Darwin) - TARGET_OS = darwin + TARGET_OS ?= darwin APP_BIN ?= $(APP_NAME) ELECTRON_BIN = Electron