projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[3RDPARTY] Make some warnings non-fatal
[reactos.git]
/
dll
/
win32
/
mshtml
/
CMakeLists.txt
diff --git
a/dll/win32/mshtml/CMakeLists.txt
b/dll/win32/mshtml/CMakeLists.txt
index
012cd04
..
08e23da
100644
(file)
--- a/
dll/win32/mshtml/CMakeLists.txt
+++ b/
dll/win32/mshtml/CMakeLists.txt
@@
-6,9
+6,14
@@
add_definitions(
-D__WINESRC__
-DCOM_NO_WINDOWS_H)
-D__WINESRC__
-DCOM_NO_WINDOWS_H)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/
sdk/
include/reactos/wine)
add_idl_headers(mshtml_nsiface_header nsiface.idl)
add_idl_headers(mshtml_nsiface_header nsiface.idl)
-spec2def(mshtml.dll mshtml.spec)
+spec2def(mshtml.dll mshtml.spec ADD_IMPORTLIB)
+
+if(MSVC)
+ # error C4028: formal parameter 3 different from declaration
+ replace_compile_flags("/we4028" " ")
+endif()
list(APPEND SOURCE
conpoint.c
list(APPEND SOURCE
conpoint.c
@@
-16,14
+21,13
@@
list(APPEND SOURCE
editor.c
hlink.c
htmlanchor.c
editor.c
hlink.c
htmlanchor.c
+ htmlarea.c
htmlattr.c
htmlbody.c
htmlcomment.c
htmlcurstyle.c
htmldoc.c
htmlelem.c
htmlattr.c
htmlbody.c
htmlcomment.c
htmlcurstyle.c
htmldoc.c
htmlelem.c
- htmlelem2.c
- htmlelem3.c
htmlelemcol.c
htmlembed.c
htmlevent.c
htmlelemcol.c
htmlembed.c
htmlevent.c
@@
-83,13
+87,14
@@
list(APPEND SOURCE
task.c
txtrange.c
view.c
task.c
txtrange.c
view.c
+ xmlhttprequest.c
mshtml_private.h)
if(MSVC)
add_asm_files(mshtml_asm msvc.S)
endif()
mshtml_private.h)
if(MSVC)
add_asm_files(mshtml_asm msvc.S)
endif()
-add_library(mshtml
SHARED
+add_library(mshtml
MODULE
${SOURCE}
${mshtml_asm}
guid.c
${SOURCE}
${mshtml_asm}
guid.c
@@
-103,7
+108,6
@@
list(APPEND mshtml_rc_deps
${CMAKE_CURRENT_SOURCE_DIR}/mshtml_classes.rgs)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}")
${CMAKE_CURRENT_SOURCE_DIR}/mshtml_classes.rgs)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}")
-
set_module_type(mshtml win32dll)
target_link_libraries(mshtml uuid wine strmiids oldnames)
add_delay_importlibs(mshtml wininet)
set_module_type(mshtml win32dll)
target_link_libraries(mshtml uuid wine strmiids oldnames)
add_delay_importlibs(mshtml wininet)