diff options
| author | Alain Frisch <alain@frisch.fr> | 2007-11-08 18:03:15 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2007-11-08 18:03:15 +0000 |
| commit | 4944313b0ce75988c4105b1bda1836005d9af73d (patch) | |
| tree | 6b0af2389bb8780310a01b2938ad8270be72d45e /config | |
| parent | 44c0af7279958ab042529a1e4a8471339a3543e7 (diff) | |
Make it work under Win64.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8497 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.msvc64 | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index cb485108e..9202cb01e 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -69,6 +69,7 @@ DYNLINKOPTS= DEBUGGER= CC_PROFILE= SYSTHREAD_SUPPORT=true +CMXS=cmxs ########## Configuration for the bytecode compiler @@ -76,16 +77,16 @@ SYSTHREAD_SUPPORT=true BYTECC=cl /nologo -D_CRT_SECURE_NO_DEPRECATE ### Additional compile-time options for $(BYTECC). (For static linking.) -BYTECCCOMPOPTS=/Ox /MT +BYTECCCOMPOPTS=/Ox /MD ### Additional compile-time options for $(BYTECC). (For debug version.) BYTECCDBGCOMPOPTS=-DDEBUG /Zi /W3 /Wp64 ### Additional link-time options for $(BYTECC). (For static linking.) -BYTECCLINKOPTS=/MT +BYTECCLINKOPTS=/MD ### Additional compile-time options for $(BYTECC). (For building a DLL.) -DLLCCCOMPOPTS=/Ox /MD -DCAML_DLL +DLLCCCOMPOPTS=/Ox /MD ### Libraries needed EXTRALIBS=bufferoverflowu.lib @@ -95,17 +96,17 @@ NATIVECCLIBS=advapi32.lib $(EXTRALIBS) ### How to invoke the C preprocessor CPP=cl /nologo /EP -### How to merge a .manifest (if any) in a .exe or .dll -MERGEMANIFEST=test ! -f $(1).manifest || mt -nologo -outputresource:$(1) -manifest $(1).manifest && rm -f $(1).manifest -#ml let mergemanifest out = Printf.sprintf "test ! -f %s.manifest || mt -nologo -outputresource:%s -manifest %s.manifest && rm -f %s.manifest" out out out out;; +### Path to the FlexDLL includes +FLEXDIR=$(shell flexlink -where) +FLEXLINK=-I"$(FLEXDIR)" ### How to build an EXE -MKEXE=$(BYTECC) /Fe$(1) $(2) && ($(MERGEMANIFEST)) -#ml let mkexe out files opts = Printf.sprintf "%s /Fe%s %s %s && (%s)" bytecc out opts files (mergemanifest out);; +MKEXE=flexlink -x64 -merge-manifest -exe -o $(1) $(2) $(EXTRALIBS) -- $(3) +#ml let mkexe out files opts = Printf.sprintf "flexlink -x64 -merge-manifest -exe -o %s %s -- %s" out files opts;; ### How to build a DLL -MKDLL=link /nologo /dll /machine:AMD64 /out:$(1) /implib:$(2) $(3) $(EXTRALIBS) && ($(MERGEMANIFEST)) -#ml let mkdll out implib files opts = Printf.sprintf "link /nologo /dll /machine:AMD64 /out:%s /implib:%s %s %s && (%s)" out implib opts files (mergemanifest out);; +MKDLL=flexlink -x64 -merge-manifest -o $(1) $(3) $(EXTRALIBS) -- $(4) +#ml let mkdll out implib files opts = Printf.sprintf "flexlink -x64 -merge-manifest -o %s %s %s -- %s" out files extralibs opts;; ### How to build a static library MKLIB=link /lib /nologo /machine:AMD64 /out:$(1) $(2) @@ -117,7 +118,7 @@ SYSLIB=$(1).lib #ml let syslib x = x ^ ".lib";; ### The ranlib command -RANLIB= +RANLIB=echo RANLIBCMD= ############# Configuration for the native-code compiler @@ -135,10 +136,10 @@ SYSTEM=win64 NATIVECC=cl /nologo ### Additional compile-time options for $(NATIVECC). -NATIVECCCOMPOPTS=/Ox /MT +NATIVECCCOMPOPTS=/Ox /MD ### Additional link-time options for $(NATIVECC) -NATIVECCLINKOPTS=/MT +NATIVECCLINKOPTS=/MD ### Build partially-linked object file PARTIALLD=link /lib /nologo /machine:AMD64 |