Cleaning up some /W4 errors.
This commit is contained in:
parent
e0eb85bbbc
commit
4128727f6b
|
@ -69,9 +69,12 @@ filter("platforms:Windows")
|
||||||
-- Ignores complaints about empty obj files:
|
-- Ignores complaints about empty obj files:
|
||||||
linkoptions({"/ignore:4006", "/ignore:4221"})
|
linkoptions({"/ignore:4006", "/ignore:4221"})
|
||||||
-- Enable multiprocessor compiles (requires Minimal Rebuild to be disabled).
|
-- Enable multiprocessor compiles (requires Minimal Rebuild to be disabled).
|
||||||
buildoptions({"/MP"})
|
buildoptions({
|
||||||
|
"/MP", -- Multiprocessor compilation.
|
||||||
|
"/wd4100", -- Unreferenced parameters are ok.
|
||||||
|
})
|
||||||
flags({
|
flags({
|
||||||
"NoMinimalRebuild",
|
"NoMinimalRebuild", -- Required for /MP above.
|
||||||
})
|
})
|
||||||
defines({
|
defines({
|
||||||
"_CRT_NONSTDC_NO_DEPRECATE",
|
"_CRT_NONSTDC_NO_DEPRECATE",
|
||||||
|
|
|
@ -162,7 +162,7 @@ void main() { \n\
|
||||||
glEnableVertexArrayAttrib(vao_, 1);
|
glEnableVertexArrayAttrib(vao_, 1);
|
||||||
glVertexArrayAttribBinding(vao_, 1, 0);
|
glVertexArrayAttribBinding(vao_, 1, 0);
|
||||||
glVertexArrayAttribFormat(vao_, 1, 4, GL_UNSIGNED_BYTE, GL_TRUE,
|
glVertexArrayAttribFormat(vao_, 1, 4, GL_UNSIGNED_BYTE, GL_TRUE,
|
||||||
offsetof(Vertex, col));
|
offsetof(Vertex, color));
|
||||||
glEnableVertexArrayAttrib(vao_, 2);
|
glEnableVertexArrayAttrib(vao_, 2);
|
||||||
glVertexArrayAttribBinding(vao_, 2, 0);
|
glVertexArrayAttribBinding(vao_, 2, 0);
|
||||||
glVertexArrayAttribFormat(vao_, 2, 2, GL_FLOAT, GL_FALSE,
|
glVertexArrayAttribFormat(vao_, 2, 2, GL_FLOAT, GL_FALSE,
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1f7de4d3c4cbbae1d8cff5a713b4f75dd3088ec4
|
Subproject commit 187fb988e015576f840d47f6722b094d1d8cd7e8
|
9
xb.bat
9
xb.bat
|
@ -671,6 +671,15 @@ IF %ALL% NEQ 1 (
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
POPD
|
POPD
|
||||||
|
PUSHD third_party\elemental-forms\src
|
||||||
|
FOR /R %%G in (*.cc *.c *.h *.inl) DO (
|
||||||
|
ECHO ^> clang-format %%G
|
||||||
|
CMD /C %CLANG_FORMAT% -i -style=file %%G
|
||||||
|
IF !ERRORLEVEL! NEQ 0 (
|
||||||
|
SET ANY_ERRORS=1
|
||||||
|
)
|
||||||
|
)
|
||||||
|
POPD
|
||||||
)
|
)
|
||||||
IF %ANY_ERRORS% NEQ 0 (
|
IF %ANY_ERRORS% NEQ 0 (
|
||||||
ECHO.
|
ECHO.
|
||||||
|
|
Loading…
Reference in New Issue