diff options
| author | Andre Weissflog <floooh@gmail.com> | 2021-02-09 18:11:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 18:11:55 +0100 |
| commit | 9acfe8cf7b3597bfad39847a0daa564dad91b8ae (patch) | |
| tree | 1b4d2f7c36a29459774712edc0db2921539a4c1f | |
| parent | 16957726f71b9b8124b7e5f24c9ac145aaf60fc3 (diff) | |
| parent | 78061e2a9a5286b9fab19fd461dfd22c1f3c803c (diff) | |
Merge pull request #474 from spaceface777/remove-tcc-pragma-extpre-feb2021-api-changes
Fix #pragma compilation with tcc on windows
| -rw-r--r-- | sokol_app.h | 18 | ||||
| -rw-r--r-- | sokol_audio.h | 8 | ||||
| -rw-r--r-- | sokol_gfx.h | 12 |
3 files changed, 19 insertions, 19 deletions
diff --git a/sokol_app.h b/sokol_app.h index 1f2b3a8e..893049a0 100644 --- a/sokol_app.h +++ b/sokol_app.h @@ -1455,16 +1455,16 @@ inline void sapp_run(const sapp_desc& desc) { return sapp_run(&desc); } #pragma comment (linker, "/subsystem:windows") #endif - #pragma comment (lib, "kernel32.lib") - #pragma comment (lib, "user32.lib") - #pragma comment (lib, "shell32.lib") /* CommandLineToArgvW, DragQueryFileW, DragFinished */ + #pragma comment (lib, "kernel32") + #pragma comment (lib, "user32") + #pragma comment (lib, "shell32") /* CommandLineToArgvW, DragQueryFileW, DragFinished */ #if defined(SOKOL_D3D11) - #pragma comment (lib, "dxgi.lib") - #pragma comment (lib, "d3d11.lib") - #pragma comment (lib, "dxguid.lib") + #pragma comment (lib, "dxgi") + #pragma comment (lib, "d3d11") + #pragma comment (lib, "dxguid") #endif #if defined(SOKOL_GLCORE33) - #pragma comment (lib, "gdi32.lib") + #pragma comment (lib, "gdi32") #endif #if defined(SOKOL_D3D11) @@ -1508,8 +1508,8 @@ inline void sapp_run(const sapp_desc& desc) { return sapp_run(&desc); } #include <d3d11_3.h> #include <DirectXMath.h> - #pragma comment (lib, "WindowsApp.lib") - #pragma comment (lib, "dxguid.lib") + #pragma comment (lib, "WindowsApp") + #pragma comment (lib, "dxguid") #elif defined(_SAPP_ANDROID) #include <pthread.h> #include <unistd.h> diff --git a/sokol_audio.h b/sokol_audio.h index 8a6f8db7..2e02ae8a 100644 --- a/sokol_audio.h +++ b/sokol_audio.h @@ -495,12 +495,12 @@ inline void saudio_setup(const saudio_desc& desc) { return saudio_setup(&desc); #include <synchapi.h> #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/sokol_gfx.h b/sokol_gfx.h index 63f2e0af..139c3aeb 100644 --- a/sokol_gfx.h +++ b/sokol_gfx.h @@ -2565,13 +2565,13 @@ inline void sg_init_pass(sg_pass pass_id, const sg_pass_desc& desc) { return sg_ #include <d3dcompiler.h> #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, "kernel32.lib") - #pragma comment (lib, "user32.lib") - #pragma comment (lib, "dxgi.lib") - #pragma comment (lib, "d3d11.lib") - #pragma comment (lib, "dxguid.lib") + #pragma comment (lib, "kernel32") + #pragma comment (lib, "user32") + #pragma comment (lib, "dxgi") + #pragma comment (lib, "d3d11") + #pragma comment (lib, "dxguid") #endif #endif #elif defined(SOKOL_METAL) |