diff options
| author | Enrico Tassi | 2014-01-23 15:43:51 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2014-01-26 14:20:52 +0100 |
| commit | 26b6134c3cd333d7fc78c665be5fd1394a546395 (patch) | |
| tree | bcdd8e21baced63afca46edcc0e3ef6f56f85aec | |
| parent | 9273e81b853a8e107da57e902ce130ad1e54f928 (diff) | |
configure.ml fixed wrt Win32 + byte-only + coqide
| -rw-r--r-- | Makefile.build | 2 | ||||
| -rw-r--r-- | configure.ml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.build b/Makefile.build index ba4ed52b5a..2a78a94945 100644 --- a/Makefile.build +++ b/Makefile.build @@ -752,7 +752,7 @@ grammar/grammar.cma: | grammar/grammar.mllib.d ide/coqide_main.ml: ide/coqide_main.ml4 $(SHOW)'CAMLP4O $<' - $(HIDE)$(CAMLP4O) $(PR_O) $(CAMLP4USE) -impl $< -o $@ + $(HIDE)$(CAMLP4O) $(PR_O) $(CAMLP4USE) -D$(IDEINT) -impl $< -o $@ ide/coqide_main_opt.ml: ide/coqide_main.ml4 config/Makefile # no camlp4deps here $(SHOW)'CAMLP4O $<' diff --git a/configure.ml b/configure.ml index d18c0663c6..f72910d4cb 100644 --- a/configure.ml +++ b/configure.ml @@ -742,6 +742,8 @@ let coqide_flags () = | "opt", "win32" -> idearchfile := "ide/ide_win32_stubs.o"; idearchdef := "WIN32" + | _, "win32" -> + idearchdef := "WIN32" | _ -> () let _ = coqide_flags () @@ -1111,6 +1113,7 @@ let write_makefile f = pr "IDEOPTFLAGS=%s\n" !idearchflags; pr "IDEOPTDEPS=%s\n" !idearchfile; pr "IDEOPTINT=%s\n\n" !idearchdef; + pr "IDEINT=%s\n\n" !idearchdef; pr "# Defining REVISION\n"; pr "CHECKEDOUT=%s\n\n" vcs; pr "# Option to control compilation and installation of the documentation\n"; |