From df3c83cb774d76cba8dff16bb8bb4430d477d872 Mon Sep 17 00:00:00 2001
From: Brandon Capener <bcapener@micron.com>
Date: Thu, 2 Jul 2026 12:24:59 -0700
Subject: [PATCH] nvme: enable cli for windows build

Remove windows dummy cli target and add all relevant
source files to the windows cli build.

Signed-off-by: Brandon Capener <bcapener@micron.com>
---
 meson.build      | 35 ++++++++++++++---------------------
 nvme-dummy.c     |  9 ---------
 util/meson.build |  4 ++--
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 nvme-dummy.c

diff --git a/meson.build b/meson.build
index df85e81741..4544f5f20b 100644
--- a/meson.build
+++ b/meson.build
@@ -553,29 +553,22 @@ if want_nvme
     subdir('plugins')   # declares: plugin_sources
     subdir('util')      # declares: util_sources
 
-    sources = []
-    if host_system == 'windows'
-        sources += [
-            'nvme-dummy.c', # Dummy source file for Windows port bring up.
-        ]
-    else
+    sources = [
+        'logging.c',
+        'nvme-cmds.c',
+        'nvme-models.c',
+        'nvme-print-binary.c',
+        'nvme-print-stdout.c',
+        'nvme-print.c',
+        'nvme-rpmb.c',
+        'nvme.c',
+        'plugin.c',
+    ]
+
+    if json_c_dep.found()
         sources += [
-            'logging.c',
-            'nvme-cmds.c',
-            'nvme-models.c',
-            'nvme-print-binary.c',
-            'nvme-print-stdout.c',
-            'nvme-print.c',
-            'nvme-rpmb.c',
-            'nvme.c',
-            'plugin.c',
+            'nvme-print-json.c',
         ]
-
-        if json_c_dep.found()
-            sources += [
-                'nvme-print-json.c',
-            ]
-        endif
     endif
 
     if want_fabrics
diff --git a/nvme-dummy.c b/nvme-dummy.c
deleted file mode 100644
index 15cf908226..0000000000
--- a/nvme-dummy.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <stdio.h>
-
-int main(int argc, char **argv)
-{
-	printf("This is a dummy executable for windows port bring up.\n");
-	return 0;
-}
diff --git a/util/meson.build b/util/meson.build
index 54cb7fcde2..ef446df1c0 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -6,6 +6,8 @@ util_sources = [
     'util/crc32.c',
     'util/suffix.c',
     'util/types.c',
+    'util/utils.c',
+    'util/table.c',
 ]
 
 if host_system == 'windows'
@@ -16,8 +18,6 @@ if host_system == 'windows'
 else
     util_sources += [
         'util/sighdl-linux.c',
-        'util/utils.c',
-        'util/table.c',
         'util/dashboard.c',
         'util/hash-linux.c',
     ]