From 9f6ecc19dcd8af73686ad7ad633fdb462c672cc4 Mon Sep 17 00:00:00 2001 From: master-atul Date: Fri, 21 Jun 2019 18:49:04 +0200 Subject: [PATCH] Fixes windows build for addon --- config/application.gypi | 2 +- config/common.gypi | 30 +++++++++---------- .../Extras/Utils/{utils.cpp => nutils.cpp} | 12 +++++--- src/cpp/Extras/Utils/{utils.h => nutils.h} | 0 src/cpp/QtGui/QWidget/qwidget_wrap.cpp | 2 +- .../QtWidgets/QCheckBox/qcheckbox_wrap.cpp | 2 +- .../QGridLayout/qgridlayout_wrap.cpp | 2 +- src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp | 2 +- .../QtWidgets/QLineEdit/qlineedit_wrap.cpp | 2 +- .../QMainWindow/qmainwindow_wrap.cpp | 2 +- .../QProgressBar/qprogressbar_wrap.cpp | 2 +- .../QPushButton/qpushbutton_wrap.cpp | 2 +- .../QtWidgets/QPushButton/qpushbutton_wrap.h | 2 +- .../QRadioButton/qradiobutton_wrap.cpp | 2 +- src/cpp/core/FlexLayout/flexlayout_wrap.cpp | 2 +- 15 files changed, 35 insertions(+), 31 deletions(-) rename src/cpp/Extras/Utils/{utils.cpp => nutils.cpp} (72%) rename src/cpp/Extras/Utils/{utils.h => nutils.h} (100%) diff --git a/config/application.gypi b/config/application.gypi index b393a5269..ecb0f4838 100644 --- a/config/application.gypi +++ b/config/application.gypi @@ -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", diff --git a/config/common.gypi b/config/common.gypi index 330f36203..9a56aa3ec 100644 --- a/config/common.gypi +++ b/config/common.gypi @@ -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)', }] }], ], diff --git a/src/cpp/Extras/Utils/utils.cpp b/src/cpp/Extras/Utils/nutils.cpp similarity index 72% rename from src/cpp/Extras/Utils/utils.cpp rename to src/cpp/Extras/Utils/nutils.cpp index 855ff3651..f7c28187d 100644 --- a/src/cpp/Extras/Utils/utils.cpp +++ b/src/cpp/Extras/Utils/nutils.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "nutils.h" #include #include #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(size.width()); + height = static_cast(size.height()); return YGSize{ - .width = static_cast(size.width()), - .height = static_cast(size.height()), + width, + height, }; } } - return YGSize{ .width = 0, .height = 0}; + return YGSize{width, height}; } \ No newline at end of file diff --git a/src/cpp/Extras/Utils/utils.h b/src/cpp/Extras/Utils/nutils.h similarity index 100% rename from src/cpp/Extras/Utils/utils.h rename to src/cpp/Extras/Utils/nutils.h diff --git a/src/cpp/QtGui/QWidget/qwidget_wrap.cpp b/src/cpp/QtGui/QWidget/qwidget_wrap.cpp index 87be350c3..743fe1ca0 100644 --- a/src/cpp/QtGui/QWidget/qwidget_wrap.cpp +++ b/src/cpp/QtGui/QWidget/qwidget_wrap.cpp @@ -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; diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp index b20e8e61d..34bbe500b 100644 --- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp +++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp @@ -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 diff --git a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp index 8040bbb9d..3b2b03580 100644 --- a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp +++ b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp @@ -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; diff --git a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp index e19de50be..0dbe341c7 100644 --- a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp +++ b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp @@ -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 diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp index 3beabfc10..90b3fd2da 100644 --- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp +++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp @@ -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 diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp index d6f94be66..4d30788e1 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp @@ -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; diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp index 3f7b51085..853ae1a3f 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp @@ -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 diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp index 29b5b0450..a9545bf4d 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp @@ -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; diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h index 0fcb4d010..91eca3bad 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -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 { private: diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp index 0baf63c83..6789a9bf5 100644 --- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp +++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp @@ -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 diff --git a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp index c969ba97e..d24acf1ab 100644 --- a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp +++ b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp @@ -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 Napi::FunctionReference FlexLayoutWrap::constructor;