diff --git a/test/SIM_trickified_archive/S_overrides.mk b/test/SIM_trickified_archive/S_overrides.mk index 9892b22d..da416da4 100644 --- a/test/SIM_trickified_archive/S_overrides.mk +++ b/test/SIM_trickified_archive/S_overrides.mk @@ -1,6 +1,11 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk +#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_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 9892b22d..4d73613f 100644 --- a/test/SIM_trickified_object/S_overrides.mk +++ b/test/SIM_trickified_object/S_overrides.mk @@ -1,6 +1,11 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk +#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_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 9892b22d..715f41e1 100644 --- a/test/SIM_trickified_shared/S_overrides.mk +++ b/test/SIM_trickified_shared/S_overrides.mk @@ -1,6 +1,11 @@ LOCAL_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) -include $(LOCAL_DIR)/trickified_project/trickified/S_overrides_trickify.mk +#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_CXXFLAGS += -I$(LOCAL_DIR)/models include $(CURDIR)/trickified_project/trickified/myproject.mk