merge with trunk at rev 14512ephemeron

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/ephemeron@14514 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 2 insertions, 20 deletions

diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index f7124ec8cf..3ab6c6ebf4 100644
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -75,6 +75,8 @@ CMXS=cmxs
 NATDYNLINK=true
 RUNTIMED=noruntimed
 ASM_CFI_SUPPORTED=false
+UNIXLIB=win32unix
+GRAPHLIB=win32graph
 
 ########## Configuration for the bytecode compiler
 
@@ -176,23 +178,3 @@ CANKILL=false
 FIND=/usr/bin/find
 SORT=/usr/bin/sort
 SET_LD_PATH=PATH="$(PATH):$(LD_PATH)"
-
-THIS_MAKEFILE=$(filter %config/Makefile,$(MAKEFILE_LIST))
-ifeq ($(filter /%,$(THIS_MAKEFILE)),)
-ROOTDIR:=$(abspath $(dir $(CURDIR)/$(THIS_MAKEFILE))/..)
-else
-ROOTDIR:=$(abspath $(dir $(THIS_MAKEFILE))/..)
-endif
-CAMLRUN:=$(ROOTDIR)/boot/ocamlrun$(EXE)
-OCAMLRUN:=$(CAMLRUN)
-ROOTDIR_COMPAT:=$(shell $(CYGPATH) $(ROOTDIR))
-CAMLC_BIN_BOOT   = $(CAMLRUN) $(ROOTDIR_COMPAT)/boot/ocamlc
-CAMLC_BIN_BYTE   = $(CAMLRUN) $(ROOTDIR_COMPAT)/ocamlc
-CAMLC_BIN_OPT    = $(ROOTDIR_COMPAT)/ocamlc.opt
-CAMLOPT_BIN_BYTE = $(CAMLRUN) $(ROOTDIR_COMPAT)/ocamlopt
-CAMLOPT_BIN_OPT  = $(ROOTDIR_COMPAT)/ocamlopt.opt
-
-CAMLC_BIN   = @ . $(ROOTDIR)/config/ocamlcomp; PS4=""; set -x; $${CAMLC_BIN}
-CAMLOPT_BIN = @ . $(ROOTDIR)/config/ocamlcomp; PS4=""; set -x; $${CAMLOPT_BIN}
-CAMLC_BIN_CMD_TO_EVAL   = . $(ROOTDIR)/config/ocamlcomp; echo $${CAMLC_BIN}
-CAMLOPT_BIN_CMD_TO_EVAL = . $(ROOTDIR)/config/ocamlcomp; echo $${CAMLOPT_BIN}