diff --git a/scripts/bgfx.lua b/scripts/bgfx.lua index 17086db24..8c196d5b7 100644 --- a/scripts/bgfx.lua +++ b/scripts/bgfx.lua @@ -58,14 +58,6 @@ function bgfxProject(_name, _kind, _defines) } end - if (_OPTIONS["vs"] == "vs2012-xp") - or (_OPTIONS["vs"] == "vs2013-xp") then - configuration { "vs201*" } - includedirs { - "$(DXSDK_DIR)/include", - } - end - configuration { "Debug" } defines { "BGFX_CONFIG_DEBUG=1", diff --git a/scripts/example-common.lua b/scripts/example-common.lua index 94aa9d5cc..5a5dd7ce0 100644 --- a/scripts/example-common.lua +++ b/scripts/example-common.lua @@ -61,16 +61,10 @@ project ("example-common") } end - configuration { "vs2008" } - includedirs { - "$(DXSDK_DIR)/include", + configuration { "osx or ios*" } + files { + path.join(BGFX_DIR, "examples/common/**.mm"), } - if (_OPTIONS["vs"] == "vs2012-xp") or (_OPTIONS["vs"] == "vs2013-xp") then - configuration { "vs201*" } - includedirs { - "$(DXSDK_DIR)/include", - } - end configuration { "winphone8* or winstore8*"} linkoptions { diff --git a/scripts/genie.lua b/scripts/genie.lua index 92705b12e..90beb31a4 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -305,9 +305,6 @@ function exampleProject(_name) } configuration { "osx" } - files { - path.join(BGFX_DIR, "examples/common/**.mm"), - } links { "Cocoa.framework", "OpenGL.framework", @@ -315,9 +312,6 @@ function exampleProject(_name) configuration { "ios*" } kind "ConsoleApp" - files { - path.join(BGFX_DIR, "examples/common/**.mm"), - } linkoptions { "-framework CoreFoundation", "-framework Foundation", diff --git a/scripts/shaderc.lua b/scripts/shaderc.lua index 5f6d4e4fd..2824477af 100644 --- a/scripts/shaderc.lua +++ b/scripts/shaderc.lua @@ -55,12 +55,6 @@ project "shaderc" path.join(GLSL_OPTIMIZER, "include/c99"), } - configuration { "vs*" } - includedirs { - "$(DXSDK_DIR)/include", - } - - configuration { "vs* or mingw*" } links { "d3dcompiler", diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 8a3063142..b1fc94b99 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -233,6 +233,30 @@ typedef uint64_t GLuint64; # define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B #endif // GL_UNSIGNED_INT_10F_11F_11F_REV +#ifndef GL_R8_SNORM +# define GL_R8_SNORM 0x8F94 +#endif // GL_R8_SNORM + +#ifndef GL_RG8_SNORM +# define GL_RG8_SNORM 0x8F95 +#endif // GL_RG8_SNORM + +#ifndef GL_RGBA8_SNORM +# define GL_RGBA8_SNORM 0x8F97 +#endif // GL_RGBA8_SNORM + +#ifndef GL_R16_SNORM +# define GL_R16_SNORM 0x8F98 +#endif // GL_R16_SNORM + +#ifndef GL_RG16_SNORM +# define GL_RG16_SNORM 0x8F99 +#endif // GL_RG16_SNORM + +#ifndef GL_RGBA16_SNORM +# define GL_RGBA16_SNORM 0x8F9B +#endif // GL_RGBA16_SNORM + #ifndef GL_COMPRESSED_RGB_S3TC_DXT1_EXT # define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 #endif // GL_COMPRESSED_RGB_S3TC_DXT1_EXT