plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds symlink step so that qt builds nicely

Browse Source
This commit is contained in:
Atul R 2019-07-20 00:03:35 +02:00
parent 374075cf46
commit a566b01b7a
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
config/common.gypi
View File

@ -2,7 +2,7 @@
'includes': [],
'type': 'shared_library',
'variables': {
'qt_home_dir%': "<!(node -p \"require('@nodegui/test').include\")",
'qt_home_dir%': "<!(node -p \"require('@nodegui/test').qtHome\")",
},
'target_defaults': {
'cflags!': ['-fno-exceptions'],
@ -26,20 +26,34 @@
'MACOSX_DEPLOYMENT_TARGET': '10.7',
'OTHER_CFLAGS': ['-std=c++14'],
},
'actions':[
{
'action_name': 'symlink_qt_headers',
'inputs': [],
'outputs': [
'<(qt_home_dir)/include/QtCore',
'<(qt_home_dir)/include/QtGui',
'<(qt_home_dir)/include/QtWidgets',
],
'action': [
'sh', '-c',
'mkdir -p <(qt_home_dir)/include && \
ln -sfn <(qt_home_dir)/lib/QtCore.framework/Versions/5/Headers <(qt_home_dir)/include/QtCore && \
ln -sfn <(qt_home_dir)/lib/QtGui.framework/Versions/5/Headers <(qt_home_dir)/include/QtGui && \
ln -sfn <(qt_home_dir)/lib/QtWidgets.framework/Versions/5/Headers <(qt_home_dir)/include/QtWidgets'
],
}
],
'include_dirs': [
# install qt via homebrew only
# '<(qt_home_dir)/include',
# '<(qt_home_dir)/include/QtCore',
# '<(qt_home_dir)/include/QtGui',
# '<(qt_home_dir)/include/QtWidgets',
'<(qt_home_dir)/lib/QtCore.framework/Headers',
'<(qt_home_dir)/lib/QtGui.framework/Headers',
'<(qt_home_dir)/lib/QtWidgets.framework/Headers',
'<(qt_home_dir)/include',
'<(qt_home_dir)/lib/QtCore.framework/Versions/5/Headers',
'<(qt_home_dir)/lib/QtGui.framework/Versions/5/Headers',
'<(qt_home_dir)/lib/QtWidgets.framework/Versions/5/Headers',
],
'libraries': [
'<(qt_home_dir)/lib/QtCore.framework/QtCore',
'<(qt_home_dir)/lib/QtGui.framework/QtGui',
'<(qt_home_dir)/lib/QtWidgets.framework/QtWidgets',
'<(qt_home_dir)/lib/QtCore.framework/Versions/5/QtCore',
'<(qt_home_dir)/lib/QtGui.framework/Versions/5/QtGui',
'<(qt_home_dir)/lib/QtWidgets.framework/Versions/5/QtWidgets',
],
}],
['OS=="linux"', {

10
package.json
View File

@ -10,7 +10,7 @@
"license": "MIT",
"private": false,
"devDependencies": {
"@nodegui/test": "^0.0.8",
"@nodegui/test": "^0.0.9",
"@types/bindings": "^1.3.0",
"@types/lodash": "^4.14.130",
"@types/node": "^12.0.2",
@ -19,13 +19,13 @@
"typescript": "^3.4.5"
},
"scripts": {
"build": "npm run build:addon && npm run build:lib",
"dev": "npm run build && qode dist/demo.js",
"postinstall": "npm run build",
"build": "npm run build:lib && npm run build:addon",
"build:lib": "tsc",
"build:addon": "node-gyp -j 8 build",
"rebuild:addon": "node-gyp -j 8 rebuild",
"clean": "rm -rf ./dist ./build",
"automoc": "node ./scripts/automoc.js",
"dev": "tsc && qode dist/demo.js"
"automoc": "node ./scripts/automoc.js"
},
"dependencies": {
"bindings": "^1.5.0",

8
yarn.lock
View File

@ -2,10 +2,10 @@
# yarn lockfile v1
"@nodegui/test@^0.0.8":
version "0.0.8"
resolved "https://registry.yarnpkg.com/@nodegui/test/-/test-0.0.8.tgz#a67e261700d635668b2b5a9d6572fedab9dcb037"
integrity sha512-3+xlopDrZBATp3Fj4MheJJV+xvYH0erftb5PP65UTZELPDDp4PnTygcTrSvKz0vPn68sa7AbkFM69hoEqMH/Sg==
"@nodegui/test@^0.0.9":
version "0.0.9"
resolved "https://registry.yarnpkg.com/@nodegui/test/-/test-0.0.9.tgz#5ec1d94d3f41531973b44f2a455f8c5afa3c4b11"
integrity sha512-0LN0XmP/flS9m/YjXJMiwOZyLjCuaoY/Sl0dseMZKRmLK5L55yyAA2DZxXmtqwiwjOoJXXjDBpqIvFflxSaKLA==
dependencies:
extract-zip "^1.6.7"
fs-extra "^8.1.0"