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

A patch submitted for MinGW building.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@27757 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-08-18 19:42:35 +00:00
parent f51842e028
commit d6c72a44ab
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BIL/BilBuilder.cpp
View File

@ -33,6 +33,7 @@
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
#include <assert.h> #include <assert.h>
#include <stdio.h>
#include "BilBuilder.h" #include "BilBuilder.h"

6
StandAlone/StandAlone.cpp
View File

@ -887,7 +887,13 @@ int fopen_s(
char** ReadFileData(const char* fileName) char** ReadFileData(const char* fileName)
{ {
FILE *in; FILE *in;
#if defined(_WIN32) && defined(__GNUC__)
in = fopen(fileName, "r");
int errorCode = in ? 0 : 1;
#else
int errorCode = fopen_s(&in, fileName, "r"); int errorCode = fopen_s(&in, fileName, "r");
#endif
char *fdata; char *fdata;
int count = 0; int count = 0;
const int maxSourceStrings = 5; const int maxSourceStrings = 5;

4
glslang/Include/Common.h
View File

@ -37,7 +37,7 @@
#ifndef _COMMON_INCLUDED_ #ifndef _COMMON_INCLUDED_
#define _COMMON_INCLUDED_ #define _COMMON_INCLUDED_
#ifdef _WIN32 #if defined _WIN32 && !defined __GNUC__
#include <basetsd.h> #include <basetsd.h>
#define snprintf sprintf_s #define snprintf sprintf_s
#define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args)) #define safe_vsprintf(buf,max,format,args) vsnprintf_s((buf), (max), (max), (format), (args))
@ -166,7 +166,7 @@ inline const TString String(const int i, const int base = 10)
{ {
char text[16]; // 32 bit ints are at most 10 digits in base 10 char text[16]; // 32 bit ints are at most 10 digits in base 10
#ifdef _WIN32 #if defined _WIN32 && !defined __GNUC__
_itoa_s(i, text, base); _itoa_s(i, text, base);
#else #else
// we assume base 10 for all cases // we assume base 10 for all cases