diff --git a/premake/bgfx.lua b/premake/bgfx.lua index dc1a98e2..c45f95c0 100644 --- a/premake/bgfx.lua +++ b/premake/bgfx.lua @@ -21,11 +21,15 @@ project "bgfx" "BGFX_CONFIG_DEBUG=1", } + configuration { "windows" } + includedirs { + "$(DXSDK_DIR)/include", + } + configuration {} includedirs { BGFX_DIR .. "include", - "$(DXSDK_DIR)/include", } files { @@ -34,4 +38,8 @@ project "bgfx" BGFX_DIR .. "src/**.h", } + excludes { + BGFX_DIR .. "src/**.bin.h", + } + -- copyLib() diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 477cfaa7..ec740b93 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -59,22 +59,22 @@ // http://developer.download.nvidia.com/opengl/specs/GL_NVX_gpu_memory_info.txt # ifndef GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX -# define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 -# endif // GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX - -# ifndef GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX -# define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048 -# endif // GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX - -# ifndef GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX -# define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049 -# endif // GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX - -# ifndef GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX -# define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A -# endif // GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX - -# ifndef GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX +# define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 +# endif // GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX + +# ifndef GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX +# define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048 +# endif // GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX + +# ifndef GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX +# define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049 +# endif // GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX + +# ifndef GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX +# define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A +# endif // GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX + +# ifndef GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX # define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B # endif // GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX