diff options
| author | Alain Frisch <alain@frisch.fr> | 2007-11-06 15:16:56 +0000 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2007-11-06 15:16:56 +0000 |
| commit | 3958a92c729c6588bdd4a39d6d8bc5dadb00b3de (patch) | |
| tree | d1cb483d1cfed72c42cd3311ae735784bfbe5d13 /otherlibs/win32graph | |
| parent | 2a99b8737bd88e4af552da873ce904a684c631ae (diff) | |
Merge the natdynlink branch into HEAD.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32graph')
| -rw-r--r-- | otherlibs/win32graph/Makefile.nt | 71 | ||||
| -rw-r--r-- | otherlibs/win32graph/open.c | 2 |
2 files changed, 7 insertions, 66 deletions
diff --git a/otherlibs/win32graph/Makefile.nt b/otherlibs/win32graph/Makefile.nt index 4c2f9b92a..12e3d2392 100644 --- a/otherlibs/win32graph/Makefile.nt +++ b/otherlibs/win32graph/Makefile.nt @@ -13,82 +13,23 @@ # $Id$ -include ../../config/Makefile - -# Compilation options -CC=$(BYTECC) -CFLAGS=-I../../byterun -CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -COMPFLAGS=-warn-error A -g - +LIBNAME=graphics COBJS=open.$(O) draw.$(O) events.$(O) dib.$(O) CAMLOBJS=graphics.cmo WIN32LIBS=$(call SYSLIB,kernel32) $(call SYSLIB,gdi32) $(call SYSLIB,user32) +LINKOPTS=-cclib "\"$(WIN32LIBS)\"" +LDOPTS=-ldopt "$(WIN32LIBS)" -all: dllgraphics.dll libgraphics.$(A) graphics.cma - -allopt: libgraphics.$(A) graphics.cmxa - -dllgraphics.dll: $(COBJS:.$(O)=.$(DO)) - $(call MKDLL,dllgraphics.dll,tmp.$(A),\ - $(COBJS:.$(O)=.$(DO)) ../../byterun/ocamlrun.$(A) $(WIN32LIBS)) - rm tmp.* - -libgraphics.$(A): $(COBJS:.$(O)=.$(SO)) - $(call MKLIB,libgraphics.$(A),$(COBJS:.$(O)=.$(SO))) - -graphics.cma: $(CAMLOBJS) - $(CAMLC) -a -o graphics.cma $(CAMLOBJS) \ - -dllib -lgraphics -cclib -lgraphics -cclib "$(WIN32LIBS)" - -graphics.cmxa: $(CAMLOBJS:.cmo=.cmx) - $(CAMLOPT) -a -o graphics.cmxa $(CAMLOBJS:.cmo=.cmx) \ - -cclib -lgraphics -cclib "$(WIN32LIBS)" - -partialclean: - rm -f *.cm* - -clean: partialclean - rm -f *.$(A) *.dll *.exp *.$(O) - rm -f graphics.ml graphics.mli - rm -f io.h - -install: - cp dllgraphics.dll $(STUBLIBDIR)/dllgraphics.dll - cp libgraphics.$(A) $(LIBDIR)/libgraphics.$(A) - cp graphics.cmi graphics.cma $(LIBDIR) - -installopt: - cp graphics.cmxa graphics.cmx graphics.$(A) $(LIBDIR) +include ../Makefile.nt graphics.ml: ../graph/graphics.ml cp ../graph/graphics.ml graphics.ml graphics.mli: ../graph/graphics.mli cp ../graph/graphics.mli graphics.mli -.SUFFIXES: .ml .mli .cmo .cmi .cmx .$(DO) .$(SO) - -.mli.cmi: - $(CAMLC) -c $(COMPFLAGS) $< - -.ml.cmo: - $(CAMLC) -c $(COMPFLAGS) $< - -.ml.cmx: - $(CAMLOPT) -c $(COMPFLAGS) $< - -.c.$(DO): - $(BYTECC) $(DLLCCCOMPOPTS) $(CFLAGS) -c $< - mv $*.$(O) $*.$(DO) - -.c.$(SO): - $(BYTECC) $(BYTECCCOMPOPTS) $(CFLAGS) -c $< - mv $*.$(O) $*.$(SO) - depend: graphics.cmo: graphics.cmi graphics.cmx: graphics.cmi -draw.$(SO) draw.$(DO): libgraph.h -open.$(SO) open.$(DO): libgraph.h +draw.$(O): libgraph.h +open.$(O): libgraph.h diff --git a/otherlibs/win32graph/open.c b/otherlibs/win32graph/open.c index 6086626ba..d2b63b002 100644 --- a/otherlibs/win32graph/open.c +++ b/otherlibs/win32graph/open.c @@ -17,6 +17,7 @@ #include "mlvalues.h" #include "fail.h" #include "libgraph.h" +#include "callback.h" #include <windows.h> static value gr_reset(void); @@ -343,7 +344,6 @@ CAMLprim value caml_gr_sigio_handler(void) /* Processing of graphic errors */ -value * caml_named_value (char * name); static value * graphic_failure_exn = NULL; void gr_fail(char *fmt, char *arg) { |