Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
ed5fd5d8
Commit
ed5fd5d8
authored
Feb 28, 2016
by
David Neto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support compilation via MinGW
Change-Id: Ie52f0b1b2b20948c6f4b3cb5474537d36a5a3385
parent
2de792c5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
PoolAlloc.cpp
glslang/MachineIndependent/PoolAlloc.cpp
+1
-1
intermOut.cpp
glslang/MachineIndependent/intermOut.cpp
+1
-1
CMakeLists.txt
glslang/OSDependent/Windows/CMakeLists.txt
+6
-0
No files found.
glslang/MachineIndependent/PoolAlloc.cpp
View file @
ed5fd5d8
...
@@ -32,8 +32,8 @@
...
@@ -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"
...
...
glslang/MachineIndependent/intermOut.cpp
View file @
ed5fd5d8
...
@@ -48,7 +48,7 @@ namespace {
...
@@ -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
);
...
...
glslang/OSDependent/Windows/CMakeLists.txt
View file @
ed5fd5d8
...
@@ -4,6 +4,12 @@ set(SOURCES ossource.cpp ../osinclude.h)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment