Skip to content

Commit 2767bad

Browse files
committed
Add proj as submodule
Until georust/proj#156 is merged. Because the changes are needed in proj-sys build.rs script.
1 parent 6d4f831 commit 2767bad

File tree

5 files changed

+56
-46
lines changed

5 files changed

+56
-46
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "proj"]
2+
path = proj
3+
url = git@github.com:balazsdukai/proj.git

Cargo.lock

Lines changed: 38 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ walkdir = "2.3.2"
2929
subprocess = "0.2.9"
3030
rayon = "1.6.1"
3131
# crates needed for the proj adaptation
32-
proj-sys = { version = "0.23.1" , features = ["network"]}
32+
#proj-sys = { version = "0.23.1" , features = ["network"]}
33+
proj-sys = { version = "0.23.1" , features = ["network"], path = "proj/proj-sys"}
3334
num-traits = "0.2.14"
3435
libc = "0.2.119"
3536
thiserror = "1.0.30"

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ After downloading the source code from GitHub, navigate into the tyler directory
3737
cargo install .
3838
```
3939

40+
#### On Windows
41+
42+
Use [MSYS2](https://www.msys2.org/) with `UCRT64` environment.
43+
44+
Required libraries (prefix: `mingw-w64-ucrt-x86_64-`):
45+
* clang
46+
* cmake
47+
* libtiff
48+
* make
49+
* rust
50+
* sqlite3
51+
4052
## Usage
4153

4254
*tyler* is a command line application.

proj

Submodule proj added at 260d975

0 commit comments

Comments
 (0)