1 files changed, 18 insertions, 3 deletions
diff --git a/src/Native/ObjWriter/CMakeLists.txt b/src/Native/ObjWriter/CMakeLists.txt
index fae4ddb12..490a36701 100644
--- a/src/Native/ObjWriter/CMakeLists.txt
+++ b/src/Native/ObjWriter/CMakeLists.txt
@@ -2,7 +2,15 @@ project(objwriter)
 
 set(CMAKE_BUILD_TYPE "${OBJWRITER_BUILD_TYPE}")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OBJWRITER_C_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OBJWRITER_CXX_FLAGS} -std=c++11 -fno-rtti")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OBJWRITER_CXX_FLAGS}")
+
+if(WIN32)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+endif()
+
+if(NOT WIN32)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti")
+endif()
 
 message(STATUS "ObjWriter configuring with (${CMAKE_BUILD_TYPE}) build type and (${LLVM_DEFAULT_TARGET_TRIPLE}) default target triple")
 
@@ -29,9 +37,16 @@ endif()
 add_library(objwriter
    SHARED
    objwriter.cpp
-   typeBuilder.cpp
+   debugInfo/codeView/codeViewTypeBuilder.cpp
+   debugInfo/codeView/codeViewTypeBuilder.h
+   debugInfo/dwarf/dwarfTypeBuilder.cpp
+   debugInfo/dwarf/dwarfTypeBuilder.h
+   debugInfo/dwarf/dwarfGen.cpp
+   debugInfo/dwarf/dwarfGen.h
+   debugInfo/dwarf/dwarfAbbrev.cpp
+   debugInfo/dwarf/dwarfAbbrev.h
+   debugInfo/typeBuilder.h
    objwriter.h # Visual Studio generator doesn't include necessary header files into the project automatically
-   typeBuilder.h
    ${OBJWRITER_EXPORTS_DEF}
 )