Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't disable Camlp4 by default for msvc64 and mingw64. 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12458 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Alain Frisch 2012-05-15 13:08:47 +00:00
parent bae01ace03
commit eb08d628da
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/Makefile.mingw64
View File

@ -19,6 +19,9 @@
PREFIX=C:/ocamlmgw64
### Remove this to disable compiling camlp4
CAMLP4=camlp4
### Where to install the binaries
BINDIR=$(PREFIX)/bin
@ -78,6 +81,7 @@ EXTRALIBS=
NATDYNLINK=true
CMXS=cmxs
RUNTIMED=noruntimed
ASM_CFI_SUPPORTED=false
########## Configuration for the bytecode compiler

7
config/Makefile.msvc64
View File

@ -146,6 +146,13 @@ NATIVECCLINKOPTS=
### Build partially-linked object file
PACKLD=link /lib /nologo /machine:AMD64 /out:# there must be no space after this '/out:'
############# Configuration for camlp4
# This variable controls whether camlp4 will be built.
# If it is set to camlp4, then it will be built.
# If it is set to the empty string, then it will not be built.
CAMLP4=camlp4
############# Configuration for the contributed libraries
OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray