From b21fd987ca50ad9c16a4f3f7f148ac30fd5e7728 Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Thu, 11 Feb 2021 16:19:35 -0700
Subject: [PATCH] CMake: change msdfgen binary dir; tup: fix msdfgen path;

---
 CMakeLists.txt |  2 +-
 Tuprules.tup   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 213b57b6..6b1eee96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ endif()
 
 # MSDF
 if(LOVR_ENABLE_DATA)
-  add_subdirectory(deps/msdfgen)
+  add_subdirectory(deps/msdfgen msdfgen)
   include_directories(deps/msdfgen)
   set(LOVR_MSDF msdfgen)
   if(APPLE)
diff --git a/Tuprules.tup b/Tuprules.tup
index 66979ca7..0332ab6b 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -203,14 +203,14 @@ ifneq (@(CMAKE_DEPS),)
 
   # msdfgen
   CFLAGS_@(DATA) += -I$(DEPS)/msdfgen
-  LDFLAGS_@(DATA)_$(win32) += -L$(BUILD)/lib_msdfgen/$(CONFIG) -lmsdfgen
-  LDFLAGS_@(DATA)_$(macos) += -L$(BUILD)/lib_msdfgen -lmsdfgen
-  LDFLAGS_@(DATA)_$(linux) += -L$(BUILD)/lib_msdfgen -lmsdfgen
-  LDFLAGS_@(DATA)_$(android) += -L$(BUILD)/lib_msdfgen -lmsdfgen
-  LDFLAGS_@(DATA)_$(web) += $(BUILD)/lib_msdfgen/libmsdfgen.a
-  LIBS_@(DATA)_$(win32) += $(BUILD)/lib_msdfgen/$(CONFIG)/msdfgen.dll
-  LIBS_@(DATA)_$(macos) += $(BUILD)/lib_msdfgen/libmsdfgen.dylib
-  LIBS_@(DATA)_$(linux) += $(BUILD)/lib_msdfgen/libmsdfgen.so
+  LDFLAGS_@(DATA)_$(win32) += -L$(BUILD)/msdfgen/$(CONFIG) -lmsdfgen
+  LDFLAGS_@(DATA)_$(macos) += -L$(BUILD)/msdfgen -lmsdfgen
+  LDFLAGS_@(DATA)_$(linux) += -L$(BUILD)/msdfgen -lmsdfgen
+  LDFLAGS_@(DATA)_$(android) += -L$(BUILD)/msdfgen -lmsdfgen
+  LDFLAGS_@(DATA)_$(web) += $(BUILD)/msdfgen/libmsdfgen.a
+  LIBS_@(DATA)_$(win32) += $(BUILD)/msdfgen/$(CONFIG)/msdfgen.dll
+  LIBS_@(DATA)_$(macos) += $(BUILD)/msdfgen/libmsdfgen.dylib
+  LIBS_@(DATA)_$(linux) += $(BUILD)/msdfgen/libmsdfgen.so
 
   # OpenVR
   CFLAGS_@(OPENVR) += -I$(DEPS)/openvr/headers