diff options
| -rw-r--r-- | Makefile.deps | 4 | ||||
| -rw-r--r-- | Makefile.inc | 3 | ||||
| -rw-r--r-- | Makefile.native.inc | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.deps b/Makefile.deps index 9f382a3..0010a52 100644 --- a/Makefile.deps +++ b/Makefile.deps @@ -17,10 +17,6 @@ include Makefile.native.inc endif EASTL_DEPS := $(wildcard $(DPP_ROOT)/EASTL/source/*.cpp) $(wildcard $(DPP_ROOT)/EASTL/include/EASTL/*.h) -EASTL_STATIC_LIB := $(DPP_ROOT)/$(EASTL_BUILDDIR)/libEASTL.a - -LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(NAME_SUFFIX).opp -LIBUSERCRT_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libusercrt.a all: deps diff --git a/Makefile.inc b/Makefile.inc index d66de36..9f83eb8 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -85,6 +85,7 @@ USER_LDFLAGS := -Wl,--dynamicbase -Wl,--nxcompat -Wl,--gc-sections USER_LIBS := EASTL_BUILDDIR := EASTL-build +EASTL_STATIC_LIB := $(DPP_ROOT)/$(EASTL_BUILDDIR)/libEASTL.a LIBCRT_BUILD_DIR := $(DPP_ROOT)/CRT-build LIBCRT_OBJECTS := \ @@ -93,8 +94,10 @@ LIBCRT_OBJECTS := \ LIBCXXRT_OBJECTS := \ $(LIBCRT_BUILD_DIR)/kcrt$(NAME_SUFFIX).opp \ $(LIBCRT_BUILD_DIR)/DriverThread$(NAME_SUFFIX).opp +LIBUSERCRT_OBJECTS := $(LIBCRT_BUILD_DIR)/ucrt$(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 is_set = \ $(if $1,, \ diff --git a/Makefile.native.inc b/Makefile.native.inc index 39af860..1e45d36 100644 --- a/Makefile.native.inc +++ b/Makefile.native.inc @@ -18,6 +18,7 @@ INSTALL = install CMAKE = cmake CC = /usr/bin/cc CXX = /usr/bin/c++ +AR = /usr/bin/ar CFLAGS := -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing -Wno-c++20-compat \ -m64 -fPIC -fvisibility=hidden \ -ffunction-sections -fdata-sections \ @@ -37,7 +38,11 @@ EASTL_CXXFLAGS := -I$(DPP_ROOT)/EASTL/include -I$(DPP_ROOT)/EASTL/test/packages/ USER_LDFLAGS := -Wl,--gc-sections 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_STATIC_LIB := $(LIBCRT_BUILD_DIR)/libusercrt.a is_set = \ $(if $1,, \ |