• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8959 (tree)
Time2020-10-18 00:55:59
Authorzmatsuo

Log Message

cJSON.c を VS2005 でビルドできるよう修正

- NAN の扱いで VS2005 でエラーが出る
- とりあえず 0 を返すようにしてエラーを回避

Change Summary

Incremental Difference

--- trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 8958)
+++ trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 8959)
@@ -39,8 +39,18 @@
3939 target_compile_definitions(
4040 TTXCheckUpdate
4141 PRIVATE
42- -D CJSON_HIDE_SYMBOLS)
42+ -D CJSON_HIDE_SYMBOLS
43+ )
4344
45+if(MSVC_VERSION STREQUAL 1400)
46+ # VS2005 special define
47+ set_source_files_properties(
48+ ../../libs/cJSON/cJSON.c
49+ PROPERTIES
50+ COMPILE_FLAGS "-D NAN=0"
51+ )
52+endif()
53+
4454 target_include_directories(
4555 TTXCheckUpdate
4656 PRIVATE
Show on old repository browser