mirror of
https://github.com/nasa/trick.git
synced 2024-12-24 07:16:41 +00:00
Trickify MAC fixes
This commit is contained in:
parent
5960500630
commit
ffb2e34240
@ -126,7 +126,7 @@ UNAME := $(shell uname)
|
||||
ifeq ($(UNAME), Linux)
|
||||
SHARED_OPTIONS := -shared
|
||||
else ifeq ($(UNAME), Darwin)
|
||||
SHARED_OPTIONS := -dynamiclib
|
||||
SHARED_OPTIONS := -dynamiclib -fPIC
|
||||
else
|
||||
SHARED_OPTIONS := -shared
|
||||
endif
|
||||
@ -135,12 +135,16 @@ endif
|
||||
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)
|
||||
|
||||
$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
|
||||
echo "Enterting trickify.mk"
|
||||
$(info $(call COLOR,Linking) $@)
|
||||
ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
|
||||
echo "Building PLO"
|
||||
$(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS))
|
||||
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
|
||||
echo "Building SHARED"
|
||||
$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS))
|
||||
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
|
||||
echo "Building STATIC"
|
||||
$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user