4 files changed, 13 insertions, 7 deletions

diff --git a/header_checks/meson.build b/header_checks/meson.build
index af5ef11149..2844e50f3c 100644
--- a/header_checks/meson.build
+++ b/header_checks/meson.build
@@ -231,4 +231,6 @@ config_h.set('SIZEOF_LONG', cc.sizeof('long'))
 if sys_windows == true
   config_h.set('HAVE_DLSYM', '1')
   config_h.set('HAVE_NOTIFY_WIN32', '1')
+  config_h.set10('HAVE_WINDOWS_H', true)
+  config_h.set10('HAVE_DDRAW_H', true)
 endif
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index bc1da80728..72fe9c567b 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -6,6 +6,13 @@ engines = [
  ['wayland_shm', ['wl']],
 ]
 
+if sys_windows == true
+ engines += [
+   ['software_ddraw', []],
+   ['software_gdi', []],
+ ]
+endif
+
 if get_option('opengl') != 'none'
   engines += [
    ['gl_generic', []],
diff --git a/src/modules/evas/engines/software_ddraw/meson.build b/src/modules/evas/engines/software_ddraw/meson.build
index 2f6f580e3f..404fe7c894 100644
--- a/src/modules/evas/engines/software_ddraw/meson.build
+++ b/src/modules/evas/engines/software_ddraw/meson.build
@@ -1,17 +1,16 @@
 engine_src = files([
-  'Evas_Engine_Software_DDraw.h',
   'evas_engine.c',
-  'evas_engine.h',
   'evas_outbuf.c',
   'evas_ddraw_buffer.c',
-  'evas_ddraw_main.c',
+  'evas_ddraw_main.cpp',
 ])
 
-engine_deps = []
+engine_deps = [cc.find_library('ddraw')]
 
 if get_option('evas-modules') == 'shared'
   shared_module(mod_full_name, engine_src,
         include_directories : config_dir + [engine_include_dir],
+        cpp_args: ['-fno-rtti', '-fno-exceptions'],
         dependencies : [eina, evas] + engine_deps,
         install : true,
         install_dir : mod_install_dir,
diff --git a/src/modules/evas/engines/software_gdi/meson.build b/src/modules/evas/engines/software_gdi/meson.build
index 63a1c2c232..e492e001e6 100644
--- a/src/modules/evas/engines/software_gdi/meson.build
+++ b/src/modules/evas/engines/software_gdi/meson.build
@@ -1,13 +1,11 @@
 engine_src = files([
-  'Evas_Engine_Software_Gdi.h',
   'evas_engine.c',
-  'evas_engine.h',
   'evas_outbuf.c',
   'evas_gdi_buffer.c',
   'evas_gdi_main.c',
 ])
 
-engine_deps = []
+engine_deps = [cc.find_library('gdi32')]
 
 if get_option('evas-modules') == 'shared'
   shared_module(mod_full_name, engine_src,