Skip to content

Commit aef0032

Browse files
committed
CMake: remove _SECURE_SCL define from build
1 parent 68d66a8 commit aef0032

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

src/xrPhysics/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ list(APPEND ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEn
2121
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
2222
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
2323

24-
add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
24+
add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE)
2525
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2626

2727
set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "StdAfx.h")

src/xrSound/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda
2424
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_streamsnd.h")
2525
list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./MusicStream.h")
2626

27-
add_definitions(-DXRSOUND_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
27+
add_definitions(-DXRSOUND_EXPORTS -DdSINGLE)
2828
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
2929

3030
set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")

src/xrUICore/CMakeLists.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ file(GLOB TRACK_BAR TrackBar/*.h TrackBar/*.cpp)
2525
file(GLOB WINDOWS Windows/*.h Windows/*.cpp)
2626
file(GLOB XML XML/*.h XML/*.cpp)
2727
set(GENERAL ui_base.cpp ui_base.h ui_defs.h uiabstract.h UIMessages.h)
28-
28+
2929
######################################################
3030

3131
source_group("arrow" FILES ${ARROW})
@@ -56,36 +56,36 @@ source_group("" FILES ${GENERAL})
5656

5757
##########################################
5858

59-
message("path " ${CMAKE_CURRENT_SOURCE_DIR})
59+
message("path " ${CMAKE_CURRENT_SOURCE_DIR})
6060

61-
add_definitions(-DXRUICORE_EXPORTS -D_SECURE_SCL=0)
61+
add_definitions(-DXRUICORE_EXPORTS)
6262

6363
if (WIN32)
64-
add_compile_options(/fp:fast "/Yupch.hpp")
65-
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES COMPILE_FLAGS /Yc)
64+
add_compile_options(/fp:fast "/Yupch.hpp")
65+
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES COMPILE_FLAGS /Yc)
6666
endif()
6767

6868
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
69-
set(LUAJIT_LIBRARIES luajit-debug)
69+
set(LUAJIT_LIBRARIES luajit-debug)
7070
else()
71-
set(LUAJIT_LIBRARIES luajit)
71+
set(LUAJIT_LIBRARIES luajit)
7272
endif()
7373

7474
add_library(xrUICore SHARED ${ARROW} ${BUTTONS} ${CALLBACKS}
75-
${COMBO_BOX} ${CURSOR}
76-
${EDIT_BOX} ${FONT_MANAGER} ${HINT}
77-
${INTERACTIVE_BACKGROUND} ${LINES} ${LIST_BOX}
78-
${MESSAGE_BOX} ${OPTIONS} ${PCH}
79-
${PROGRESS_BAR} ${PROPERTIES_BOX} ${SCROLL_BAR} ${SCROLL_VIEW} ${SPIN_BOX}
80-
${STATIC_WINDS} ${TAB_CONTROL} ${TRACK_BAR} ${WINDOWS} ${XML}
81-
${GENERAL})
75+
${COMBO_BOX} ${CURSOR}
76+
${EDIT_BOX} ${FONT_MANAGER} ${HINT}
77+
${INTERACTIVE_BACKGROUND} ${LINES} ${LIST_BOX}
78+
${MESSAGE_BOX} ${OPTIONS} ${PCH}
79+
${PROGRESS_BAR} ${PROPERTIES_BOX} ${SCROLL_BAR} ${SCROLL_VIEW} ${SPIN_BOX}
80+
${STATIC_WINDS} ${TAB_CONTROL} ${TRACK_BAR} ${WINDOWS} ${XML}
81+
${GENERAL})
8282

8383
set_target_properties(xrUICore PROPERTIES PREFIX "")
8484
target_include_directories(xrUICore PRIVATE
85-
${CMAKE_CURRENT_SOURCE_DIR}
86-
${CMAKE_CURRENT_SOURCE_DIR}/../
87-
../../Externals/lzo/include
88-
../../Externals/luabind
89-
${SDL_INCLUDE_DIRS})
85+
${CMAKE_CURRENT_SOURCE_DIR}
86+
${CMAKE_CURRENT_SOURCE_DIR}/../
87+
../../Externals/lzo/include
88+
../../Externals/luabind
89+
${SDL_INCLUDE_DIRS})
9090
target_link_libraries(xrUICore xrAPI pugixml xrScriptEngine ${LUAJIT_LIBRARIES} xrEngine xrMiscMath xrCore luabind ${SDL_LIBRARIES})
9191
xr_install(${PROJECT_NAME})

0 commit comments

Comments
 (0)