1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

ASSume that MSVC is the only compiler who uses the __declspec() syntax

This commit is contained in:
2014-05-24 19:25:43 -07:00
parent 688852e658
commit e331cbd4f7
4 changed files with 1 additions and 8 deletions

View File

@ -145,7 +145,7 @@ typedef uint32_t hsGSeedValue;
# define hsDeprecated(message) [[deprecated(message)]] # define hsDeprecated(message) [[deprecated(message)]]
#elif defined(HAVE_GCC_DEPRECATED_ATTR) #elif defined(HAVE_GCC_DEPRECATED_ATTR)
# define hsDeprecated(message) __attribute__((deprecated(message))) # define hsDeprecated(message) __attribute__((deprecated(message)))
#elif defined(HAVE_MSVC_DEPRECATED_ATTR) #elif defined(_MSC_VER)
# define hsDeprecated(message) __declspec(deprecated(message)) # define hsDeprecated(message) __declspec(deprecated(message))
#else #else
# define hsDeprecated(message) # define hsDeprecated(message)

View File

@ -47,10 +47,6 @@ try_compile(HAVE_GCC_DEPRECATED_ATTR ${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/cmake/check_deprecated_attribute.cpp ${PROJECT_SOURCE_DIR}/cmake/check_deprecated_attribute.cpp
COMPILE_DEFINITIONS -DTRY_GCC_ATTR COMPILE_DEFINITIONS -DTRY_GCC_ATTR
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
try_compile(HAVE_MSVC_DEPRECATED_ATTR ${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/cmake/check_deprecated_attribute.cpp
COMPILE_DEFINITIONS -DTRY_MSVC_ATTR
OUTPUT_VARIABLE OUTPUT)
configure_file(${PROJECT_SOURCE_DIR}/cmake/hsCompilerSpecific.h.cmake configure_file(${PROJECT_SOURCE_DIR}/cmake/hsCompilerSpecific.h.cmake
${PROJECT_BINARY_DIR}/hsCompilerSpecific.h) ${PROJECT_BINARY_DIR}/hsCompilerSpecific.h)

View File

@ -4,8 +4,6 @@
[[deprecated("derp_func is deprecated -- use func instead")]] [[deprecated("derp_func is deprecated -- use func instead")]]
#elif defined(TRY_GCC_ATTR) #elif defined(TRY_GCC_ATTR)
__attribute__((deprecated("derp_func is deprecated -- use func instead"))) __attribute__((deprecated("derp_func is deprecated -- use func instead")))
#elif defined(TRY_MSVC_ATTR)
__declspec(deprecated("derp_func is deprecated -- use func instead"))
#else #else
# error "DERP" # error "DERP"
#endif #endif

View File

@ -50,6 +50,5 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#cmakedefine HAVE_CXX14_DEPRECATED_ATTR #cmakedefine HAVE_CXX14_DEPRECATED_ATTR
#cmakedefine HAVE_GCC_DEPRECATED_ATTR #cmakedefine HAVE_GCC_DEPRECATED_ATTR
#cmakedefine HAVE_MSVC_DEPRECATED_ATTR
#endif #endif