From 4152c704f351adbf43b9e256367be455478e75fe Mon Sep 17 00:00:00 2001 From: spaceface Date: Tue, 9 Feb 2021 10:36:01 +0100 Subject: [PATCH] sokol: remove `.lib` extensions in `#pragma` directives (#8639) fixes tcc on windows - this kind of fix has been done several times in the past, and should probably be upstreamed to sokol soon to prevent things from breaking every time we update the headers. --- thirdparty/sokol/sokol_audio.h | 8 ++++---- thirdparty/sokol/sokol_gfx.h | 10 +++++----- vlib/v/gen/c/cheaders.v | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/thirdparty/sokol/sokol_audio.h b/thirdparty/sokol/sokol_audio.h index baf74eaf31..22b8ebd998 100644 --- a/thirdparty/sokol/sokol_audio.h +++ b/thirdparty/sokol/sokol_audio.h @@ -487,12 +487,12 @@ inline void saudio_setup(const saudio_desc& desc) { return saudio_setup(&desc); #include #if (defined(WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) #define SOKOL_WIN32_NO_MMDEVICE - #pragma comment (lib, "WindowsApp.lib") + #pragma comment (lib, "WindowsApp") #else - #pragma comment (lib, "kernel32.lib") - #pragma comment (lib, "ole32.lib") + #pragma comment (lib, "kernel32") + #pragma comment (lib, "ole32") #if defined(SOKOL_WIN32_NO_MMDEVICE) - #pragma comment (lib, "mmdevapi.lib") + #pragma comment (lib, "mmdevapi") #endif #endif #endif diff --git a/thirdparty/sokol/sokol_gfx.h b/thirdparty/sokol/sokol_gfx.h index 3ca8eb72fa..bbeb80cd08 100644 --- a/thirdparty/sokol/sokol_gfx.h +++ b/thirdparty/sokol/sokol_gfx.h @@ -2538,12 +2538,12 @@ inline void sg_init_pass(sg_pass pass_id, const sg_pass_desc& desc) { return sg_ #include #ifdef _MSC_VER #if (defined(WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) - #pragma comment (lib, "WindowsApp.lib") + #pragma comment (lib, "WindowsApp") #else - #pragma comment (lib, "user32.lib") - #pragma comment (lib, "dxgi.lib") - #pragma comment (lib, "d3d11.lib") - #pragma comment (lib, "dxguid.lib") + #pragma comment (lib, "user32") + #pragma comment (lib, "dxgi") + #pragma comment (lib, "d3d11") + #pragma comment (lib, "dxguid") #endif #endif #elif defined(SOKOL_METAL) diff --git a/vlib/v/gen/c/cheaders.v b/vlib/v/gen/c/cheaders.v index 8ff0392fc2..e4aac76505 100644 --- a/vlib/v/gen/c/cheaders.v +++ b/vlib/v/gen/c/cheaders.v @@ -277,7 +277,7 @@ $c_common_macros #define __IRQHANDLER __declspec(naked) #include - #pragma comment(lib, "Dbghelp.lib") + #pragma comment(lib, "Dbghelp") extern wchar_t **_wenviron; #elif !defined(SRWLOCK_INIT)