From dedc0946f2d082d538021bce98dec8b62840c802 Mon Sep 17 00:00:00 2001 From: harbaum Date: Mon, 17 Feb 2014 14:21:45 +0000 Subject: [PATCH] Applied patch from issue 16 --- cores/minimig/fw/amiga_boot/Makefile | 7 ++++++- cores/minimig/sw/hex2mem/hex2mem.py | 2 +- cores/minimig/sw/hex2mif/hex2mif.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cores/minimig/fw/amiga_boot/Makefile b/cores/minimig/fw/amiga_boot/Makefile index b107e66..16aeb4b 100644 --- a/cores/minimig/fw/amiga_boot/Makefile +++ b/cores/minimig/fw/amiga_boot/Makefile @@ -11,7 +11,12 @@ HEX2MIF_DIR = ../../sw/hex2mif/ ### programs ### -VASM = $(VASM_DIR)vasmm68k_mot +ifneq (,$(findstring Windows,$(OS))) + VASM = $(VASM_DIR)vasmm68k_mot.exe +else + VASM = $(VASM_DIR)vasmm68k_mot +endif + XXD = xxd HEX2MEM = $(HEX2MEM_DIR)hex2mem.py HEX2MIF = $(HEX2MIF_DIR)hex2mif.py diff --git a/cores/minimig/sw/hex2mem/hex2mem.py b/cores/minimig/sw/hex2mem/hex2mem.py index 198b203..9660044 100755 --- a/cores/minimig/sw/hex2mem/hex2mem.py +++ b/cores/minimig/sw/hex2mem/hex2mem.py @@ -111,7 +111,7 @@ def main(): fo.write( "endmodule\n\n") # done - print "File %s written successfully, using %dx%d memory (%d bits), will be probably inferred into %d Altera M4Ks." % (fon, idx+1, mw*4, (idx+1)*mw*4, int(math.ceil((idx+1)*mw*4/4096))) + print ("File %s written successfully, using %dx%d memory (%d bits), will be probably inferred into %d Altera M4Ks." % (fon, idx+1, mw*4, (idx+1)*mw*4, int(math.ceil((idx+1)*mw*4/4096)))) # END main diff --git a/cores/minimig/sw/hex2mif/hex2mif.py b/cores/minimig/sw/hex2mif/hex2mif.py index 667b33b..2b6830d 100755 --- a/cores/minimig/sw/hex2mif/hex2mif.py +++ b/cores/minimig/sw/hex2mif/hex2mif.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys