mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	minor tweaks + docs...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									da9cb5ad81
								
							
						
					
					
						commit
						12a82bd7e1
					
				| @ -20,6 +20,7 @@ | |||||||
| #
 | #
 | ||||||
| #
 | #
 | ||||||
| # ToDo:
 | # ToDo:
 | ||||||
|  | # 	- might be a good idea to do a no-bin target -- exclude native...
 | ||||||
| # 	- add a cli-only build
 | # 	- add a cli-only build
 | ||||||
| # 	- installers:
 | # 	- installers:
 | ||||||
| # 		- msi
 | # 		- msi
 | ||||||
| @ -29,6 +30,21 @@ | |||||||
| # 	- upstream clean build: git clone -> make dist
 | # 	- 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...
 | # variables...
 | ||||||
| @ -56,7 +72,7 @@ ifeq ($(OS),Windows_NT) | |||||||
| 
 | 
 | ||||||
| 	DLLs = "$@/"*dll | 	DLLs = "$@/"*dll | ||||||
| 	# NOTE: this is electron naming convention... | 	# NOTE: this is electron naming convention... | ||||||
| 	TARGET_OS = win32 | 	TARGET_OS ?= win32 | ||||||
| 
 | 
 | ||||||
| 	# set arch... | 	# set arch... | ||||||
| 	ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) | 	ifeq ($(PROCESSOR_ARCHITEW6432),AMD64) | ||||||
| @ -72,7 +88,7 @@ ifeq ($(OS),Windows_NT) | |||||||
| 
 | 
 | ||||||
| else | else | ||||||
| 	ifeq ($(shell uname -s),Linux) | 	ifeq ($(shell uname -s),Linux) | ||||||
| 		TARGET_OS = linux | 		TARGET_OS ?= linux | ||||||
| 		ARCH ?= x64 | 		ARCH ?= x64 | ||||||
| 
 | 
 | ||||||
| 		APP_BIN ?= ig | 		APP_BIN ?= ig | ||||||
| @ -80,7 +96,7 @@ else | |||||||
| 		ASAR_PATH = resources | 		ASAR_PATH = resources | ||||||
| 	endif | 	endif | ||||||
| 	ifeq ($(shell uname -s),Darwin) | 	ifeq ($(shell uname -s),Darwin) | ||||||
| 		TARGET_OS = darwin | 		TARGET_OS ?= darwin | ||||||
| 
 | 
 | ||||||
| 		APP_BIN ?= $(APP_NAME) | 		APP_BIN ?= $(APP_NAME) | ||||||
| 		ELECTRON_BIN = Electron | 		ELECTRON_BIN = Electron | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user