This commit is contained in:
Бранимир Караџић 2020-04-10 21:11:18 -07:00
parent cb604eb1fe
commit b3d1460368
3 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/ */
#include <bx/macros.h> #include <bx/bx.h>
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC
# define generic GenericFromFreeType // WinRT language extensions see "generic" as a keyword... this is stupid # define generic GenericFromFreeType // WinRT language extensions see "generic" as a keyword... this is stupid

View File

@ -23,7 +23,7 @@
#include "nanovg.h" #include "nanovg.h"
#include <bx/macros.h> #include <bx/bx.h>
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4701) // error C4701: potentially uninitialized local variable 'cint' used
// -Wunused-function and 4505 must be file scope, can't be disabled between push/pop. // -Wunused-function and 4505 must be file scope, can't be disabled between push/pop.

View File

@ -6,7 +6,7 @@
#ifndef BGFX_EMBEDDED_SHADER_H_HEADER_GUARD #ifndef BGFX_EMBEDDED_SHADER_H_HEADER_GUARD
#define BGFX_EMBEDDED_SHADER_H_HEADER_GUARD #define BGFX_EMBEDDED_SHADER_H_HEADER_GUARD
#include <bx/macros.h> #include <bx/bx.h>
#include "bgfx.h" #include "bgfx.h"
#define BGFX_EMBEDDED_SHADER_DXBC(...) #define BGFX_EMBEDDED_SHADER_DXBC(...)