diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-25 09:20:06 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-25 09:20:06 +0200 |
| commit | c7532ed82f57e4281d3f5ecded59a95a4f756b04 (patch) | |
| tree | 843a6e50a5934980ed50b40c2c2e792a09e2e0ef | |
| parent | 07198741023a62243f769bcd92aa2a168e884fe7 (diff) | |
tracker/rs: disable nodefaultlib. we're using /MT globally now for msvc.
| -rw-r--r-- | tracker-rs/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tracker-rs/rs_impl/bin/amd64/rs-impl.lib | bin | 19184 -> 19184 bytes | |||
| -rw-r--r-- | tracker-rs/rs_impl/bin/ia32/rs-impl.lib | bin | 12906 -> 12906 bytes |
3 files changed, 0 insertions, 3 deletions
diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt index 7152cb48..eb64feb1 100644 --- a/tracker-rs/CMakeLists.txt +++ b/tracker-rs/CMakeLists.txt @@ -5,9 +5,6 @@ if(WIN32) else() set(subdir ia32) endif() - if(MSVC) - set_property(TARGET opentrack-tracker-rs APPEND_STRING PROPERTY LINK_FLAGS "/NODEFAULTLIB:LIBCMT.lib") - endif() set(libpath "${CMAKE_SOURCE_DIR}/tracker-rs/rs_impl/bin/${subdir}/rs-impl.lib") add_custom_target(opentrack-tracker-rs-impl DEPENDS ${libpath}) add_dependencies(opentrack-tracker-rs opentrack-tracker-rs-impl) diff --git a/tracker-rs/rs_impl/bin/amd64/rs-impl.lib b/tracker-rs/rs_impl/bin/amd64/rs-impl.lib Binary files differindex e421f5a2..755e4dfb 100644 --- a/tracker-rs/rs_impl/bin/amd64/rs-impl.lib +++ b/tracker-rs/rs_impl/bin/amd64/rs-impl.lib diff --git a/tracker-rs/rs_impl/bin/ia32/rs-impl.lib b/tracker-rs/rs_impl/bin/ia32/rs-impl.lib Binary files differindex ebb64498..ce074cf6 100644 --- a/tracker-rs/rs_impl/bin/ia32/rs-impl.lib +++ b/tracker-rs/rs_impl/bin/ia32/rs-impl.lib |