Skip to content

Commit c9ddedd

Browse files
committed
Add includepath for 3rd party libraries
1 parent 2a429c3 commit c9ddedd

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

tools/build/Makefile.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ PARROT_PERL_LIB = $(PARROT_TOOLS_DIR)/lib
4242
OPS2C = $(PARROT_BIN_DIR)/ops2c$(EXE)
4343
PMC2C = $(PERL) $(PARROT_TOOLS_DIR)/build/pmc2c.pl
4444
PMC2C_INCLUDES = --include src/pmc --include $(PARROT_SRC_DIR) --include $(PARROT_SRC_DIR)/pmc
45-
CINCLUDES = -I$(PARROT_INCLUDE_DIR) -I$(PARROT_INCLUDE_DIR)/pmc
45+
CINCLUDES = -I$(PARROT_INCLUDE_DIR) -I$(PARROT_INCLUDE_DIR)/pmc -I3rdparty/dyncall -I3rdparty/libtommath -I3rdparty/sha1
4646
LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@
4747

4848
# nqp directories
@@ -431,8 +431,6 @@ $(OPS_DIR)/$(OPS).c: $(OPS_DIR)/$(OPS_SOURCE)
431431
$(OPS_DIR)/$(OPS)$(O): $(OPS_DIR)/$(OPS).c $(PMC_DIR)/pmc_dispatchersub.h $(PMC_DIR)/pmc_nqplexinfo.h
432432

433433
$(OPS_DIR)/$(OPS)$(LOAD_EXT): $(OPS_DIR)/$(OPS).o $(DYNPMC) $(METAMODEL_OBJS)
434-
#cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(OPS)$(O) $(CINCLUDES) $(CFLAGS) $(OPS).c
435-
#cd src/guts && $(CC) -c @cc_o_out@multi_dispatch$(O) -I../../$(PMC_DIR) $(CINCLUDES) $(CFLAGS) multi_dispatch.c
436434
cd 3rdparty/sha1 && $(CC) -c @cc_o_out@sha1$(O) $(CINCLUDES) $(CFLAGS) sha1.c
437435
$(LD) @ld_out@$(OPS_DIR)/$(OPS)$(LOAD_EXT) $(OPS_DIR)/$(OPS)$(O) $(METAMODEL_OBJS) 3rdparty/sha1/sha1$(O) $(LINKARGS)
438436

@@ -447,7 +445,7 @@ $(OPS_DIR)/$(BIGINT_OPS)$(LOAD_EXT): $(OPS_DIR)/$(BIGINT_OPS_SOURCE) $(LIBTOMMAT
447445
$(DYNCALL_BIN):
448446
@dyncall_build@
449447

450-
$(OPS_DIR)/$(DYNCALL_OPS)$(LOAD_EXT): $(OPS_DIR)/$(DYNCALL_OPS_SOURCE) $(DYNCALL_BIN) src/6model/reprs/NativeCall.c src/6model/reprs/NativeCall.h src/6model/reprs/CStruct.c src/6model/reprs/CStruct.h src/6model/reprs/CPointer.c src/6model/reprs/CPointer.h src/6model/reprs/CArray.c src/6model/reprs/CArray.h
448+
$(OPS_DIR)/$(DYNCALL_OPS)$(LOAD_EXT): $(OPS_DIR)/$(DYNCALL_OPS_SOURCE) $(DYNCALL_BIN) src/6model/reprs/NativeCall.o src/6model/reprs/CStruct.o src/6model/reprs/CPointer.o src/6model/reprs/CArray.o
451449
cd $(OPS_DIR) && $(OPS2C) C --dynamic $(DYNCALL_OPS_SOURCE)
452450
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(DYNCALL_OPS)$(O) $(CINCLUDES) -I../../3rdparty/dyncall $(CFLAGS) $(DYNCALL_OPS).c
453451
cd src/6model/reprs && $(CC) -c @cc_o_out@NativeCall$(O) -I../../../$(PMC_DIR) -I../../../3rdparty/dyncall $(CINCLUDES) $(CFLAGS) NativeCall.c

0 commit comments

Comments
 (0)