From 4e477a5b6434ef4608f3b5f752aaf3a7017de5e0 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Thu, 27 May 2021 17:32:33 -0500 Subject: [PATCH] build: bump vendor/DOtherSide Fix a typo in a recently added header file in DOtherSide that causes problems on case-sensitive filesystems, e.g. on Linux. Also unify the build command for DOtherSide across platforms. --- Makefile | 3 +-- vendor/DOtherSide | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c36ced97b..e7f3ac64a2 100644 --- a/Makefile +++ b/Makefile @@ -138,16 +138,15 @@ ifneq ($(detected_OS),Windows) endif DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a DOTHERSIDE_CMAKE_PARAMS := -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON - DOTHERSIDE_BUILD_CMD := $(MAKE) VERBOSE=$(V) $(HANDLE_OUTPUT) # 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)" else DOTHERSIDE := vendor/DOtherSide/build/lib/Release/DOtherSide.dll DOTHERSIDE_CMAKE_PARAMS := -T"v141" -A x64 -DENABLE_DYNAMIC_LIBS=ON -DENABLE_STATIC_LIBS=OFF - DOTHERSIDE_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT) NIM_PARAMS += -L:$(DOTHERSIDE) NIM_EXTRA_PARAMS := --passL:"-lsetupapi -lhid" endif +DOTHERSIDE_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT) RELEASE ?= false ifeq ($(RELEASE),false) diff --git a/vendor/DOtherSide b/vendor/DOtherSide index 4e39640998..3c5eeedb6e 160000 --- a/vendor/DOtherSide +++ b/vendor/DOtherSide @@ -1 +1 @@ -Subproject commit 4e3964099892410a986ffe5be2304fcad32d1060 +Subproject commit 3c5eeedb6ec22ff16871de95e14144ff7d19ffe3