diff options
| -rw-r--r-- | otherlibs/systhreads/Makefile.nt | 4 | ||||
| -rw-r--r-- | otherlibs/systhreads/Tests/Makefile.nt | 19 | ||||
| -rw-r--r-- | otherlibs/systhreads/condition.mlp | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/otherlibs/systhreads/Makefile.nt b/otherlibs/systhreads/Makefile.nt index 924b08cef..8354f235e 100644 --- a/otherlibs/systhreads/Makefile.nt +++ b/otherlibs/systhreads/Makefile.nt @@ -3,8 +3,8 @@ include ../../config/Makefile.nt # Compilation options CC=$(BYTECC) CFLAGS=-I..\..\byterun $(BYTECCCOMPOPTS) -CAMLC=..\..\boot\ocamlrun ..\..\boot\ocamlc -I ..\..\boot -I ..\win32unix - +CAMLC=..\..\boot\ocamlrun ..\..\boot\ocamlc -I ..\..\stdlib -I ..\win32unix +CPPFLAGS=/DWIN32 C_OBJS=win32.obj LIB=..\..\stdlib diff --git a/otherlibs/systhreads/Tests/Makefile.nt b/otherlibs/systhreads/Tests/Makefile.nt new file mode 100644 index 000000000..12cfcf8a8 --- /dev/null +++ b/otherlibs/systhreads/Tests/Makefile.nt @@ -0,0 +1,19 @@ +PROGS=test1.byt test2.byt test3.byt test4.byt test5.byt test6.byt \ + test7.byt test8.byt test9.byt testA.byt sieve.byt \ + testio.byt testsocket.byt testwait.byt testsignal.byt + +!include ../../../config/Makefile.nt + +all: $(PROGS) + +clean: + rm -f *.cm* *.byt + rm -f $(PROGS:.byt=.ml) + +.SUFFIXES: .ml .byt + +{..\..\threads\Tests}.ml{}.byt: + cp ../../threads/Tests/$*.ml $*.ml + ocamlc -custom -o $*.byt -I .. -I ../../win32unix unix.cma threads.cma $*.ml ..\libthreads.lib ..\..\win32unix\libunix.lib wsock32.lib + +$(PROGS): ../threads.cma ../libthreads.lib ../stdlib.cma diff --git a/otherlibs/systhreads/condition.mlp b/otherlibs/systhreads/condition.mlp index b35795f60..9f61c183d 100644 --- a/otherlibs/systhreads/condition.mlp +++ b/otherlibs/systhreads/condition.mlp @@ -24,7 +24,7 @@ let create () = { mut = m; waiting = [] } external sleep : unit -> unit = "caml_thread_sleep" -external wakeup : t -> unit = "caml_thread_wakeup" +external wakeup : Thread.t -> unit = "caml_thread_wakeup" let wait cond mut = Mutex.lock cond.mut; |