mirror of
https://github.com/ZDoom/ZDRay.git
synced 2025-02-27 05:20:48 +00:00
Merge pull request #4 from madame-rachelle/gcc-fix
- fix building in GCC-10
This commit is contained in:
commit
69f17efa37
3 changed files with 5 additions and 0 deletions
|
@ -222,6 +222,9 @@ if( WIN32 )
|
|||
endif( CMAKE_COMPILER_IS_GNUCXX )
|
||||
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_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} ${REL_LINKER_FLAGS}" )
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "collision.h"
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <cfloat>
|
||||
#ifndef NO_SSE
|
||||
#include <immintrin.h>
|
||||
#endif
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <vector>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
|
||||
#include "framework/tarray.h"
|
||||
#include "lightmap/collision.h"
|
||||
|
|
Loading…
Reference in a new issue