diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
| commit | 1f95b175707ec490f8bf08c6c28f2dee203818cb (patch) | |
| tree | f004cd5ba13d81b1182b65def6f3e20c6bda3798 /otherlibs/labltk/browser/Makefile.nt | |
| parent | c52e649d83e34967da0fd2a70faf5c91070c8a91 (diff) | |
merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser/Makefile.nt')
| -rw-r--r-- | otherlibs/labltk/browser/Makefile.nt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/otherlibs/labltk/browser/Makefile.nt b/otherlibs/labltk/browser/Makefile.nt index 12550fe8c..405f47e74 100644 --- a/otherlibs/labltk/browser/Makefile.nt +++ b/otherlibs/labltk/browser/Makefile.nt @@ -1,14 +1,19 @@ +# $Id$ + OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads CCFLAGS=-I../../../byterun $(TK_DEFS) +include ../support/Makefile.common + ifeq ($(CCOMPTYPE),cc) -WINDOWS_APP=-ccopt "-Wl,--subsystem,windows" +WINDOWS_APP=-ccopt "-link -Wl,--subsystem,windows" else -WINDOWS_APP=-ccopt "/link /subsystem:windows" +WINDOWS_APP=-ccopt "-link /subsystem:windows" endif -OCAMLBR=threads.cma winmain.$(O) $(WINDOWS_APP) +XTRAOBJ=winmain.$(O) +XTRALIBS=threads.cma -custom $(WINDOWS_APP) include Makefile.shared |