- moved c_console.cpp to 'common'.

This commit is contained in:
Christoph Oelckers 2020-10-25 13:26:40 +01:00
parent 8d3585afe1
commit 74df8f55da
2 changed files with 7 additions and 3 deletions

View file

@ -294,7 +294,7 @@ if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" ) set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
endif() endif()
if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" ) if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" )
set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" )
endif() endif()
@ -313,7 +313,7 @@ if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
endif () endif ()
if( NOT X64 AND NOT CAN_DO_MFPMATH ) if( NOT X64 AND NOT CAN_DO_MFPMATH )
set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" ) set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" )
endif() endif()
@ -333,6 +333,10 @@ if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ljemalloc")
endif()
if( NOT NO_STRIP ) if( NOT NO_STRIP )
set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s" ) set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s" )
@ -805,7 +809,6 @@ set (PCH_SOURCES
core/statusbar.cpp core/statusbar.cpp
core/gi.cpp core/gi.cpp
core/console/c_console.cpp
core/console/c_notifybuffer.cpp core/console/c_notifybuffer.cpp
core/console/d_event.cpp core/console/d_event.cpp
@ -879,6 +882,7 @@ set (PCH_SOURCES
common/console/c_cvars.cpp common/console/c_cvars.cpp
common/console/c_dispatch.cpp common/console/c_dispatch.cpp
common/console/c_commandbuffer.cpp common/console/c_commandbuffer.cpp
common/console/c_console.cpp
common/console/c_notifybufferbase.cpp common/console/c_notifybufferbase.cpp
common/console/c_tabcomplete.cpp common/console/c_tabcomplete.cpp
common/console/c_expr.cpp common/console/c_expr.cpp