From df19738cad7b94b129e62049ca66fca98c7630eb Mon Sep 17 00:00:00 2001 From: Pherring04 Date: Mon, 2 Dec 2024 12:29:08 -0600 Subject: [PATCH] Changed old trickified test to generate an archive --- test/SIM_trickified/trickified_project/trickified/Makefile | 3 ++- test/SIM_trickified/trickified_project/trickified/myproject.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/SIM_trickified/trickified_project/trickified/Makefile b/test/SIM_trickified/trickified_project/trickified/Makefile index ae6eb310..459c4c0c 100644 --- a/test/SIM_trickified/trickified_project/trickified/Makefile +++ b/test/SIM_trickified/trickified_project/trickified/Makefile @@ -1,7 +1,8 @@ PROJECT_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..) TRICK_HOME := $(abspath $(PROJECT_HOME)/../../..) -export TRICKIFY_OBJECT_NAME := trickified_myproject.o +export TRICKIFY_BUILD_TYPE := STATIC +export TRICKIFY_OBJECT_NAME := trickified_myproject.a export TRICKIFY_CXX_FLAGS := -I$(PROJECT_HOME)/include -I$(TRICK_HOME)/include all: diff --git a/test/SIM_trickified/trickified_project/trickified/myproject.mk b/test/SIM_trickified/trickified_project/trickified/myproject.mk index 7abe9af1..f08a541c 100644 --- a/test/SIM_trickified/trickified_project/trickified/myproject.mk +++ b/test/SIM_trickified/trickified_project/trickified/myproject.mk @@ -11,7 +11,7 @@ MYPROJECT_INCLUDE := -I$(MYPROJECT_HOME)/include TRICK_CFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE) TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE) -MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/trickified_myproject.o +MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/trickified_myproject.a # Tell Trick the headers and source at this location are part of a # Trickified project