Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: agracio/electron-edge-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: stefy/electron-edge-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 27, 2023

  1. Updated mac os x deployment target

    @stefy
    stefy authored Feb 27, 2023
    Copy the full SHA
    4dda01e View commit details

  2. Merge pull request #1 from stefy/updated-macosx-target 

    Updated mac os x deployment target
    @stefy
    stefy authored Feb 27, 2023
    Copy the full SHA
    18ea689 View commit details

  3. Testing

    @stefy
    stefy committed Feb 27, 2023
    Copy the full SHA
    d87590e View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 binding.gyp
  2. +1 −1 tools/install.js
2 changes: 1 addition & 1 deletion binding.gyp
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@
'GCC_ENABLE_CPP_RTTI': 'YES',
'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
'CLANG_CXX_LIBRARY': 'libc++',
'MACOSX_DEPLOYMENT_TARGET': '12.0'
'MACOSX_DEPLOYMENT_TARGET': '13.2.1'
},
'sources+': [
'src/common/v8synchronizationcontext.cpp',
2 changes: 1 addition & 1 deletion tools/install.js
View file
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ else {
}
if (version !== null)
{
spawn('node-gyp', ['configure', 'build', '--target='+version, '--disturl=https://electronjs.org/headers'], { stdio: 'inherit' });
spawn('node-gyp', ['configure', 'build', '--target='+version, '--arch=arm64', '--disturl=https://electronjs.org/headers'], { stdio: 'inherit' });
}
else
spawn('node-gyp', ['configure', 'build'], { stdio: 'inherit' });