From e94477e25b1d58c8eec2ade8688e539b6c342f67 Mon Sep 17 00:00:00 2001
From: "varinder.p" <varinder.p@samsung.com>
Date: Thu, 28 Apr 2022 12:56:30 +0530
Subject: [PATCH] Fixed windows minor issues to boot qemu on windows.

Change-Id: Ibb255f2d1be00a9851768b8ea44c92fd8bc18ac2
Signed-off-by: varinder.p <varinder.p@samsung.com>
---
 configure                   | 14 --------------
 tizen/emulator_configure.sh |  5 ++---
 tizen/src/emul_state.c      |  2 --
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index 62818fc2aa..eb1003c826 100755
--- a/configure
+++ b/configure
@@ -528,7 +528,6 @@ libtizenusb="no"
 
 # for TIZEN-maru
 maru="no"
-winver="0x0600"
 libav=""
 libpng="no"
 dxva2=""
@@ -1643,8 +1642,6 @@ for opt do
   ;;
   --enable-maru) maru="yes"
   ;;
-  --winver=*) winver="$optarg"
-  ;;
   --enable-libav) libav="yes"
   ;;
   --disable-libav) libav="no"
@@ -1968,7 +1965,6 @@ disabled with --disable-FEATURE, default is enabled if available:
 
 TIZEN-maru options:
   --enable-maru            enable maru board
-  --winver=WINVER          set WINVER
   --enable-libav           enable libav library
   --disable-libav          disable libav library
   --enable-libpng          enable png library
@@ -6523,13 +6519,6 @@ else
 	fi
 fi
 
-########################################
-# set WINVER
-
-if test "$mingw32" = "yes" ; then
-  QEMU_CFLAGS="-DWINVER=$winver -D_WIN32_WINNT=$winver $QEMU_CFLAGS"
-fi
-
 ########################################
 # check extension path
 
@@ -7072,9 +7061,6 @@ echo "VIGS support      $vigs"
 if test "$maru" = "yes"; then
 echo "TIZEN-maru options:"
 echo "maru enabled               $maru"
-    if test "$mingw32" = "yes"; then
-echo "WINVER                     $winver"
-    fi
 echo "libav support              $libav"
 echo "libpng support             $libpng"
 echo "DXVA2 support              $dxva2"
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index bcb4596a13..e90f385b46 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -151,15 +151,14 @@ CONFIGURE_APPEND="
  --disable-xen
  --disable-tpm
  --disable-sheepdog
+ --disable-plugins
+ --disable-modules
  --enable-debug
  --enable-debug-info
  $CONFIGURE_APPEND"
 
 CONFIGURE_APPEND_WIN="
- --extra-ldflags=-static-libgcc
- --extra-ldflags=-static-libstdc++
  --audio-drv-list=dsound
- --winver=0x0600
  --enable-hax"
 
 # append platform specific options
diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index 03ec9a992c..28d21a192b 100644
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -188,7 +188,6 @@ const char *get_log_redirect_file(void)
 #elif defined(CONFIG_DARWIN)
     result = fcntl(STDOUT_FILENO, F_GETPATH, log_filename);
 #elif defined(CONFIG_WIN32)
-# if WINVER >= 0x600
     // works only vista or newer...
     if (osvi.dwMajorVersion >= 6) {
         char win32_log_filename_normalized[PATH_MAX];
@@ -204,7 +203,6 @@ const char *get_log_redirect_file(void)
             result = -1;
         }
     }
-# endif
 #endif
     if (log_redirect_file) {
         g_free((void *)log_redirect_file);
-- 
2.34.1