Skip to content

Commit 6d93aa8

Browse files
committed
Tweak opam dependency handling
1 parent 4a53728 commit 6d93aa8

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@ vars:
4848
@echo 'ASSETS = $(ASSETS)'
4949
@echo 'SYSASSETS = $(SYSASSETS)'
5050

51-
deps-try:
52-
# Install deps first, as workaround for Opam Windows bug
53-
opam install --yes --deps-only $(PROJECTDEPS:%="%")
54-
opam install --yes $(PROJECTDEPS:%="%")
51+
deps-try: opam
52+
opam install --yes --deps-only .
53+
(cd vendor/raylib-ocaml && opam install --yes --deps-only .)
5554

5655
deps:
57-
make deps-try || (opam update && make deps-try)
5856
git submodule update --init --recursive
57+
make deps-try || (opam update && make deps-try)
5958

6059
upgrade:
6160
opam update
@@ -66,6 +65,8 @@ exe:
6665
ln -f _build/default/src/$(MAIN).exe $(NAME).exe
6766

6867
opam: dune-project
68+
opam list --check dune
69+
opam install dune
6970
opam exec -- dune build "@opam"
7071

7172
release: check-release zip

‎dune-project‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(lang dune 3.20)
22

33
(authors "Andreas Rossberg")
4+
(maintainers "rossberg@mpi-sws.org")
45
(license "CC-BY-NC-SA-4.0")
56
(source (github rossberg/camp))
67
(homepage https://mpi-sws.org/~rossberg/camp/)

0 commit comments

Comments
 (0)