Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
A copule of tweaks to get Rakudo building on MS VC++ and Win32 again …
…after the ins2 branch merge. I'm hopeful that this will not break things too much for @other.
  • Loading branch information
jnthn committed Aug 13, 2009
1 parent 75293d3 commit 0d4fe08
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Configure.pl
Expand Up @@ -119,7 +119,7 @@ sub create_makefile {

my $maketext = slurp( 'build/Makefile.in' );

$config{'win32_libparrot_copy'} = $^O eq 'MSWin32' ? 'copy $(BUILD_DIR)\libparrot.dll .' : '';
$config{'win32_libparrot_copy'} = $^O eq 'MSWin32' ? 'copy $(PARROT_BIN_DIR)\libparrot.dll .' : '';
$maketext =~ s/@(\w+)@/$config{$1}/g;
if ($^O eq 'MSWin32') {
$maketext =~ s{/}{\\}g;
Expand Down
13 changes: 1 addition & 12 deletions build/Makefile.in
Expand Up @@ -38,7 +38,7 @@ OPS2C = $(PERL) $(PARROT_TOOLS_DIR)/build/ops2c.pl
PMC2C = $(PERL) $(PARROT_TOOLS_DIR)/build/pmc2c.pl
PMC2C_INCLUDES = --include src/pmc --include $(PARROT_SRC_DIR) --include $(PARROT_SRC_DIR)/pmc
CINCLUDES = -I$(PARROT_INCLUDE_DIR) -I$(PARROT_INCLUDE_DIR)/pmc
LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT)
LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@

# rakudo directories
DYNEXT_DIR = dynext
Expand All @@ -55,8 +55,6 @@ DYNPMC = $(PMC_DIR)/$(GROUP)$(LOAD_EXT)
DYNOPS = \
$(OPS_DIR)/$(OPS)$(LOAD_EXT) \
$(OPS_DIR)/$(OPS)_switch$(LOAD_EXT) \
$(OPS_DIR)/$(OPS)_cg$(LOAD_EXT) \
$(OPS_DIR)/$(OPS)_cgp$(LOAD_EXT) \

SOURCES = perl6.pir \
src/gen_grammar.pir \
Expand Down Expand Up @@ -421,14 +419,5 @@ $(OPS_DIR)/$(OPS)_switch$(LOAD_EXT): $(OPS_DIR)/$(OPS_SOURCE)
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(OPS)_switch$(O) $(CINCLUDES) $(CFLAGS) $(OPS)_switch.c
cd $(OPS_DIR) && $(LD) @ld_out@$(OPS)_switch$(LOAD_EXT) $(OPS)_switch$(O) $(LINKARGS)

$(OPS_DIR)/$(OPS)_cg$(LOAD_EXT): $(OPS_DIR)/$(OPS_SOURCE)
cd $(OPS_DIR) && $(OPS2C) CGoto --dynamic $(OPS_SOURCE)
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(OPS)_cg$(O) $(CINCLUDES) $(CFLAGS) $(OPS)_cg.c
cd $(OPS_DIR) && $(LD) @ld_out@$(OPS)_cg$(LOAD_EXT) $(OPS)_cg$(O) $(LINKARGS)

$(OPS_DIR)/$(OPS)_cgp$(LOAD_EXT): $(OPS_DIR)/$(OPS_SOURCE)
cd $(OPS_DIR) && $(OPS2C) CGP --dynamic $(OPS_SOURCE)
cd $(OPS_DIR) && $(CC) -c @cc_o_out@$(OPS)_cgp$(O) $(CINCLUDES) $(CFLAGS) $(OPS)_cgp.c
cd $(OPS_DIR) && $(LD) @ld_out@$(OPS)_cgp$(LOAD_EXT) $(OPS)_cgp$(O) $(LINKARGS)


0 comments on commit 0d4fe08

Please sign in to comment.