mirror of
https://github.com/nasa/trick.git
synced 2024-12-18 20:57:55 +00:00
Trickify shared on mac fix
This commit is contained in:
parent
ffb2e34240
commit
573211e09c
@ -135,16 +135,12 @@ endif
|
|||||||
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)
|
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)
|
||||||
|
|
||||||
$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
|
$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
|
||||||
echo "Enterting trickify.mk"
|
|
||||||
$(info $(call COLOR,Linking) $@)
|
$(info $(call COLOR,Linking) $@)
|
||||||
ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
|
ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
|
||||||
echo "Building PLO"
|
|
||||||
$(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS))
|
$(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS))
|
||||||
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
|
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
|
||||||
echo "Building SHARED"
|
$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_LIB_OPT) -o $@ $(LINK_LISTS))
|
||||||
$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS))
|
|
||||||
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
|
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
|
||||||
echo "Building STATIC"
|
|
||||||
$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
|
$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user