zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2025-02-27 13:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4 from madame-rachelle/gcc-fix

Browse source 
- fix building in GCC-10
This commit is contained in:
Magnus Norddahl 2021-09-25 12:50:28 +02:00 committed by GitHub
commit 69f17efa37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -222,6 +222,9 @@ if( WIN32 )
endif( CMAKE_COMPILER_IS_GNUCXX ) endif( CMAKE_COMPILER_IS_GNUCXX )
endif( WIN32 ) endif( WIN32 )
if( CMAKE_COMPILER_IS_GNUCXX )
set( ZDRAY_LIBS "${ZLIB_LIBRARIES}" pthread )
endif( CMAKE_COMPILER_IS_GNUCXX )
set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${REL_LINKER_FLAGS}" ) set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${REL_LINKER_FLAGS}" )
set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${REL_LINKER_FLAGS}" ) set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${REL_LINKER_FLAGS}" )

1
src/lightmap/collision.cpp
View file

@ -23,6 +23,7 @@
#include "collision.h" #include "collision.h"
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <cfloat>
#ifndef NO_SSE #ifndef NO_SSE
#include <immintrin.h> #include <immintrin.h>
#endif #endif

1
src/lightmap/surfaces.h
View file

@ -30,6 +30,7 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <string> #include <string>
#include <cstring>
#include "framework/tarray.h" #include "framework/tarray.h"
#include "lightmap/collision.h" #include "lightmap/collision.h"