- Linux compile fixes.

This commit is contained in:
Christoph Oelckers 2020-04-19 21:53:21 +02:00
parent e828710072
commit 4523ad5f7e
7 changed files with 9 additions and 7 deletions

View file

@ -901,7 +901,7 @@ use_precompiled_header(".")
add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE
${HEADER_FILES} ${HEADER_FILES}
${NOT_COMPILED_SOURCE_FILES} ${NOT_COMPILED_SOURCE_FILES}
common/objects/__autostart.cpp __autostart.cpp
${SYSTEM_SOURCES} ${SYSTEM_SOURCES}
${FASTMATH_SOURCES} ${FASTMATH_SOURCES}
${PCH_SOURCES} ${PCH_SOURCES}
@ -927,7 +927,7 @@ add_executable( ${PROJECT_NAME} WIN32 MACOSX_BUNDLE
common/thirdparty/math/tan.c common/thirdparty/math/tan.c
common/thirdparty/math/tanh.c common/thirdparty/math/tanh.c
common/thirdparty/math/fastsin.cpp common/thirdparty/math/fastsin.cpp
common/objects/zzautozend.cpp zzautozend.cpp
) )
#set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${DEM_FASTMATH_FLAG} ) #set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${DEM_FASTMATH_FLAG} )
@ -1115,8 +1115,8 @@ source_group("Common\\Scripting\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_S
source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+") source_group("Common\\Scripting\\Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/core/.+")
source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+") source_group("Common\\Scripting\\JIT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/jit/.+")
source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+") source_group("Common\\Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/scripting/vm/.+")
source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/.+") source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+")
source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl_load/.+") source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+") source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+")
source_group("Common\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats.+") source_group("Common\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats.+")
source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+") source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")

View file

@ -2066,6 +2066,7 @@ FSoundChan *OpenALSoundRenderer::FindLowestChannel()
return lowest; return lowest;
} }
#endif // NO_OPENAL
#include "menu/menu.h" #include "menu/menu.h"
@ -2121,4 +2122,3 @@ void I_BuildALResamplersList(FOptionValues* opt)
#endif #endif
} }
#endif // NO_OPENAL

View file

@ -37,7 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include "basics.h" #include "basics.h"
#include "SFMT/SFMTObj.h" #include "sfmt/SFMTObj.h"
class FSerializer; class FSerializer;

View file

@ -36,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <type_traits> #include <type_traits>
#include "m_alloc.h"
#include "vectors.h" #include "vectors.h"
#include "name.h" #include "name.h"
#include "palentry.h" #include "palentry.h"

View file

@ -5,6 +5,8 @@
#error You must #include "dobject.h" to get dobjtype.h #error You must #include "dobject.h" to get dobjtype.h
#endif #endif
#include <limits.h>
typedef std::pair<const class PType *, unsigned> FTypeAndOffset; typedef std::pair<const class PType *, unsigned> FTypeAndOffset;
#if 0 #if 0