diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-08 04:32:26 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:29:11 +0300 |
| commit | ffc8df5bc764c3ce34e938abd34943bcf61687fd (patch) | |
| tree | aac552bcc175c3926b6f0237c9714fa3d6bc291a /src/Native | |
| parent | 2c057e7ab0ad2ab1ff476094674a303a082960b9 (diff) | |
Switch to live CLI build
This reverts commit 374d1f1f2d901b4ef1096fbac2bb3da85e73949e.
This reverts commit 81fe8e5d944fdbe2560815f4aead1ab4a447fb5a.
This reverts commit 3d2d89e793d1588e1aa7d2273fc880ae208352f5.
This reverts commit a1f2ba2cae2dac1d134ae9afd60462cf57dde3c3.
Diffstat (limited to 'src/Native')
| -rw-r--r-- | src/Native/Bootstrap/main.cpp | 4 | ||||
| -rw-r--r-- | src/Native/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Native/Bootstrap/main.cpp b/src/Native/Bootstrap/main.cpp index 24a69b53c..1524fa7f9 100644 --- a/src/Native/Bootstrap/main.cpp +++ b/src/Native/Bootstrap/main.cpp @@ -291,8 +291,8 @@ int __statics_fixup() } #if defined(_WIN32) -extern "C" int __managed__Main(int argc, char* argv[]); // TODO: Use wchar_t -int main(int argc, char* argv[]) // TODO: Use wmain and wchar_t +extern "C" int __managed__Main(int argc, wchar_t* argv[]); +int wmain(int argc, wchar_t* argv[]) #else extern "C" int __managed__Main(int argc, char* argv[]); int main(int argc, char* argv[]) diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index 94e2d7bd4..83ccad224 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -179,8 +179,9 @@ endfunction(convert_to_absolute_path) if(WIN32) add_definitions(-DUNICODE=1) add_compile_options($<$<CONFIG:Debug>:-DDEBUG>) + add_compile_options($<$<CONFIG:Debug>:/MTd>) + add_compile_options($<$<CONFIG:Release>:/MT>) add_compile_options(/Zi) # enable debugging information - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /PDBCOMPRESS") #shrink pdb size set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") else(WIN32) string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE) |