Fix compilation with MinGW

aap · Jul 5, 2021 · 5f05f9e · 5f05f9e
1 parent b2ceadc
commit 5f05f9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/premake5.lua b/premake5.lua
@@ -149,8 +149,6 @@ function findlibs()
 		end
 	filter { "platforms:*d3d9" }
 		links { "gdi32", "d3d9" }
-	filter { "platforms:*d3d9", "action:vs*" }
-		links { "Xinput9_1_0" }
 	filter {}
 end
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -188,7 +188,6 @@ elseif(LIBRW_PLATFORM_D3D9)
     target_link_libraries(librw
         PRIVATE
             d3d9
-            xinput
     )
 endif()
 

diff --git a/src/d3d/rwd3d.h b/src/d3d/rwd3d.h
@@ -1,14 +1,16 @@
 #ifdef RW_D3D9
 #ifdef WITH_D3D
 #include <d3d9.h>
+#else
+typedef struct IDirect3DDevice9 IDirect3DDevice9;
 #endif
 #endif
 
 namespace rw {
 
 #ifdef RW_D3D9
 
-#ifdef _WINDOWS_
+#if defined(_WINDOWS_) || defined(_WINDEF_H)
 struct EngineOpenParams
 {
 	HWND window;
@@ -19,10 +21,7 @@ struct EngineOpenParams
 	uint32 please_include_windows_h;
 };
 #endif
-#else
-#ifdef _D3D9_H_
-#error "please don't include d3d9.h for non-d3d9 platforms"
-#endif
+
 #endif
 
 namespace d3d {
@@ -32,10 +31,7 @@ extern bool32 isP8supported;
 extern Device renderdevice;
 
 #ifdef RW_D3D9
-#ifdef _D3D9_H_
 extern IDirect3DDevice9 *d3ddevice;
-void setD3dMaterial(D3DMATERIAL9 *mat9);
-#endif
 
 #define COLOR_ARGB(a, r, g, b) ((rw::uint32)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))