diff --git a/README.md b/README.md index 518046b80..146ee5123 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ For the current status of the project, please refer to the [project wiki](https: - [wine-staging](https://wine-staging.com/) for Vulkan support - [Meson](http://mesonbuild.com/) build system - [MinGW64](http://mingw-w64.org/) compiler and headers -- [SDL2](https://www.libsdl.org/) headers and DLL ### Building DLLs Inside the dxvk directory, run: @@ -28,7 +27,7 @@ Both `dxgi.dll` and `d3d11.dll`as well as some demo executables will be located ## How to use In order to run `executable.exe` with DXVK, -* Copy `dxgi.dll`, `d3d11.dll` and `SDL2.dll` into the same directory as the executable +* Copy `dxgi.dll` and `d3d11.dll` into the same directory as the executable * Run `WINEDLLOVERRIDES=d3d11,dxgi=n wine executable.exe` DXVK will create a file `dxgi.log` in the current working directory and may print out messages to stderr. diff --git a/lib/SDL2.lib b/lib/SDL2.lib deleted file mode 100755 index 12caaa794..000000000 Binary files a/lib/SDL2.lib and /dev/null differ diff --git a/lib32/SDL2.lib b/lib32/SDL2.lib deleted file mode 100755 index 533337bf7..000000000 Binary files a/lib32/SDL2.lib and /dev/null differ diff --git a/meson.build b/meson.build index d744e3270..fd4bb67b6 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,6 @@ else endif lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path) -lib_sdl2 = dxvk_compiler.find_library('SDL2', dirs : dxvk_library_path) lib_d3d11 = dxvk_compiler.find_library('d3d11') lib_dxgi = dxvk_compiler.find_library('dxgi') diff --git a/src/dxgi/dxgi_include.h b/src/dxgi/dxgi_include.h index ec9c2a397..87fd9452b 100644 --- a/src/dxgi/dxgi_include.h +++ b/src/dxgi/dxgi_include.h @@ -19,8 +19,6 @@ #include -#include - // For some reason, these are not exposed #ifndef DXGI_RESOURCE_PRIORITY_NORMAL #define DXGI_RESOURCE_PRIORITY_MINIMUM (0x28000000) diff --git a/src/dxgi/dxgi_main.cpp b/src/dxgi/dxgi_main.cpp index 125193e2f..f5cf4179c 100644 --- a/src/dxgi/dxgi_main.cpp +++ b/src/dxgi/dxgi_main.cpp @@ -5,19 +5,6 @@ namespace dxvk { Logger Logger::s_instance("dxgi.log"); - struct SdlInstance { - SdlInstance() { - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE)) - Logger::err("Instance::init: Failed to initialize SDL"); - } - - ~SdlInstance() { - SDL_Quit(); - } - }; - - SdlInstance sdl; - HRESULT createDxgiFactory(REFIID riid, void **ppFactory) { if (riid != __uuidof(IDXGIFactory) && riid != __uuidof(IDXGIFactory1)) { diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index e822b7272..e240736d4 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -51,7 +51,7 @@ thread_dep = dependency('threads') dxvk_lib = static_library('dxvk', dxvk_src, glsl_generator.process(dxvk_hud_shaders), link_with : [ util_lib, spirv_lib ], - dependencies : [ thread_dep, lib_vulkan, lib_sdl2 ], + dependencies : [ thread_dep, lib_vulkan ], include_directories : [ dxvk_include_path ]) dxvk_dep = declare_dependency(