installer remove (Recommended) from D3D9 name

Die4Ever · Sep 12, 2023 · 7e68a37 · 7e68a37
1 parent 34c2920
commit 7e68a37
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/.github/run-tests/action.yml b/.github/run-tests/action.yml
@@ -28,14 +28,14 @@ runs:
         curl -Lo installer/3rdParty/D3D9Drv.dll
         "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.dll"
       shell: bash
-    - run: >-
-        curl -Lo installer/3rdParty/D3D9Drv.hut
-        "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.hut"
-      shell: bash
-    - run: >-
-        curl -Lo installer/3rdParty/D3D9Drv.int
-        "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.int"
-      shell: bash
+    #- run: >-
+    #    curl -Lo installer/3rdParty/D3D9Drv.hut
+    #    "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.hut"
+    #  shell: bash
+    #- run: >-
+    #    curl -Lo installer/3rdParty/D3D9Drv.int
+    #    "https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/raw/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/DXCU%20Installer%20Source/Mods/Community%20Update/System/D3D9Drv.int"
+    #  shell: bash
 
     # download and extract OpenGL 2.0 https://github.com/Defaultplayer001/Deus-Ex-Universe-Community-Update-/tree/master/%5B1.0%5D%20Deus%20Ex%20-%20Windows-Linux-macOS-Android/CommunityUpdateFileArchiveDXPC/OpenGL
     - run: >-

diff --git a/installer/Configs/D3D9Drv.int b/installer/Configs/D3D9Drv.int
@@ -0,0 +1,9 @@
+[Public]
+Object=(Name=D3D9Drv.D3D9RenderDevice,Class=Class,MetaClass=Engine.RenderDevice,Autodetect=)
+Preferences=(Caption="Rendering",Parent="Advanced Options")
+Preferences=(Caption="Direct3D9 support",Parent="Rendering",Class=D3D9Drv.D3D9RenderDevice,Immediate=True)
+
+[D3D9RenderDevice]
+ClassCaption="Direct3D9 Support"
+AskInstalled=Do you have Direct3D installed?
+AskUse=Do you want to use Direct3D?
diff --git a/installer/Install/__init__.py b/installer/Install/__init__.py
@@ -264,12 +264,13 @@ def ModifyConfig(defconfig:Path, config:Path, outdefconfig:Path, outconfig:Path,
 
 
 def CopyD3DRenderers(system:Path):
-    thirdparty = GetSourcePath() / '3rdParty'
+    source = GetSourcePath()
+    thirdparty = source / '3rdParty'
     info('CopyD3DRenderers from', thirdparty, ' to ', system)
 
     CopyTo(thirdparty/'D3D9Drv.dll', system/'D3D9Drv.dll', True)
-    CopyTo(thirdparty/'D3D9Drv.hut', system/'D3D9Drv.hut', True)
-    CopyTo(thirdparty/'D3D9Drv.int', system/'D3D9Drv.int', True)
+    #CopyTo(thirdparty/'D3D9Drv.hut', system/'D3D9Drv.hut', True)
+    CopyTo(source/'Configs'/'D3D9Drv.int', system/'D3D9Drv.int', True)
 
     CopyTo(thirdparty/'d3d10drv.dll', system/'d3d10drv.dll', True)
     CopyTo(thirdparty/'D3D10Drv.int', system/'D3D10Drv.int', True)
@@ -290,6 +291,7 @@ def CopyDXVK(system:Path, install:bool):
         if install:
             CopyTo(f, dest)
         elif dest.exists():
+            debug('DXVK deleting', dest)
             dest.unlink(True)
         num += 1
     assert num > 0, 'Found '+str(num)+' DXVK files'