Author: fperrad
Date: Fri Apr 20 10:11:02 2007
New Revision: 18290
Modified:
trunk/compilers/imcc/main.c
trunk/config/gen/makefiles/root.in
trunk/include/parrot/imcc.h
Log:
[build]
fix build on mingw32 (broken since r18277)
Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c (original)
+++ trunk/compilers/imcc/main.c Fri Apr 20 10:11:02 2007
@@ -9,8 +9,6 @@
*
*/
-#define PARROT_IN_EXTENSION
-
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -19,16 +17,12 @@
#include "imc.h"
#include "parrot/embed.h"
#include "parrot/longopt.h"
+#include "parrot/imcc.h"
#include "pbc.h"
#include "parser.h"
static int load_pbc, run_pbc, write_pbc, pre_process, pasm_file;
-char * parseflags(Interp *interp, int *argc, char **argv[]);
-int imcc_initialize(Interp *interp);
-int imcc_run(Interp *interp, const char *sourcefile, int argc,
- char * argv[]);
-
static void
usage(FILE* fp)
{
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Fri Apr 20 10:11:02 2007
@@ -426,7 +426,6 @@
$(SRC_DIR)/inter_run$(O) \
$(SRC_DIR)/gc/register$(O) \
$(SRC_DIR)/gc/memory$(O) \
- $(SRC_DIR)/main$(O) \
$(SRC_DIR)/objects$(O) \
$(SRC_DIR)/packfile$(O) \
$(SRC_DIR)/stacks$(O) \
@@ -762,25 +761,25 @@
@echo Invoking Parrot to generate runtime/parrot/include/config.fpmc
--cross your fingers
$(MINIPARROT) config_lib.pasm > $@
-$(PARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(PARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm $(SRC_DIR)/parrot_config$(O) \
$(MINIPARROT)
$(LINK) @[EMAIL PROTECTED]@ \
- $(IMCC_DIR)/main$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
$(LINK_DYNAMIC) \
+ $(SRC_DIR)/main$(O) @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
$(LINK_DYNAMIC) \
$(SRC_DIR)/parrot_config$(O)
#
# TODO build the real miniparrot
#
-$(MINIPARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(MINIPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm $(SRC_DIR)/null_config$(O)
- $(LINK) @[EMAIL PROTECTED]@ $(IMCC_DIR)/main$(O) \
+ $(LINK) @[EMAIL PROTECTED]@ $(SRC_DIR)/main$(O) \
@rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS) $(SRC_DIR)/null_config$(O)
-$(INSTALLABLEPARROT) : $(IMCC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
+$(INSTALLABLEPARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
lib/Parrot/OpLib/core.pm $(SRC_DIR)/install_config$(O) \
$(PARROT)
$(LINK) @[EMAIL PROTECTED]@ \
- $(IMCC_DIR)/main$(O) \
+ $(SRC_DIR)/main$(O) \
$(ALL_PARROT_LIBS) $(LINKFLAGS) $(SRC_DIR)/install_config$(O)
$(SRC_DIR)/parrot_config.c : runtime/parrot/include/config.fpmc \
Modified: trunk/include/parrot/imcc.h
==============================================================================
--- trunk/include/parrot/imcc.h (original)
+++ trunk/include/parrot/imcc.h Fri Apr 20 10:11:02 2007
@@ -6,9 +6,9 @@
#if !defined(PARROT_IMCC_H_GUARD)
#define PARROT_IMCC_H_GUARD
-int imcc_initialize(Interp *interp);
-char * parseflags(Interp *interp, int *argc, char **argv[]);
-int imcc_run(Interp *interp, const char *sourcefile, int argc, char * argv[]);
+PARROT_API int imcc_initialize(Interp *interp);
+PARROT_API char * parseflags(Interp *interp, int *argc, char **argv[]);
+PARROT_API int imcc_run(Interp *interp, const char *sourcefile, int argc, char
* argv[]);
#endif
