Skip to content
This repository was archived by the owner on Aug 9, 2021. It is now read-only.

Commit f344f40

Browse files
authored
Adds apple silicon support (#32)
* add m1 instructions; * Update to node v14.17.0 + apple silicon support * bump version
1 parent 602cb55 commit f344f40

File tree

9 files changed

+32
-17
lines changed

9 files changed

+32
-17
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# These are supported funding model platforms
22

3-
# github: [master-atul] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
3+
# github: [a7ul] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
44
patreon: # Replace with a single Patreon username
55
open_collective: # Replace with a single Open Collective username
66
ko_fi: atul94 # Replace with a single Ko-fi username

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
SYNC_GIT_SUBMODULE: 1
2626

2727
- name: Compress files
28-
uses: master-atul/tar-action@v1.0.2
28+
uses: a7ul/tar-action@v1.0.2
2929
with:
3030
command: c
3131
cwd: ./node/out/Release

.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
SYNC_GIT_SUBMODULE: 1
2323

2424
- name: Compress files
25-
uses: master-atul/tar-action@v1.0.2
25+
uses: a7ul/tar-action@v1.0.2
2626
with:
2727
command: c
2828
cwd: ./node/out/Release

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
SYNC_GIT_SUBMODULE: 1
2626

2727
- name: Compress files
28-
uses: master-atul/tar-action@v1.0.2
28+
uses: a7ul/tar-action@v1.0.2
2929
id: compress
3030
with:
3131
command: c

README.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ It is designed to be used together with `@nodegui/nodegui`. Qode achieves this b
55

66
<img alt="logo" src="https://github.com/nodegui/nodegui/raw/master/extras/logo/nodegui.png" height="200" />
77

8-
98
## Changes in v2.0
109

1110
> In version 2.0, Qode no longer depends on Qt as a dependency.
@@ -16,8 +15,6 @@ It is designed to be used together with `@nodegui/nodegui`. Qode achieves this b
1615
>
1716
> Now, Qode essentially becomes nodejs + `<some code changes to allow message loop injection via an addon>`
1817
19-
20-
2118
### Note:
2219

2320
Qode is published as a NPM module as `@nodegui/qode`.
@@ -66,6 +63,13 @@ sudo apt install libgtk-3-dev patchelf
6663

6764
2. Building Qode. Run `node build.js`
6865

66+
> If you want to build for Apple Silicon Macs
67+
> Make sure you have python 3.8.10 installed
68+
>
69+
> ```
70+
> SYNC_GIT_SUBMODULE=true HOST_ARCH=arm64 TARGET_ARCH=arm64 node build.js
71+
> ```
72+
6973
### Common build errors:
7074
7175
1. if you get an error similar to:
@@ -111,7 +115,7 @@ or
111115

112116
_PS: I havent tested ia32 builds_
113117

114-
The output of the build will be present at node/out/Release/qode
118+
The output of the build will be present at node/out/Release/qode
115119

116120
## Configurations (Available from qode v1.0.3)
117121

@@ -121,7 +125,7 @@ Additional configurations can be done via a qode.json file in the same directory
121125

122126
```javascript
123127
{
124-
distPath: "./dist/index.js" // This will try to load the index.js inside dist folder when qode.exe is run.
128+
distPath: "./dist/index.js"; // This will try to load the index.js inside dist folder when qode.exe is run.
125129
}
126130
```
127131

@@ -146,6 +150,18 @@ namespace qode {
146150
} // namespace qode
147151
```
148152
153+
## Building for M1 Mac
154+
155+
In order to build for M1 mac
156+
157+
Make sure you have python 3.8.10 installed
158+
159+
and then do:
160+
161+
```
162+
SYNC_GIT_SUBMODULE=true HOST_ARCH=arm64 TARGET_ARCH=arm64 node build.js
163+
```
164+
149165
## License
150166
151167
The MIT license.
@@ -165,7 +181,6 @@ The idea of Qode is derived from [yode][yode] and [electron](https://github.com/
165181
166182
## Qode - Node version table
167183
168-
| Qode | Node |
169-
| ------------- |:-------------:|
170-
| v2.1.0 | v14.2.0 |
171-
184+
| Qode | Node |
185+
| ------ | :-----: |
186+
| v2.1.0 | v14.2.0 |

node

Submodule node updated from 338581c to 14c93bd

npm/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

npm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nodegui/qode",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "Qode is a lightly modified fork of Node.js that merges Node's event loop with Qt's event loop. It is designed to be used together with `@nodegui/nodegui`",
55
"main": "index.js",
66
"files": [

src/qode.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "src/integration/node_integration.h"
99
#include "src/helpers/qode_helper.h"
1010

11-
std::string qodeVersion = "2.1.0";
11+
std::string qodeVersion = "2.1.1";
1212

1313
namespace qode {
1414

0 commit comments

Comments
 (0)