diff options
| author | Matt Ettus <matt@ettus.com> | 2010-06-14 12:24:35 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-06-14 12:24:35 -0700 |
| commit | 058b7e87a41f7afa57050ae908f1db31dc5717cc (patch) | |
| tree | 0e46569aaf3dda3b86d6ff18154494f2bfdebce6 | |
| parent | afbcdb33f31a90fbdec08ecef98c9680f2bfa940 (diff) | |
| parent | 9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900 (diff) | |
| download | uhd-058b7e87a41f7afa57050ae908f1db31dc5717cc.tar.gz uhd-058b7e87a41f7afa57050ae908f1db31dc5717cc.tar.bz2 uhd-058b7e87a41f7afa57050ae908f1db31dc5717cc.zip | |
Merge branch 'master' into u2p
* master:
new make works on ise12
| -rw-r--r-- | usrp2/top/Makefile.common | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usrp2/top/Makefile.common b/usrp2/top/Makefile.common index 02b1b9529..d1c89fdfb 100644 --- a/usrp2/top/Makefile.common +++ b/usrp2/top/Makefile.common @@ -5,9 +5,15 @@ ################################################## # Constants ################################################## +ISE_VER = $(shell xtclsh -h | head -n1 | cut -f2 -d" " | cut -f1 -d.) +ifeq ($(ISE_VER),10) + ISE_EXT = ise +else + ISE_EXT = xise +endif BASE_DIR = $(abspath ..) ISE_HELPER = xtclsh $(BASE_DIR)/tcl/ise_helper.tcl -ISE_FILE = $(BUILD_DIR)/$(TOP_MODULE).ise +ISE_FILE = $(BUILD_DIR)/$(TOP_MODULE).$(ISE_EXT) BIN_FILE = $(BUILD_DIR)/$(TOP_MODULE).bin MCS_FILE = $(BUILD_DIR)/$(TOP_MODULE).mcs |