From 82d9231dd3e7c0e3bbf5856a5e9029f6f205c1ac Mon Sep 17 00:00:00 2001 From: plherrin Date: Wed, 2 Apr 2025 12:19:26 -0500 Subject: [PATCH] CI --- test/SIM_trickified_archive/S_overrides.mk | 8 ++++---- test/SIM_trickified_object/S_overrides.mk | 8 ++++---- test/SIM_trickified_shared/S_overrides.mk | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/SIM_trickified_archive/S_overrides.mk b/test/SIM_trickified_archive/S_overrides.mk index da416da4..aa317c0d 100644 --- a/test/SIM_trickified_archive/S_overrides.mk +++ b/test/SIM_trickified_archive/S_overrides.mk @@ -2,10 +2,10 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) #Normally would just include S_overrides_trickify.mk like below. Due to the weird order of operations in this test, the file won't be generated before this include statement. I've copied the contents of the file instead. #include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk -TRICK_LDFLAGS += /home/plherrin/trick/test/SIM_trickified_archive/trickified_project/trickified/trickified_myproject.a -TRICK_EXT_LIB_DIRS += /home/plherrin/trick/test/SIM_trickified_archive/trickified_project/include_bar:/home/plherrin/trick/test/SIM_trickified_archive/trickified_project/include_foo -TRICK_PYTHON_PATH += /home/plherrin/trick/test/SIM_trickified_archive/trickified_project/trickified/python -TRICK_SWIG_FLAGS += -I/home/plherrin/trick/test/SIM_trickified_archive/trickified_project/trickified +TRICK_LDFLAGS += $(LOCAL_DIR)/trickified_project/trickified/trickified_myproject.a +TRICK_EXT_LIB_DIRS += $(LOCAL_DIR)/trickified_project/include_bar:$(LOCAL_DIR)/trickified_project/include_foo +TRICK_PYTHON_PATH += $(LOCAL_DIR)/trickified_project/trickified/python +TRICK_SWIG_FLAGS += -I$(LOCAL_DIR)/trickified_project/trickified/ TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk diff --git a/test/SIM_trickified_object/S_overrides.mk b/test/SIM_trickified_object/S_overrides.mk index 4d73613f..5515960b 100644 --- a/test/SIM_trickified_object/S_overrides.mk +++ b/test/SIM_trickified_object/S_overrides.mk @@ -2,10 +2,10 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) #Normally would just include S_overrides_trickify.mk like below. Due to the weird order of operations in this test, the file won't be generated before this include statement. I've copied the contents of the file instead. #include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk -TRICK_LDFLAGS += /home/plherrin/trick/test/SIM_trickified_object/trickified_project/trickified/trickified_myproject.o -TRICK_EXT_LIB_DIRS += /home/plherrin/trick/test/SIM_trickified_object/trickified_project/include_bar:/home/plherrin/trick/test/SIM_trickified_object/trickified_project/include_foo -TRICK_PYTHON_PATH += /home/plherrin/trick/test/SIM_trickified_object/trickified_project/trickified/python -TRICK_SWIG_FLAGS += -I/home/plherrin/trick/test/SIM_trickified_object/trickified_project/trickified +TRICK_LDFLAGS += $(LOCAL_DIR)/trickified_project/trickified/trickified_myproject.o +TRICK_EXT_LIB_DIRS += $(LOCAL_DIR)/trickified_project/include_bar:$(LOCAL_DIR)/trickified_project/include_foo +TRICK_PYTHON_PATH += $(LOCAL_DIR)/trickified_project/trickified/python +TRICK_SWIG_FLAGS += -I$(LOCAL_DIR)/trickified_project/trickified/ TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk diff --git a/test/SIM_trickified_shared/S_overrides.mk b/test/SIM_trickified_shared/S_overrides.mk index 715f41e1..e2fbe2e6 100644 --- a/test/SIM_trickified_shared/S_overrides.mk +++ b/test/SIM_trickified_shared/S_overrides.mk @@ -2,10 +2,10 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) #Normally would just include S_overrides_trickify.mk like below. Due to the weird order of operations in this test, the file won't be generated before this include statement. I've copied the contents of the file instead. #include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk -TRICK_LDFLAGS += /home/plherrin/trick/test/SIM_trickified_shared/trickified_project/trickified/trickified_myproject.so -TRICK_EXT_LIB_DIRS += /home/plherrin/trick/test/SIM_trickified_shared/trickified_project/include_bar:/home/plherrin/trick/test/SIM_trickified_shared/trickified_project/include_foo -TRICK_PYTHON_PATH += /home/plherrin/trick/test/SIM_trickified_shared/trickified_project/trickified/python -TRICK_SWIG_FLAGS += -I/home/plherrin/trick/test/SIM_trickified_shared/trickified_project/trickified +TRICK_LDFLAGS += $(LOCAL_DIR)/trickified_project/trickified/trickified_myproject.so +TRICK_EXT_LIB_DIRS += $(LOCAL_DIR)/trickified_project/include_bar:$(LOCAL_DIR)/trickified_project/include_foo +TRICK_PYTHON_PATH += $(LOCAL_DIR)/trickified_project/trickified/python +TRICK_SWIG_FLAGS += -I$(LOCAL_DIR)/trickified_project/trickified/ TRICK_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk