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

Support compilation via MinGW

Browse Source 
Change-Id: Ie52f0b1b2b20948c6f4b3cb5474537d36a5a3385
This commit is contained in:
David Neto 2016-02-28 23:32:44 -05:00
parent 2de792c574
commit ed5fd5d846
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/MachineIndependent/PoolAlloc.cpp
View File

@ -32,8 +32,8 @@
//POSSIBILITY OF SUCH DAMAGE. //POSSIBILITY OF SUCH DAMAGE.
// //
#include "../Include/PoolAlloc.h"
#include "../Include/Common.h" #include "../Include/Common.h"
#include "../Include/PoolAlloc.h"
#include "../Include/InitializeGlobals.h" #include "../Include/InitializeGlobals.h"
#include "../OSDependent/osinclude.h" #include "../OSDependent/osinclude.h"

2
glslang/MachineIndependent/intermOut.cpp
View File

@ -48,7 +48,7 @@ namespace {
bool is_positive_infinity(double x) { bool is_positive_infinity(double x) {
#ifdef _MSC_VER #ifdef _MSC_VER
return _fpclass(x) == _FPCLASS_PINF; return _fpclass(x) == _FPCLASS_PINF;
#elif defined __ANDROID__ || defined __linux__ #elif defined __ANDROID__ || defined __linux__ || __MINGW32__ || __MINGW64__
return std::isinf(x) && (x >= 0); return std::isinf(x) && (x >= 0);
#else #else
return isinf(x) && (x >= 0); return isinf(x) && (x >= 0);

6
glslang/OSDependent/Windows/CMakeLists.txt
View File

@ -4,6 +4,12 @@ set(SOURCES ossource.cpp ../osinclude.h)
add_library(OSDependent STATIC ${SOURCES}) add_library(OSDependent STATIC ${SOURCES})
# MinGW GCC complains about function pointer casts to void*.
# Turn that off with -fpermissive.
if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
target_compile_options(OSDependent PRIVATE -fpermissive)
endif()
if(WIN32) if(WIN32)
source_group("Source" FILES ${SOURCES}) source_group("Source" FILES ${SOURCES})
endif(WIN32) endif(WIN32)