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

Fixes windows build for addon

Browse Source
This commit is contained in:
master-atul 2019-06-21 18:49:04 +02:00
parent d60c889288
commit 9f6ecc19dc
15 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/application.gypi
View File

@ -9,7 +9,7 @@
"sources": [
"../src/cpp/main.cpp",
# non-wrapped cpps
"../src/cpp/Extras/Utils/utils.cpp",
"../src/cpp/Extras/Utils/nutils.cpp",
"../src/cpp/core/FlexLayout/flexlayout.cpp",
"../src/cpp/core/FlexLayout/flexitem.cpp",
"../src/cpp/core/YogaWidget/nodestyle.cpp",

30
config/common.gypi
View File

@ -2,7 +2,7 @@
'includes': [],
'type': 'shared_library',
'variables': {
'qt_home_dir': '/usr/local/qt5',
'qt_home_dir': 'C:\\Users\\atula\\Tools\\qt\\5.13.0\\msvc2017_64',
},
'target_defaults': {
'cflags!': ['-fno-exceptions'],
@ -69,27 +69,27 @@
]
},
},
"defines": [
"_HAS_EXCEPTIONS=1"
],
'include_dirs': [
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/includes',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/includes/QtCore',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/includes/QtGui',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/includes/QtTest',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/includes/QtWidgets',
'<(qt_home_dir)\\include',
'<(qt_home_dir)\\include\\QtCore',
'<(qt_home_dir)\\include\\QtGui',
'<(qt_home_dir)\\include\\QtWidgets',
],
'libraries': [
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/lib/Qt5Core.lib',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/lib/Qt5Gui.lib',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/lib/Qt5Test.lib',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/lib/Qt5Widgets.lib',
'<(qt_home_dir)\\lib\\Qt5Core.lib',
'<(qt_home_dir)\\lib\\Qt5Gui.lib',
'<(qt_home_dir)\\lib\\Qt5Widgets.lib',
],
'copies': [{
'files': [
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/dll/Qt5Core.dll',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/dll/Qt5Gui.dll',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/dll/Qt5Test.dll',
'<(module_root_dir)/dep/qt-5.11.0/win32/msvc2017_64/dll/Qt5Widgets.dll',
'<(qt_home_dir)\\bin\\Qt5Core.dll',
'<(qt_home_dir)\\bin\\Qt5Gui.dll',
'<(qt_home_dir)\\bin\\Qt5Widgets.dll',
],
'destination': '<(module_root_dir)/build/Release',
'destination': '<(PRODUCT_DIR)',
}]
}],
],

12
src/cpp/Extras/Utils/utils.cpp → src/cpp/Extras/Utils/nutils.cpp
View File

@ -1,4 +1,4 @@
#include "utils.h"
#include "nutils.h"
#include <string>
#include <QWidget>
#include "deps/spdlog/spdlog.h"
@ -14,13 +14,17 @@ YGSize extrautils::measureQtWidget (YGNodeRef node, float width, YGMeasureMode w
if(ctx){
QLayoutItem* childLayoutItem = ctx->item;
QWidget* widget = childLayoutItem->widget();
float width = 0.0;
float height = 0.0;
if(widget){
QSize size = widget->sizeHint();
width = static_cast<float>(size.width());
height = static_cast<float>(size.height());
return YGSize{
.width = static_cast<float>(size.width()),
.height = static_cast<float>(size.height()),
width,
height,
};
}
}
return YGSize{ .width = 0, .height = 0};
return YGSize{width, height};
}

0
src/cpp/Extras/Utils/utils.h → src/cpp/Extras/Utils/nutils.h
View File

2
src/cpp/QtGui/QWidget/qwidget_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qwidget_wrap.h"
#include "src/cpp/QtWidgets/QLayout/qlayout_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QWidgetWrap::constructor;

2
src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qcheckbox_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>

2
src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qgridlayout_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QGridLayoutWrap::constructor;

2
src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qlabel_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include "src/cpp/core/FlexLayout/flexnode_wrap.h"
#include <QWidget>

2
src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp
View File

@ -1,7 +1,7 @@
#include "qlineedit_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>

2
src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qmainwindow_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QMainWindowWrap::constructor;

2
src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp
View File

@ -1,7 +1,7 @@
#include "qprogressbar_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>

2
src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp
View File

@ -1,6 +1,6 @@
#include "qpushbutton_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QPushButtonWrap::constructor;

2
src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h
View File

@ -4,7 +4,7 @@
#include "npushbutton.h"
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
class QPushButtonWrap : public Napi::ObjectWrap<QPushButtonWrap> {
private:

2
src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp
View File

@ -1,7 +1,7 @@
#include "qradiobutton_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>

2
src/cpp/core/FlexLayout/flexlayout_wrap.cpp
View File

@ -1,7 +1,7 @@
#include "flexlayout_wrap.h"
#include "flexnode_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QDebug>
Napi::FunctionReference FlexLayoutWrap::constructor;