mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #565 from mre4ce/master

Browse Source 
Disabled MSVC 2015 compile warnings.
This commit is contained in:
John Kessenich 2016-10-25 00:16:12 -06:00 committed by GitHub
commit 0d628c179d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/GlslangToSpv.h
View File

@ -32,6 +32,10 @@
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE //ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
#if _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#endif
#include "../glslang/Include/intermediate.h" #include "../glslang/Include/intermediate.h"
#include <string> #include <string>

5
glslang/Include/intermediate.h
View File

@ -46,6 +46,11 @@
#ifndef __INTERMEDIATE_H #ifndef __INTERMEDIATE_H
#define __INTERMEDIATE_H #define __INTERMEDIATE_H
#if _MSC_VER >= 1900
#pragma warning(disable : 4464) // relative include path contains '..'
#pragma warning(disable : 5026) // 'glslang::TIntermUnary': move constructor was implicitly defined as deleted
#endif
#include "../Include/Common.h" #include "../Include/Common.h"
#include "../Include/Types.h" #include "../Include/Types.h"
#include "../Include/ConstantUnion.h" #include "../Include/ConstantUnion.h"