mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2015-08-27 22:25:23 -07:00
parent 0100107fc1 4583769681
commit 91c87e2149
5 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/bgfx.lua
View File

@ -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",

12
scripts/example-common.lua
View File

@ -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 {

6
scripts/genie.lua
View File

@ -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",

6
scripts/shaderc.lua
View File

@ -55,12 +55,6 @@ project "shaderc"
path.join(GLSL_OPTIMIZER, "include/c99"),
}
configuration { "vs*" }
includedirs {
"$(DXSDK_DIR)/include",
}
configuration { "vs* or mingw*" }
links {
"d3dcompiler",

24
src/renderer_gl.h
View File

@ -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