From 4303d674dde5c7733a1f4723e278a347ca3b5ca0 Mon Sep 17 00:00:00 2001
From: Patryk Osmaczko <osmaczkopatryk@gmail.com>
Date: Thu, 11 Aug 2022 11:14:22 +0200
Subject: [PATCH] feat(Makefile): add QML_DEBUG and QML_DEBUG_PORT options

closes: #6973
---
 Makefile          | 26 +++++++++++++++++++-------
 vendor/DOtherSide |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3d24a1093f..4e81acbb0f 100644
--- a/Makefile
+++ b/Makefile
@@ -126,6 +126,17 @@ deps: | deps-common bottles
 
 update: | update-common
 
+QML_DEBUG ?= false
+QML_DEBUG_PORT ?= 49152
+
+ifneq ($(QML_DEBUG), false)
+ DOTHERSIDE_CMAKE_PARAMS := -DCMAKE_BUILD_TYPE=Debug -DQML_DEBUG_PORT=$(QML_DEBUG_PORT)
+ DOTHERSIDE_BUILD_CMD := cmake --build . --config Debug $(HANDLE_OUTPUT)
+else
+ DOTHERSIDE_CMAKE_PARAMS := -DCMAKE_BUILD_TYPE=Release
+ DOTHERSIDE_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT)
+endif
+
 # Qt5 dirs (we can't indent with tabs here)
 ifneq ($(detected_OS),Windows)
  QT5_PCFILEDIR := $(shell pkg-config --variable=pcfiledir Qt5Core 2>/dev/null)
@@ -153,17 +164,19 @@ ifneq ($(detected_OS),Windows)
   endif
  endif
  DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a
- DOTHERSIDE_CMAKE_PARAMS := -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
+ DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
  # order matters here, due to "-Wl,-as-needed"
  NIM_PARAMS += --passL:"$(DOTHERSIDE)" --passL:"$(shell PKG_CONFIG_PATH="$(QT5_PCFILEDIR)" pkg-config --libs Qt5Core Qt5Qml Qt5Gui Qt5Quick Qt5QuickControls2 Qt5Widgets Qt5Svg Qt5Multimedia)"
 else
- DOTHERSIDE := vendor/DOtherSide/build/lib/Release/DOtherSide.dll
- DOTHERSIDE_CMAKE_PARAMS := -T"v141" -A x64 -DENABLE_DYNAMIC_LIBS=ON -DENABLE_STATIC_LIBS=OFF
+ ifneq ($(QML_DEBUG), false)
+  DOTHERSIDE := vendor/DOtherSide/build/lib/Debug/DOtherSide.dll
+ else
+  DOTHERSIDE := vendor/DOtherSide/build/lib/Release/DOtherSide.dll
+ endif
+ DOTHERSIDE_CMAKE_PARAMS += -T"v141" -A x64 -DENABLE_DYNAMIC_LIBS=ON -DENABLE_STATIC_LIBS=OFF
  NIM_PARAMS += -L:$(DOTHERSIDE)
  NIM_EXTRA_PARAMS := --passL:"-lsetupapi -lhid"
 endif
-DOTHERSIDE_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT)
-
 
 
 ifeq ($(detected_OS),Darwin)
@@ -205,7 +218,6 @@ $(DOTHERSIDE): | deps
 		cd build && \
 		rm -f CMakeCache.txt && \
 		cmake $(DOTHERSIDE_CMAKE_PARAMS)\
-			-DCMAKE_BUILD_TYPE=Release \
 			-DENABLE_DOCS=OFF \
 			-DENABLE_TESTS=OFF \
 			.. $(HANDLE_OUTPUT) && \
@@ -329,7 +341,7 @@ else
 endif
 
 $(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT)
-$(NIM_STATUS_CLIENT): $(NIM_SOURCES) | $(DOTHERSIDE) $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc $(QM_BINARIES) deps
+$(NIM_STATUS_CLIENT): $(NIM_SOURCES) $(DOTHERSIDE) | $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc $(QM_BINARIES) deps
 	echo -e $(BUILD_MSG) "$@" && \
 		$(ENV_SCRIPT) nim c $(NIM_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"-L$(STATUSKEYCARDGO_LIBDIR)" --passL:"-lkeycard" $(NIM_EXTRA_PARAMS) --passL:"$(QRCODEGEN)" --passL:"-lm" src/nim_status_client.nim && \
 		[[ $$? = 0 ]] && \
diff --git a/vendor/DOtherSide b/vendor/DOtherSide
index a5645e4b34..0ae5a55d97 160000
--- a/vendor/DOtherSide
+++ b/vendor/DOtherSide
@@ -1 +1 @@
-Subproject commit a5645e4b342b1efab133da0202faf81f868dc282
+Subproject commit 0ae5a55d97dce563e04b23c7307f902ca2a51d98