mirror of https://github.com/bjornbytes/lovr.git
CMake: change msdfgen binary dir; tup: fix msdfgen path;
This commit is contained in:
parent
126ff0d8ba
commit
b21fd987ca
|
@ -121,7 +121,7 @@ endif()
|
||||||
|
|
||||||
# MSDF
|
# MSDF
|
||||||
if(LOVR_ENABLE_DATA)
|
if(LOVR_ENABLE_DATA)
|
||||||
add_subdirectory(deps/msdfgen)
|
add_subdirectory(deps/msdfgen msdfgen)
|
||||||
include_directories(deps/msdfgen)
|
include_directories(deps/msdfgen)
|
||||||
set(LOVR_MSDF msdfgen)
|
set(LOVR_MSDF msdfgen)
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
|
|
16
Tuprules.tup
16
Tuprules.tup
|
@ -203,14 +203,14 @@ ifneq (@(CMAKE_DEPS),)
|
||||||
|
|
||||||
# msdfgen
|
# msdfgen
|
||||||
CFLAGS_@(DATA) += -I$(DEPS)/msdfgen
|
CFLAGS_@(DATA) += -I$(DEPS)/msdfgen
|
||||||
LDFLAGS_@(DATA)_$(win32) += -L$(BUILD)/lib_msdfgen/$(CONFIG) -lmsdfgen
|
LDFLAGS_@(DATA)_$(win32) += -L$(BUILD)/msdfgen/$(CONFIG) -lmsdfgen
|
||||||
LDFLAGS_@(DATA)_$(macos) += -L$(BUILD)/lib_msdfgen -lmsdfgen
|
LDFLAGS_@(DATA)_$(macos) += -L$(BUILD)/msdfgen -lmsdfgen
|
||||||
LDFLAGS_@(DATA)_$(linux) += -L$(BUILD)/lib_msdfgen -lmsdfgen
|
LDFLAGS_@(DATA)_$(linux) += -L$(BUILD)/msdfgen -lmsdfgen
|
||||||
LDFLAGS_@(DATA)_$(android) += -L$(BUILD)/lib_msdfgen -lmsdfgen
|
LDFLAGS_@(DATA)_$(android) += -L$(BUILD)/msdfgen -lmsdfgen
|
||||||
LDFLAGS_@(DATA)_$(web) += $(BUILD)/lib_msdfgen/libmsdfgen.a
|
LDFLAGS_@(DATA)_$(web) += $(BUILD)/msdfgen/libmsdfgen.a
|
||||||
LIBS_@(DATA)_$(win32) += $(BUILD)/lib_msdfgen/$(CONFIG)/msdfgen.dll
|
LIBS_@(DATA)_$(win32) += $(BUILD)/msdfgen/$(CONFIG)/msdfgen.dll
|
||||||
LIBS_@(DATA)_$(macos) += $(BUILD)/lib_msdfgen/libmsdfgen.dylib
|
LIBS_@(DATA)_$(macos) += $(BUILD)/msdfgen/libmsdfgen.dylib
|
||||||
LIBS_@(DATA)_$(linux) += $(BUILD)/lib_msdfgen/libmsdfgen.so
|
LIBS_@(DATA)_$(linux) += $(BUILD)/msdfgen/libmsdfgen.so
|
||||||
|
|
||||||
# OpenVR
|
# OpenVR
|
||||||
CFLAGS_@(OPENVR) += -I$(DEPS)/openvr/headers
|
CFLAGS_@(OPENVR) += -I$(DEPS)/openvr/headers
|
||||||
|
|
Loading…
Reference in New Issue