Skip to content

Commit

Permalink
Fixed makefile regarding the CallstackLibrary
Browse files Browse the repository at this point in the history
  • Loading branch information
mhahnFr committed Oct 17, 2022
1 parent f4a7d8d commit 8c48613
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LIB_NAME = $(CORE_NAME).a
SHARED_L = $(CORE_NAME).so
DYLIB_NA = $(CORE_NAME).dylib

SRC = $(shell find . -name \*.cpp)
SRC = $(shell find . -name \*.cpp \! -path \*CallstackLibrary\*)
HDR = $(shell find . -name \*.h)

OBJS = $(patsubst %.cpp, %.o, $(SRC))
Expand Down Expand Up @@ -83,7 +83,7 @@ $(DYLIB_NA): $(OBJS) $(LIBCALLSTACK_A)
$(CXX) -dynamiclib $(LDFLAGS) -o $(DYLIB_NA) $(OBJS) $(LIBCALLSTACK_A)

$(LIB_NAME): $(OBJS) $(LIBCALLSTACK_EXTR)
$(AR) -crs $(LIB_NAME) $(OBJS) $(shell find $(LIBCALLSTACK_EXTR) -type f -name \*.o)
$(AR) -crs $(LIB_NAME) $(OBJS) $(shell find $(LIBCALLSTACK_EXTR) -type f \( -name \*.o -o -name \*.opp \))

%.o: %.cpp
$(CXX) $(CXXFLAGS) -DVERSION=\"$(VERSION)\" -MMD -MP -c -o $@ $<
Expand Down

0 comments on commit 8c48613

Please sign in to comment.