@@ -42,7 +42,7 @@ PARROT_PERL_LIB = $(PARROT_TOOLS_DIR)/lib
42
42
OPS2C = $(PARROT_BIN_DIR ) /ops2c$(EXE )
43
43
PMC2C = $(PERL ) $(PARROT_TOOLS_DIR ) /build/pmc2c.pl
44
44
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
46
46
LINKARGS = $(LDFLAGS ) $(LD_LOAD_FLAGS ) $(LIBPARROT ) @libs@ @icu_shared@
47
47
48
48
# nqp directories
@@ -431,8 +431,6 @@ $(OPS_DIR)/$(OPS).c: $(OPS_DIR)/$(OPS_SOURCE)
431
431
$(OPS_DIR ) /$(OPS )$(O ) : $(OPS_DIR ) /$(OPS ) .c $(PMC_DIR ) /pmc_dispatchersub.h $(PMC_DIR ) /pmc_nqplexinfo.h
432
432
433
433
$(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
436
434
cd 3rdparty/sha1 && $(CC ) -c @cc_o_out@sha1$(O ) $(CINCLUDES ) $(CFLAGS ) sha1.c
437
435
$(LD ) @ld_out@$(OPS_DIR ) /$(OPS )$(LOAD_EXT ) $(OPS_DIR ) /$(OPS )$(O ) $(METAMODEL_OBJS ) 3rdparty/sha1/sha1$(O ) $(LINKARGS )
438
436
@@ -447,7 +445,7 @@ $(OPS_DIR)/$(BIGINT_OPS)$(LOAD_EXT): $(OPS_DIR)/$(BIGINT_OPS_SOURCE) $(LIBTOMMAT
447
445
$(DYNCALL_BIN ) :
448
446
@dyncall_build@
449
447
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
451
449
cd $(OPS_DIR ) && $(OPS2C ) C --dynamic $(DYNCALL_OPS_SOURCE )
452
450
cd $(OPS_DIR ) && $(CC ) -c @cc_o_out@$(DYNCALL_OPS )$(O ) $(CINCLUDES ) -I../../3rdparty/dyncall $(CFLAGS ) $(DYNCALL_OPS ) .c
453
451
cd src/6model/reprs && $(CC ) -c @cc_o_out@NativeCall$(O ) -I../../../$(PMC_DIR ) -I../../../3rdparty/dyncall $(CINCLUDES ) $(CFLAGS ) NativeCall.c
0 commit comments