[*] conflicts resolved
Showing
- .gitignore 7 additions, 1 deletion.gitignore
- 3rdparty/cuttdb/CMakeLists.txt 1 addition, 1 deletion3rdparty/cuttdb/CMakeLists.txt
- 3rdparty/json-c-darwin/CMakeLists.txt 1 addition, 1 deletion3rdparty/json-c-darwin/CMakeLists.txt
- 3rdparty/json-c/CMakeLists.txt 1 addition, 1 deletion3rdparty/json-c/CMakeLists.txt
- 3rdparty/libmagic-darwin/CMakeLists.txt 1 addition, 1 deletion3rdparty/libmagic-darwin/CMakeLists.txt
- 3rdparty/libmagic/CMakeLists.txt 1 addition, 1 deletion3rdparty/libmagic/CMakeLists.txt
- 3rdparty/wolfssl/CMakeLists.txt 1 addition, 1 deletion3rdparty/wolfssl/CMakeLists.txt
- CMakeLists.txt 76 additions, 11 deletionsCMakeLists.txt
- cmake/OS_Detection.cmake 6 additions, 4 deletionscmake/OS_Detection.cmake
- dap-sdk/core/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/CMakeLists.txt
- dap-sdk/core/include/dap_common.h 2 additions, 2 deletionsdap-sdk/core/include/dap_common.h
- dap-sdk/core/include/dap_math_ops.h 837 additions, 3 deletionsdap-sdk/core/include/dap_math_ops.h
- dap-sdk/core/include/dap_module.h 1 addition, 1 deletiondap-sdk/core/include/dap_module.h
- dap-sdk/core/libdap.pri 7 additions, 1 deletiondap-sdk/core/libdap.pri
- dap-sdk/core/src/android/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/src/android/CMakeLists.txt
- dap-sdk/core/src/dap_file_utils.c 2 additions, 2 deletionsdap-sdk/core/src/dap_file_utils.c
- dap-sdk/core/src/darwin/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/src/darwin/CMakeLists.txt
- dap-sdk/core/src/unix/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/src/unix/CMakeLists.txt
- dap-sdk/core/src/win32/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/src/win32/CMakeLists.txt
- dap-sdk/core/test/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/test/CMakeLists.txt
Loading
Please register or sign in to comment