From aef00326d32f5b66e9290b416b78d2d8409453dc Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Tue, 23 Oct 2018 23:39:00 +0300 Subject: [PATCH] CMake: remove _SECURE_SCL define from build --- src/xrPhysics/CMakeLists.txt | 2 +- src/xrSound/CMakeLists.txt | 2 +- src/xrUICore/CMakeLists.txt | 38 ++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt index fb096941bc9..ad64b87adc3 100644 --- a/src/xrPhysics/CMakeLists.txt +++ b/src/xrPhysics/CMakeLists.txt @@ -21,7 +21,7 @@ list(APPEND ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEn list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp") #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h") -add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0) +add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE) add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "StdAfx.h") diff --git a/src/xrSound/CMakeLists.txt b/src/xrSound/CMakeLists.txt index 952af48038b..1cef114e612 100644 --- a/src/xrSound/CMakeLists.txt +++ b/src/xrSound/CMakeLists.txt @@ -24,7 +24,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_streamsnd.h") list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./MusicStream.h") -add_definitions(-DXRSOUND_EXPORTS -DdSINGLE -D_SECURE_SCL=0) +add_definitions(-DXRSOUND_EXPORTS -DdSINGLE) add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES}) set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h") diff --git a/src/xrUICore/CMakeLists.txt b/src/xrUICore/CMakeLists.txt index 5919cb3b360..935980c950d 100644 --- a/src/xrUICore/CMakeLists.txt +++ b/src/xrUICore/CMakeLists.txt @@ -25,7 +25,7 @@ file(GLOB TRACK_BAR TrackBar/*.h TrackBar/*.cpp) file(GLOB WINDOWS Windows/*.h Windows/*.cpp) file(GLOB XML XML/*.h XML/*.cpp) set(GENERAL ui_base.cpp ui_base.h ui_defs.h uiabstract.h UIMessages.h) - + ###################################################### source_group("arrow" FILES ${ARROW}) @@ -56,36 +56,36 @@ source_group("" FILES ${GENERAL}) ########################################## -message("path " ${CMAKE_CURRENT_SOURCE_DIR}) +message("path " ${CMAKE_CURRENT_SOURCE_DIR}) -add_definitions(-DXRUICORE_EXPORTS -D_SECURE_SCL=0) +add_definitions(-DXRUICORE_EXPORTS) if (WIN32) - add_compile_options(/fp:fast "/Yupch.hpp") - set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES COMPILE_FLAGS /Yc) + add_compile_options(/fp:fast "/Yupch.hpp") + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES COMPILE_FLAGS /Yc) endif() if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(LUAJIT_LIBRARIES luajit-debug) + set(LUAJIT_LIBRARIES luajit-debug) else() - set(LUAJIT_LIBRARIES luajit) + set(LUAJIT_LIBRARIES luajit) endif() add_library(xrUICore SHARED ${ARROW} ${BUTTONS} ${CALLBACKS} - ${COMBO_BOX} ${CURSOR} - ${EDIT_BOX} ${FONT_MANAGER} ${HINT} - ${INTERACTIVE_BACKGROUND} ${LINES} ${LIST_BOX} - ${MESSAGE_BOX} ${OPTIONS} ${PCH} - ${PROGRESS_BAR} ${PROPERTIES_BOX} ${SCROLL_BAR} ${SCROLL_VIEW} ${SPIN_BOX} - ${STATIC_WINDS} ${TAB_CONTROL} ${TRACK_BAR} ${WINDOWS} ${XML} - ${GENERAL}) + ${COMBO_BOX} ${CURSOR} + ${EDIT_BOX} ${FONT_MANAGER} ${HINT} + ${INTERACTIVE_BACKGROUND} ${LINES} ${LIST_BOX} + ${MESSAGE_BOX} ${OPTIONS} ${PCH} + ${PROGRESS_BAR} ${PROPERTIES_BOX} ${SCROLL_BAR} ${SCROLL_VIEW} ${SPIN_BOX} + ${STATIC_WINDS} ${TAB_CONTROL} ${TRACK_BAR} ${WINDOWS} ${XML} + ${GENERAL}) set_target_properties(xrUICore PROPERTIES PREFIX "") target_include_directories(xrUICore PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ../../Externals/lzo/include - ../../Externals/luabind - ${SDL_INCLUDE_DIRS}) + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ../../Externals/lzo/include + ../../Externals/luabind + ${SDL_INCLUDE_DIRS}) target_link_libraries(xrUICore xrAPI pugixml xrScriptEngine ${LUAJIT_LIBRARIES} xrEngine xrMiscMath xrCore luabind ${SDL_LIBRARIES}) xr_install(${PROJECT_NAME})