diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-09-15 02:20:49 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-09-15 02:21:35 +0200 |
| commit | f3f28ecf9039fc78454941949ca5d436d58642e0 (patch) | |
| tree | 114824c70d4bb52c1c6a7044d34fa84a9076521d | |
| parent | ea291fc6dbc1e85766ca54115863dc3ca3a75861 (diff) | |
Include `eastl_compat.cpp` in (native/mingw) user-mode builds.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | Makefile.native.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc index 0b23309..49f6e7b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -96,7 +96,7 @@ LIBCXXRT_OBJECTS := \ $(LIBCRT_BUILD_DIR)/eastl_compat$(NAME_SUFFIX).opp \ $(LIBCRT_BUILD_DIR)/kcrt$(NAME_SUFFIX).opp \ $(LIBCRT_BUILD_DIR)/DriverThread$(NAME_SUFFIX).opp -LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(NAME_SUFFIX).opp +LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(NAME_SUFFIX).opp $(LIBCRT_BUILD_DIR)/eastl_compat$(NAME_SUFFIX).opp LIBCRT_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libcrt.a LIBCXXRT_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libcxxrt.a LIBUSERCRT_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libusercrt.a diff --git a/Makefile.native.inc b/Makefile.native.inc index 106c9e3..e782d61 100644 --- a/Makefile.native.inc +++ b/Makefile.native.inc @@ -40,7 +40,7 @@ EASTL_BUILDDIR := EASTL-native-build EASTL_STATIC_LIB := $(DPP_ROOT)/$(EASTL_BUILDDIR)/libEASTL.a LIBCRT_BUILD_DIR := $(DPP_ROOT)/CRT-native-build -LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(NAME_SUFFIX).opp +LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(NAME_SUFFIX).opp $(LIBCRT_BUILD_DIR)/eastl_compat$(NAME_SUFFIX).opp LIBUSERCRT_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libusercrt.a is_set = \ |