summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ettus <matt@ettus.com>2010-06-14 12:23:52 -0700
committerMatt Ettus <matt@ettus.com>2010-06-14 12:23:52 -0700
commit9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900 (patch)
treeb3c891901d9e7b74b8b21e2f69ee85cfda11c19d
parent1935f2a4ed0d0abc90bb3fe7fed745ff84ab6d7c (diff)
downloaduhd-9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900.tar.gz
uhd-9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900.tar.bz2
uhd-9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900.zip
new make works on ise12
-rw-r--r--usrp2/top/Makefile.common8
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