flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

now mac builds should be supported by the makefile...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-01-09 22:06:57 +03:00
parent 78157ce3e5
commit 1ebdbde2f7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui (gen4)/Makefile
View File

@ -34,8 +34,6 @@
# variables... # variables...
APP_NAME ?= ImageGrid.Viewer APP_NAME ?= ImageGrid.Viewer
#APP_BIN ?= $(APP_NAME)
APP_BIN ?= ig
# Electron stuff... # Electron stuff...
@ -51,7 +49,10 @@ ELECTRON_DOWNOAD_URL ?= https://github.com/electron/electron/releases/download
# OS-specific stuff... # OS-specific stuff...
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
APP_BIN ?= ig
ASAR_PATH = resources
EXT = .exe EXT = .exe
DLLs = "$@/"*dll DLLs = "$@/"*dll
# NOTE: this is electron naming convention... # NOTE: this is electron naming convention...
TARGET_OS = win32 TARGET_OS = win32
@ -69,6 +70,10 @@ ifeq ($(OS),Windows_NT)
endif endif
else else
APP_BIN ?= $(APP_NAME)
ASAR_PATH = Electron.app/Contents/Resources
EXT = .app
ifeq ($(shell uname -s),Linux) ifeq ($(shell uname -s),Linux)
TARGET_OS = linux TARGET_OS = linux
ARCH ?= x64 ARCH ?= x64
@ -216,9 +221,9 @@ $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip:
$(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \ $(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/app.asar $(BUILD_DATE) $(BUILD_DIR)/app.asar $(BUILD_DATE)
unzip -u "$<" -d "$@" unzip -u "$<" -d "$@"
cp "$(BUILD_DIR)/app.asar" "$@/resources/" cp "$(BUILD_DIR)/app.asar" "$@/$(ASAR_PATH)/"
cp -f "$(BUILD_DATE)" "$@/" cp -f "$(BUILD_DATE)" "$@/"
$(RM) "$@/resources/default_app.asar" $(RM) "$@/$(ASAR_PATH)/default_app.asar"
mv "$@/electron$(EXT)" "$@/$(APP_BIN)$(EXT)" mv "$@/electron$(EXT)" "$@/$(APP_BIN)$(EXT)"
chmod +x "$@/$(APP_BIN)$(EXT)" $(DLLs) chmod +x "$@/$(APP_BIN)$(EXT)" $(DLLs)
touch "$@" touch "$@"