diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-08-29 18:12:42 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-08-29 18:24:55 +0200 |
| commit | 5b01d3f689c24581093ec0eb378337614dd99016 (patch) | |
| tree | ef4f69bf1fab1ff8fe1c0517bfb1d90a352c3fb0 | |
| parent | 483456e1748b40dad99bace00e6b688a0a17899b (diff) | |
EASTL build: tell CMake about our ressource compiler windres
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | Makefile.deps | 1 | ||||
| -rw-r--r-- | Makefile.inc | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 47c3e24..b7285ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,7 @@ jobs: WERROR=1 JOBS=4 Q= \ CC=/usr/bin/x86_64-w64-mingw32-gcc \ CXX=/usr/bin/x86_64-w64-mingw32-g++ \ + RC=/usr/bin/x86_64-w64-mingw32-windres \ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk - run: | env DEBIAN_FRONTEND=noninteractive \ @@ -27,5 +28,6 @@ jobs: WERROR=1 Q= \ CC=/usr/bin/x86_64-w64-mingw32-gcc \ CXX=/usr/bin/x86_64-w64-mingw32-g++ \ + RC=/usr/bin/x86_64-w64-mingw32-windres \ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk \ DESTDIR=_install/ diff --git a/Makefile.deps b/Makefile.deps index a9b18f2..e479b36 100644 --- a/Makefile.deps +++ b/Makefile.deps @@ -90,6 +90,7 @@ $(EASTL_STATIC_LIB): $(CXX) $(EASTL_DEPS) cd $(EASTL_BUILDDIR) && \ $(CMAKE) ../EASTL \ -DCMAKE_CXX_COMPILER="$(realpath $(CXX))" \ + -DCMAKE_RC_COMPILER="$(realpath $(RC))" \ -DCMAKE_SYSTEM_NAME="Windows" \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_CXX_FLAGS='$(CFLAGS) $(CXXFLAGS) $(EASTL_CXXFLAGS)' && \ diff --git a/Makefile.inc b/Makefile.inc index 7d946f2..a059ab5 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -17,15 +17,17 @@ LOCAL_MINGW64_BUILD_SCRIPT := $(DPP_ROOT)/mingw-w64-build/mingw-w64-build LOCAL_MINGW64_BUILD_DIR := $(DPP_ROOT)/w64-mingw32-sysroot/x86_64 LOCAL_MINGW64_CC := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-gcc LOCAL_MINGW64_CXX := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-g++ +LOCAL_MINGW64_RC := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-windres SIGNTOOL := osslsigncode SIGNTOOL_PREFIX := codesign -DDK_GLOBAL_DEPS := deps $(LOCAL_MINGW64_BUILD_SCRIPT) $(LOCAL_MINGW64_BUILD_DIR) $(LOCAL_MINGW64_CC) $(LOCAL_MINGW64_CXX) +DDK_GLOBAL_DEPS := deps $(LOCAL_MINGW64_BUILD_SCRIPT) $(LOCAL_MINGW64_BUILD_DIR) $(LOCAL_MINGW64_CC) $(LOCAL_MINGW64_CXX) $(LOCAL_MINGW64_RC) INSTALL = install CMAKE = cmake CC = $(LOCAL_MINGW64_CC) CXX = $(LOCAL_MINGW64_CXX) +RC = $(LOCAL_MINGW64_RC) DDK_INCLUDE_DIR = $(dir $(CC))../x86_64-w64-mingw32/include/ddk CFLAGS := -Wall -Wextra -Wno-sign-compare -Wno-strict-aliasing \ -m64 -fPIC -fvisibility=hidden \ @@ -88,6 +90,7 @@ path_exists = \ define CHECK_REQUIRED_PATHS $(call path_exists,$(CC)) $(call path_exists,$(CXX)) + $(call path_exists,$(RC)) $(call path_exists,$(DDK_INCLUDE_DIR)) $(call path_exists,$(DRIVER_ADDITIONAL_OBJS)) $(call path_exists,$(EASTL_STATIC_LIB)) @@ -208,6 +211,7 @@ define HELP_MAKE_OPTIONS @echo -e '\tBUILD_NATIVE = no' @echo -e '\tCC = $(CC)' @echo -e '\tCXX = $(CXX)' + @echo -e '\tRC = $(RC)' @echo -e '\tDDK_INCLUDE_DIR = $(DDK_INCLUDE_DIR)' @echo -e '\tDPP_ROOT = $(DPP_ROOT)' endef |