[ros-diffs] [reactos] 01/01: [PC98VID] Use unique target name but rename as vga.sys

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81987761d96de211e6be1…

commit 81987761d96de211e6be1a2de6df8bb04d46e7bf
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Tue May 18 14:18:01 2021 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Tue May 18 19:24:35 2021 +0300

    [PC98VID] Use unique target name but rename as vga.sys
    
    This allows building pc98vid driver without conflict with vga_new.
---
 win32ss/drivers/miniport/CMakeLists.txt         |  1 -
 win32ss/drivers/miniport/pc98vid/CMakeLists.txt | 15 ++++++++-------
 win32ss/drivers/miniport/vga_new/CMakeLists.txt |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/win32ss/drivers/miniport/CMakeLists.txt
b/win32ss/drivers/miniport/CMakeLists.txt
index 5418581b554..2196bb034f9 100644
--- a/win32ss/drivers/miniport/CMakeLists.txt
+++ b/win32ss/drivers/miniport/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 if(SARCH STREQUAL "pc98")
-    # Actual binary filename is vga.sys
     add_subdirectory(pc98vid)
 elseif(SARCH STREQUAL "xbox")
     add_subdirectory(xboxvmp)
diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
index f86abc2edf3..e40f99481d9 100644
--- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
+++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt
@@ -5,12 +5,13 @@ list(APPEND SOURCE
     pc98vid.c
     pc98vid.h)
 
-# Actual binary filename is vga.sys
-add_library(vga MODULE ${SOURCE} pc98vid.rc)
+add_library(pc98vid MODULE ${SOURCE} pc98vid.rc)
 
-set_module_type(vga kernelmodedriver)
-add_pch(vga pc98vid.h SOURCE)
-add_importlibs(vga ntoskrnl videoprt)
-add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
+set_module_type(pc98vid kernelmodedriver)
+# Actual binary filename is vga.sys
+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(vga pc98disp.inf)
+add_driver_inf(pc98vid pc98disp.inf)
diff --git a/win32ss/drivers/miniport/vga_new/CMakeLists.txt
b/win32ss/drivers/miniport/vga_new/CMakeLists.txt
index b278c71e87e..b0e304ba906 100644
--- a/win32ss/drivers/miniport/vga_new/CMakeLists.txt
+++ b/win32ss/drivers/miniport/vga_new/CMakeLists.txt
@@ -15,4 +15,8 @@ target_link_libraries(vga libcntpr)
 set_module_type(vga kernelmodedriver)
 add_importlibs(vga videoprt)
 add_pch(vga vga.h SOURCE)
-add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
+
+# pc98vid takes place of vga.sys on PC-98 platform
+if(NOT SARCH STREQUAL "pc98")
+    add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
+endif()