mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-31 18:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

nsis: newer versions of NSIS uses \ for paths even on Unix

Browse Source 
It seems that we have to use \ for paths on native Windows, and it
works on Unix as well, so just change all the paths accordingly.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-04-06 16:28:59 -07:00
parent 913394d52f
commit 79570527b3
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nsis/nasm.nsi
View File

@ -26,8 +26,8 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!addincludedir "${objdir}/nsis"
!addincludedir "${srcdir}/nsis"
!addincludedir "${objdir}\nsis"
!addincludedir "${srcdir}\nsis"
!include "version.nsh"
!include /nonfatal "arch.nsh"
!include /nonfatal "x64.nsh"
@ -53,7 +53,7 @@ SetCompressor lzma
;Name and file
Name "${PACKAGE_NAME}"
OutFile "${objdir}/${PACKAGE_SHORT_NAME}-installer-${ARCH}.exe"
OutFile "${objdir}\${PACKAGE_SHORT_NAME}-installer-${ARCH}.exe"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\${PRODUCT_SHORT_NAME}" ""
@ -70,8 +70,8 @@ Var CmdFailed
;--------------------------------
;Interface Settings
Caption "${PACKAGE_SHORT_NAME} installation"
Icon "${srcdir}/nsis/nasm.ico"
UninstallIcon "${srcdir}/nsis/nasm-un.ico"
Icon "${srcdir}\nsis\nasm.ico"
UninstallIcon "${srcdir}\nsis\nasm-un.ico"
!define MUI_ABORTWARNING
@ -101,10 +101,10 @@ UninstallIcon "${srcdir}/nsis/nasm-un.ico"
Section "NASM" SecNasm
Sectionin RO
SetOutPath "$INSTDIR"
File "${srcdir}/LICENSE"
File "${objdir}/nasm.exe"
File "${objdir}/ndisasm.exe"
File "${srcdir}/nsis/nasm.ico"
File "${srcdir}\LICENSE"
File "${objdir}\nasm.exe"
File "${objdir}\ndisasm.exe"
File "${srcdir}\nsis\nasm.ico"
;Store installation folder
WriteRegStr HKCU "Software\${PRODUCT_SHORT_NAME}" "" $INSTDIR
@ -140,27 +140,27 @@ skip:
SectionEnd
Section "RDOFF" SecRdoff
File "${objdir}/rdoff/ldrdf.exe"
File "${objdir}/rdoff/rdf2bin.exe"
File "${objdir}/rdoff/rdf2com.exe"
File "${objdir}/rdoff/rdf2ith.exe"
File "${objdir}/rdoff/rdf2ihx.exe"
File "${objdir}/rdoff/rdf2srec.exe"
File "${objdir}/rdoff/rdfdump.exe"
File "${objdir}/rdoff/rdflib.exe"
File "${objdir}\rdoff\ldrdf.exe"
File "${objdir}\rdoff\rdf2bin.exe"
File "${objdir}\rdoff\rdf2com.exe"
File "${objdir}\rdoff\rdf2ith.exe"
File "${objdir}\rdoff\rdf2ihx.exe"
File "${objdir}\rdoff\rdf2srec.exe"
File "${objdir}\rdoff\rdfdump.exe"
File "${objdir}\rdoff\rdflib.exe"
SectionEnd
Section "Manual" SecManual
SetOutPath "$INSTDIR"
File "${objdir}/doc/nasmdoc.pdf"
File "${objdir}\doc\nasmdoc.pdf"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Manual.lnk" "$INSTDIR\nasmdoc.pdf"
SectionEnd
Section "VS8 integration" SecVS8
CreateDirectory "$INSTDIR\VSrules"
SetOutPath "$INSTDIR\VSrules"
File "${srcdir}/contrib/VSrules/nasm.README"
File "${srcdir}/contrib/VSrules/nasm.rules"
File "${srcdir}\contrib\VSrules\nasm.README"
File "${srcdir}\contrib\VSrules\nasm.rules"
SectionEnd
;--------------------------------