Skip to content

Commit 91354b7

Browse files
committed
Fixed main branch checkout on some dependencies
1 parent 5589453 commit 91354b7

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

Makefile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,53 +39,54 @@ libs: libs/cgal \
3939
libs/zlib \
4040
libs/libxml2
4141

42+
SINGLE_BRANCH_MAIN=--branch main --single-branch
4243
SINGLE_BRANCH=--branch master --single-branch
43-
SHALLOW=--depth 1 ${SINGLE_BRANCH}
44+
SHALLOW=--depth 1
4445

4546
libs/cgal:
46-
git clone https://github.com/CGAL/cgal.git ${SHALLOW} $@
47+
git clone https://github.com/CGAL/cgal.git ${SHALLOW} ${SINGLE_BRANCH} $@
4748

4849
libs/eigen:
49-
git clone https://github.com/PX4/eigen.git ${SHALLOW} $@
50+
git clone https://github.com/PX4/eigen.git ${SHALLOW} ${SINGLE_BRANCH} $@
5051

5152
libs/fontconfig:
52-
git clone https://gitlab.freedesktop.org/fontconfig/fontconfig.git ${SHALLOW} $@
53+
git clone https://gitlab.freedesktop.org/fontconfig/fontconfig.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@
5354

5455
libs/freetype:
55-
git clone https://gitlab.freedesktop.org/freetype/freetype.git ${SHALLOW} $@
56+
git clone https://gitlab.freedesktop.org/freetype/freetype.git ${SHALLOW} ${SINGLE_BRANCH} $@
5657

5758
libs/glib:
58-
git clone https://gist.github.com/acfa1c09522705efa5eb0541d2d00887.git ${SHALLOW} $@
59+
git clone https://gist.github.com/acfa1c09522705efa5eb0541d2d00887.git ${SHALLOW} ${SINGLE_BRANCH} $@
5960
git -C $@ apply ../../patches/glib.patch
6061

6162
libs/harfbuzz:
62-
git clone https://github.com/harfbuzz/harfbuzz.git ${SHALLOW} $@
63+
git clone https://github.com/harfbuzz/harfbuzz.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@
6364

6465
libs/lib3mf:
65-
git clone https://github.com/3MFConsortium/lib3mf.git ${SHALLOW} $@
66+
git clone https://github.com/3MFConsortium/lib3mf.git ${SHALLOW} ${SINGLE_BRANCH} $@
6667

6768
libs/libexpat:
68-
git clone https://github.com/libexpat/libexpat ${SHALLOW} $@
69+
git clone https://github.com/libexpat/libexpat ${SHALLOW} ${SINGLE_BRANCH} $@
6970

7071
libs/liblzma:
71-
git clone https://github.com/kobolabs/liblzma.git ${SHALLOW} $@
72+
git clone https://github.com/kobolabs/liblzma.git ${SHALLOW} ${SINGLE_BRANCH} $@
7273

7374
libs/libzip:
74-
git clone https://github.com/nih-at/libzip.git ${SHALLOW} $@
75+
git clone https://github.com/nih-at/libzip.git ${SHALLOW} ${SINGLE_BRANCH} $@
7576

7677
libs/zlib:
77-
git clone https://github.com/madler/zlib.git ${SHALLOW} $@
78+
git clone https://github.com/madler/zlib.git ${SHALLOW} ${SINGLE_BRANCH} $@
7879

7980
libs/libxml2:
80-
git clone https://gitlab.gnome.org/GNOME/libxml2.git ${SHALLOW} $@
81+
git clone https://gitlab.gnome.org/GNOME/libxml2.git ${SHALLOW} ${SINGLE_BRANCH} $@
8182

8283
libs/openscad:
8384
git clone --recurse https://github.com/openscad/openscad.git ${SINGLE_BRANCH} $@
8485
git -C $@ checkout f4d57fb3b2da39953c843c0372b5a0a8730b3189
8586
git -C $@ apply ../../patches/openscad-2019.patch
8687

8788
libs/boost:
88-
git clone --recurse https://github.com/boostorg/boost.git ${SHALLOW} $@
89+
git clone --recurse https://github.com/boostorg/boost.git ${SHALLOW} ${SINGLE_BRANCH} $@
8990
git -C $@/libs/filesystem apply ../../../../patches/boost-filesystem.patch
9091

9192
libs/gmp-6.1.2:

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ const output = instance.FS.readFile("/cube.stl");
7272

7373
For more information on reading and writing files check out the [Emscripten File System API](https://emscripten.org/docs/api_reference/Filesystem-API.html).
7474

75+
### SharedArrayBuffer Errors
76+
77+
This project uses SharedArrayBuffer to manage threading. Currently most browsers will only enable SharedArrayBuffer when the following headers are sent along side the JavaScript/WASM:
78+
```
79+
Cross-Origin-Opener-Policy: same-origin
80+
Cross-Origin-Embedder-Policy: require-corp
81+
```
82+
83+
For more information check out [MDN SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements).
84+
7585
## Project Status
7686
- [x] module builds
7787
- [x] module runs

tests/cylinder/test.scad

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$fn = 100; cylinder(20, 5, 10);

0 commit comments

Comments
 (0)