diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-01-15 09:38:08 +0300 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-15 09:38:08 +0300 |
commit | 6dce21882fa1c196ddd59ea950ee58f7695bcc78 (patch) | |
tree | 9bfb1f3d73fe3de7ada6d9bdf6ec61209e73fe86 /src/Native/Runtime/CMakeLists.txt | |
parent | c89a7e0f84ecf92978e330bf32505a4e81bd8a96 (diff) | |
parent | 4772f2aeb2070ea1ac40c5a6c4352afc6ad9b3d5 (diff) |
Merge branch 'nmirror' into nmirror-merge
Conflicts:
src/Native/Runtime/unix/PalRedhawkUnix.cpp
src/Native/gc/gc.cpp
Diffstat (limited to 'src/Native/Runtime/CMakeLists.txt')
-rw-r--r-- | src/Native/Runtime/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Native/Runtime/CMakeLists.txt b/src/Native/Runtime/CMakeLists.txt index af604f64c..981eb02ab 100644 --- a/src/Native/Runtime/CMakeLists.txt +++ b/src/Native/Runtime/CMakeLists.txt @@ -112,14 +112,12 @@ list(APPEND RUNTIME_SOURCES_ARCH_ASM convert_to_absolute_path(ARCH_SOURCES_DIR ${ARCH_SOURCES_DIR}) include_directories(${ARCH_SOURCES_DIR}) -add_definitions(-DAPP_LOCAL_RUNTIME) add_definitions(-DFEATURE_BACKGROUND_GC) add_definitions(-DFEATURE_BASICFREEZE) add_definitions(-DFEATURE_CONSERVATIVE_GC) add_definitions(-DFEATURE_CUSTOM_IMPORTS) add_definitions(-DFEATURE_DYNAMIC_CODE) add_compile_options($<$<CONFIG:Debug>:-DFEATURE_GC_STRESS>) -add_definitions(-DFEATURE_PROFILING) add_definitions(-DFEATURE_REDHAWK) add_definitions(-DVERIFY_HEAP) add_definitions(-DCORERT) |