From bdf0e3dc17750ce7c52a4c55d12fad2f2957db35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matheus=20Catarino=20Fran=C3=A7a?= Date: Tue, 13 Jun 2023 13:50:47 -0300 Subject: [PATCH 1/2] more C macros - using build --- .github/workflows/zig-builds.yml | 1 - build.zig | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zig-builds.yml b/.github/workflows/zig-builds.yml index ead9418..26e35c6 100644 --- a/.github/workflows/zig-builds.yml +++ b/.github/workflows/zig-builds.yml @@ -20,7 +20,6 @@ jobs: - name: Build - Zig test - if: (startsWith(matrix.runs-on, 'ubuntu')) || (startsWith(matrix.runs-on, 'macos')) run: zig build test -freference-trace - name: Build Summary diff --git a/build.zig b/build.zig index 6ad9cbc..58d6bc1 100644 --- a/build.zig +++ b/build.zig @@ -104,20 +104,30 @@ fn buildCAsio(b: *std.Build, info: BuildInfo) *std.Build.CompileStep { .target = info.target, .optimize = info.optimize, }); + lib.defineCMacro("ASIO_DISABLE_STD_FUTURE", null); + lib.defineCMacro("ASIO_DISABLE_THREADS", null); lib.defineCMacro("ASIO_HAS_PTHREADS", null); + lib.defineCMacro("ASIO_HAS_NOEXCEPT", null); + lib.defineCMacro("ASIO_DISABLE_CO_AWAIT", null); + if (lib.optimize == .Debug) + lib.defineCMacro("ASIO_ENABLE_HANDLER_TRACKING", null); if (info.target.isWindows()) { + lib.defineCMacro("ASIO_DISABLE_STD_SYSTEM_ERROR", null); + lib.defineCMacro("ASIO_DISABLE_STD_EXCEPTION_PTR", null); + lib.defineCMacro("_WIN32_WINNT", "0x0A00"); // Win 10 const libpthreads = windpthreads(b, info); lib.linkLibrary(libpthreads); for (libpthreads.include_dirs.items) |include| { lib.include_dirs.append(include) catch {}; } - lib.defineCMacro("_WIN32_WINDOWS", null); } lib.addIncludePath("include"); lib.addCSourceFile("src/asio_wrapper.cpp", &.{ "-Wall", "-Wextra", - "-Werror", + // "-Werror", + // "-Wpedantic", + "-std=c++14", }); lib.linkLibrary(libasio); for (libasio.include_dirs.items) |include| { From e6c063538e49109b83249a6132b893e9fc071c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matheus=20Catarino=20Fran=C3=A7a?= Date: Tue, 13 Jun 2023 13:55:33 -0300 Subject: [PATCH 2/2] remove thread to std::threads --- build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.zig b/build.zig index 58d6bc1..a9d4a5b 100644 --- a/build.zig +++ b/build.zig @@ -105,7 +105,7 @@ fn buildCAsio(b: *std.Build, info: BuildInfo) *std.Build.CompileStep { .optimize = info.optimize, }); lib.defineCMacro("ASIO_DISABLE_STD_FUTURE", null); - lib.defineCMacro("ASIO_DISABLE_THREADS", null); + lib.defineCMacro("ASIO_DISABLE_STD_THREAD", null); lib.defineCMacro("ASIO_HAS_PTHREADS", null); lib.defineCMacro("ASIO_HAS_NOEXCEPT", null); lib.defineCMacro("ASIO_DISABLE_CO_AWAIT", null);