- fixed paths to mk.files

2022-06-30 20:24:14 +02:00
parent a38a63fb9e
commit de6be19c12
4 changed files with 8400 additions and 18 deletions
@@ -9,20 +9,21 @@ include $(VHDL_HOME)/make/defs.mk
 LANG_STD := 93c
 IEEE_STD := standard
 WORK_LIB := ieee_proposed
-TARGET := ieee_proposed
+TARGET := ghdl

+STD_LIB_PATH := ieee_proposed/modelsim
 # -------------------------------------------------
 # Target options
 # -------------------------------------------------
-SRCS := $(LIB_PATH)/standard_additions_c.vhdl
-SRCS += $(LIB_PATH)/standard_textio_additions_c.vhdl
-SRCS += $(LIB_PATH)/env_c.vhdl
-SRCS += $(LIB_PATH)/std_logic_1164_additions.vhdl
-SRCS += $(LIB_PATH)/numeric_std_additions.vhdl
-SRCS += $(LIB_PATH)/numeric_std_unsigned_c.vhdl
-SRCS += $(LIB_PATH)/fixed_float_types_c.vhdl
-SRCS += $(LIB_PATH)/fixed_pkg_c.vhdl
-SRCS += $(LIB_PATH)/float_pkg_c.vhdl
+SRCS := $(STD_LIB_PATH)/standard_additions_c.vhdl
+SRCS += $(STD_LIB_PATH)/standard_textio_additions_c.vhdl
+SRCS += $(STD_LIB_PATH)/env_c.vhdl
+SRCS += $(STD_LIB_PATH)/std_logic_1164_additions.vhdl
+SRCS += $(STD_LIB_PATH)/numeric_std_additions.vhdl
+SRCS += $(STD_LIB_PATH)/numeric_std_unsigned_c.vhdl
+SRCS += $(STD_LIB_PATH)/fixed_float_types_c.vhdl
+SRCS += $(STD_LIB_PATH)/fixed_pkg_c.vhdl
+SRCS += $(STD_LIB_PATH)/float_pkg_c.vhdl

 include $(VHDL_HOME)/make/ghdl.mk

@@ -1,7 +1,7 @@
 # -------------------------------------------------
 # Compile script for GHDL
 # -------------------------------------------------
-include ../make/defs.mk
+include $(VHDL_HOME)/make/defs.mk

 # -------------------------------------------------
 # Global options
@@ -9,18 +9,19 @@ include ../make/defs.mk
 LANG_STD := 93c
 IEEE_STD := standard
 WORK_LIB := unisim
-TARGET := unisim
+TARGET := ghdl

+STD_LIB_PATH := xilinx/unisims
 # -------------------------------------------------
 # Target options
 # -------------------------------------------------
-SRCS := $(LIB_PATH)/unisims/unisim_VPKG.vhd
-SRCS += $(LIB_PATH)/unisims/unisim_VCOMP.vhd
-SRCS += $(LIB_PATH)/unisims/unisim_SMODEL.vhd
-SRCS += $(LIB_PATH)/unisims/unisim_VITAL.vhd
+SRCS := $(STD_LIB_PATH)/unisim_VPKG.vhd
+SRCS += $(STD_LIB_PATH)/unisim_VCOMP.vhd
+SRCS += $(STD_LIB_PATH)/unisim_SMODEL.vhd
+SRCS += $(STD_LIB_PATH)/unisim_VITAL.vhd

 GHDL_OPTS := -fsynopsys -fexplicit

-include ../make/ghdl.mk
+include $(VHDL_HOME)/make/ghdl.mk


@@ -5,7 +5,7 @@ SRCS += patch/fixed_pkg_c.vhdl
 TARGET := fixed_pkg
 WORK_LIB := ieee_proposed

-include ../../../Common/make/ghdl.mk
+include $(VHDL_HOME)/make/ghdl.mk

 patch: fixed_pkg_c.patch
 	mkdir -p patch