[ros-diffs] [reactos] 01/01: [WIN32SS] Always build all video miniport drivers

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bd8a2110b02f38346116…

commit 0bd8a2110b02f3834611636ff719cd31ca3dd8bb
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Tue May 18 14:24:10 2021 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Tue May 18 19:24:57 2021 +0300

    [WIN32SS] Always build all video miniport drivers
    
    But include registry changes and INF files depending on SARCH variable.
    This commit is expected to uncover pc98vid build error on MSVC 2015.
    
    Addendum to 8c475e4. CORE-17529
---
 win32ss/drivers/miniport/CMakeLists.txt         | 13 ++++++-------
 win32ss/drivers/miniport/pc98vid/CMakeLists.txt |  9 ++++++---
 win32ss/drivers/miniport/xboxvmp/CMakeLists.txt |  9 ++++++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/win32ss/drivers/miniport/CMakeLists.txt
b/win32ss/drivers/miniport/CMakeLists.txt
index 2196bb034f9..e84effcc4db 100644
--- a/win32ss/drivers/miniport/CMakeLists.txt
+++ b/win32ss/drivers/miniport/CMakeLists.txt
@@ -1,11 +1,10 @@
 
-if(SARCH STREQUAL "pc98")
+add_subdirectory(vbe)
+add_subdirectory(vga)
+add_subdirectory(vga_new)
+add_subdirectory(vmx_svga)
+
+if(ARCH STREQUAL "i386")
     add_subdirectory(pc98vid)
-elseif(SARCH STREQUAL "xbox")
     add_subdirectory(xboxvmp)
-else()
-    add_subdirectory(vbe)
-    add_subdirectory(vga)
-    add_subdirectory(vga_new)
-    add_subdirectory(vmx_svga)
 endif()
diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
index e40f99481d9..db0f8ae4a39 100644
--- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
+++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
@@ -12,6 +12,9 @@ set_module_type(pc98vid kernelmodedriver)
 set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}")
 add_pch(pc98vid pc98vid.h SOURCE)
 add_importlibs(pc98vid ntoskrnl videoprt)
-add_cd_file(TARGET pc98vid DESTINATION reactos/system32/drivers FOR all)
-add_registry_inf(pc98vid_reg.inf)
-add_driver_inf(pc98vid pc98disp.inf)
+
+if(SARCH STREQUAL "pc98")
+    add_cd_file(TARGET pc98vid DESTINATION reactos/system32/drivers FOR all)
+    add_registry_inf(pc98vid_reg.inf)
+    add_driver_inf(pc98vid pc98disp.inf)
+endif()
diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
index 2595ebb13a7..4c50cee954f 100644
--- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
+++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
@@ -9,6 +9,9 @@ add_library(xboxvmp MODULE
 
 set_module_type(xboxvmp kernelmodedriver)
 add_importlibs(xboxvmp ntoskrnl videoprt)
-add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all)
-add_registry_inf(xboxvmp_reg.inf)
-add_driver_inf(xboxvmp xboxdisp.inf)
+
+if(SARCH STREQUAL "xbox")
+    add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all)
+    add_registry_inf(xboxvmp_reg.inf)
+    add_driver_inf(xboxvmp xboxdisp.inf)
+endif()