Make the Windows binaries actually run.
This commit is contained in:
		
							parent
							
								
									f5acf70911
								
							
						
					
					
						commit
						c295920696
					
				
					 2 changed files with 7 additions and 10 deletions
				
			
		
							
								
								
									
										2
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -16,7 +16,7 @@ ACK_TEMP_DIR ?= /tmp
 | 
			
		|||
# (/tmp/ack-build/staging, by default), leave this as $(INSDIR).
 | 
			
		||||
 | 
			
		||||
ifeq ($(OS),Windows_NT)
 | 
			
		||||
PREFIX ?= c:/Program Files (x86)/Amsterdam Compiler Kit
 | 
			
		||||
PREFIX ?= c:/ack
 | 
			
		||||
else
 | 
			
		||||
PREFIX ?= /usr/local
 | 
			
		||||
#PREFIX = $(INSDIR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,7 @@ Name "The Amsterdam Compiler Kit"
 | 
			
		|||
OutFile "${OUTFILE}"
 | 
			
		||||
Unicode True
 | 
			
		||||
 | 
			
		||||
InstallDir "$PROGRAMFILES\Amsterdam Compiler Kit"
 | 
			
		||||
InstallDir "c:\ack"
 | 
			
		||||
 | 
			
		||||
RequestExecutionLevel admin
 | 
			
		||||
SetCompressor /solid lzma
 | 
			
		||||
| 
						 | 
				
			
			@ -18,6 +18,11 @@ SetCompressor /solid lzma
 | 
			
		|||
	$\r$\n\
 | 
			
		||||
	This wizard will install the ACK on your computer.$\r$\n\
 | 
			
		||||
	$\r$\n\
 | 
			
		||||
	Please note that it doesn't support being installed into a path \
 | 
			
		||||
	with a space in it, and if you put it anywhere other than the default \
 | 
			
		||||
	then you'll need to set the ACKDIR environment variable to point to it \
 | 
			
		||||
	before use.$\r$\n\
 | 
			
		||||
	$\r$\n\
 | 
			
		||||
	$_CLICK"
 | 
			
		||||
 | 
			
		||||
!define MUI_HEADERIMAGE
 | 
			
		||||
| 
						 | 
				
			
			@ -51,14 +56,6 @@ Section "The ACK (required)"
 | 
			
		|||
	SectionIn RO
 | 
			
		||||
	SetOutPath $INSTDIR
 | 
			
		||||
	File /r "${BUILDDIR}\*.*"
 | 
			
		||||
	;File /oname=wordgrinder.exe "bin\wordgrinder-builtin-sdl-release.exe"
 | 
			
		||||
	;File /oname=cwordgrinder.exe "bin\wordgrinder-builtin-wincon-release.exe"
 | 
			
		||||
	;File "README.wg"
 | 
			
		||||
	;File "licenses\COPYING.*"
 | 
			
		||||
 | 
			
		||||
	;CreateDirectory $INSTDIR\Dictionaries
 | 
			
		||||
	;File /oname=Dictionaries\British.dictionary "extras\british.dictionary"
 | 
			
		||||
	;File /oname=Dictionaries\American-Canadian.dictionary "extras\american-canadian.dictionary"
 | 
			
		||||
 | 
			
		||||
	; Write the uninstall keys for Windows
 | 
			
		||||
	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\WordGrinder" "DisplayName" "WordGrinder for Windows"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue