diff options
Diffstat (limited to 'otherlibs/bigarray')
| -rw-r--r-- | otherlibs/bigarray/Makefile.nt | 37 | ||||
| -rw-r--r-- | otherlibs/bigarray/mmap_win32.c | 3 |
2 files changed, 20 insertions, 20 deletions
diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt index 17d84ed1a..ea647ab1a 100644 --- a/otherlibs/bigarray/Makefile.nt +++ b/otherlibs/bigarray/Makefile.nt @@ -13,12 +13,12 @@ # $Id$ -include ..\..\config\Makefile.nt +include ../../config/Makefile CC=$(BYTECC) -CFLAGS=-I..\..\byterun -I..\win32unix -CAMLC=..\..\boot\ocamlrun ..\..\ocamlc -I ..\..\stdlib -I ..\win32unix -CAMLOPT=..\..\boot\ocamlrun ..\..\ocamlopt -I ..\..\stdlib -I ..\win32unix +CFLAGS=-I../../byterun -I../win32unix +CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../win32unix +CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix C_OBJS=bigarray_stubs.obj mmap_win32.obj @@ -28,14 +28,13 @@ all: dllbigarray.dll libbigarray.lib bigarray.cma allopt: libbigarray.lib bigarray.cmxa -dllbigarray.dll: $(C_OBJS:.obj=.dobj) - link /nologo /dll /out:dllbigarray.dll /implib:tmp.lib \ - $(C_OBJS:.obj=.dobj) ..\..\byterun\ocamlrun.lib +dllbigarray.dll: $(C_OBJS:.obj=.$(DO)) + $(call MKDLL,dllbigarray.dll,tmp.$(A),\ + $(C_OBJS:.obj=.$(DO)) ../../byterun/ocamlrun.$(A)) rm tmp.* -libbigarray.lib: $(C_OBJS:.obj=.sobj) - rm -f libunix.lib - $(MKLIB)libbigarray.lib $(C_OBJS:.obj=.sobj) +libbigarray.lib: $(C_OBJS:.obj=.$(SO)) + $(call MKLIB,libbigarray.$(A),$(C_OBJS:.obj=.$(SO))) bigarray.cma: $(CAML_OBJS) $(CAMLC) -a -linkall -o bigarray.cma $(CAML_OBJS) \ @@ -46,20 +45,20 @@ bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx) $(CAML_OBJS:.cmo=.cmx) -cclib -lbigarray install: - cp dllbigarray.dll libbigarray.lib $(LIBDIR) + cp dllbigarray.dll libbigarray.$(A) $(LIBDIR) cp bigarray.cmi bigarray.mli bigarray.cma $(LIBDIR) cp bigarray.h $(LIBDIR)/caml/bigarray.h installopt: - cp bigarray.lib $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR) + cp bigarray.$(A) $(CAML_OBJS:.cmo=.cmx) bigarray.cmxa $(LIBDIR) partialclean: rm -f *.cm* clean: partialclean - rm -f *.dll *.lib *.dobj *.sobj + rm -f *.dll *.$(A) *.$(O) -.SUFFIXES: .ml .mli .cmo .cmi .cmx .dobj .sobj +.SUFFIXES: .ml .mli .cmo .cmi .cmx .$(DO) .$(SO) .mli.cmi: $(CAMLC) -c $(COMPFLAGS) $< @@ -70,16 +69,16 @@ clean: partialclean .ml.cmx: $(CAMLOPT) -c $(COMPFLAGS) $< -.c.dobj: +.c.$(DO): $(BYTECC) $(DLLCCCOMPOPTS) $(CFLAGS) -c $< - mv $*.obj $*.dobj + mv $*.$(O) $*.$(DO) -.c.sobj: +.c.$(SO): $(BYTECC) $(BYTECCCOMPOPTS) $(CFLAGS) -c $< - mv $*.obj $*.sobj + mv $*.$(O) $*.$(SO) depend: gcc -MM $(CFLAGS) *.c > .depend - ..\..\boot\ocamlrun ..\..\tools\ocamldep *.mli *.ml >> .depend + ../../boot/ocamlrun ../../tools/ocamldep *.mli *.ml >> .depend include .depend diff --git a/otherlibs/bigarray/mmap_win32.c b/otherlibs/bigarray/mmap_win32.c index 82735cb9e..a3701611d 100644 --- a/otherlibs/bigarray/mmap_win32.c +++ b/otherlibs/bigarray/mmap_win32.c @@ -17,6 +17,7 @@ #include <stdio.h> #include <string.h> #include "bigarray.h" +#include "alloc.h" #include "custom.h" #include "fail.h" #include "mlvalues.h" @@ -110,6 +111,6 @@ static void bigarray_sys_error(void) buffer, sizeof(buffer), NULL)) - sprintf(buffer, "Unknown error %d\n", errnum); + sprintf(buffer, "Unknown error %ld\n", errnum); raise_sys_error(copy_string(buffer)); } |