Skip to content

Commit

Permalink
Update windows cross-compilation instructions and scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
alavrik committed Aug 18, 2019
1 parent 869cc18 commit 6c9525c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ To build a Windows (win64) executable on Linux/MacOsX:
brew install mingw-w64 gawk

opam repository add windows git://github.com/ocaml-cross/opam-cross-windows
opam switch 4.04.0
opam switch 4.08.0
eval `opam config env`

opam install ocaml-windows ocamlfind camlp5
opam install ocaml-windows64 sedlex-windows easy-format-windows

2. Build

Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ endif


deps: build-dir
@#$(MAKE) -C deps download
@#$(MAKE) -C deps
@#$(MAKE) -C deps uninstall install
ifndef OCAMLFIND_TOOLCHAIN
opam install -y --deps-only ./opam
else
$(MAKE) -C deps download
$(MAKE) -C deps
$(MAKE) -C deps uninstall install
endif


build-dir:
Expand All @@ -48,7 +51,7 @@ install:
# especially useful for cross-compilation
STRIP ?= strip
strip:
$(STRIP) src/piqi
$(STRIP) src/piqi$(EXE)


# re-generate _piqi.ml from .piqi and copy the latest version of piqilib.ml --
Expand Down
1 change: 1 addition & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ then

# figure out which dependencies we need to build
echo "checking whether necessary dependencies are already installed..."
export OCAMLFIND_TOOLCHAIN=$TOOLCHAIN
for i in xmlm easy-format base64
do
dir="`$OCAMLFIND query $i 2>/dev/null`"
Expand Down

0 comments on commit 6c9525c

Please sign in to comment.