libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(D3DX8) d3dx8 always has to be statically linked

Browse Source
This commit is contained in:
twinaphex 2018-01-03 20:35:24 +01:00
parent b925603eff
commit a3b9f0ab63
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -1281,8 +1281,9 @@ ifeq ($(HAVE_D3D8), 1)
HAVE_DX_COMMON = 1
DEFINES += -DHAVE_D3D8
ifneq ($(HAVE_DYLIB), 1)
LIBS += -ld3d8 -ld3dx8
LIBS += -ld3d8
endif
LIBS += -ld3dx8
OBJ += gfx/drivers_renderchain/d3d8_renderchain.o
endif

17
gfx/common/d3d_common.c
View File

@ -153,8 +153,6 @@ dylib_t dylib_load_d3dx(void)
dll = dylib_load("d3dx9_42.dll");
if (!dll)
dll = dylib_load("d3dx9_43.dll");
#elif defined(HAVE_D3D8)
dll = dylib_load("d3dx81ab.dll");
#endif
return dll;
@ -169,12 +167,16 @@ bool d3d_initialize_symbols(void)
#ifdef HAVE_DYNAMIC_D3D
#if defined(HAVE_D3D9)
g_d3d_dll = dylib_load("d3d9.dll");
#elif defined(HAVE_D3D8)
g_d3d_dll = dylib_load("d3d8.dll");
#endif
g_d3dx_dll = dylib_load_d3dx();
if (!g_d3d_dll || !g_d3dx_dll)
return false;
#elif defined(HAVE_D3D8)
g_d3d_dll = dylib_load("d3d8.dll");
if (!g_d3d_dll)
return false;
#endif
#endif
#if defined(HAVE_D3D9)
@ -197,11 +199,10 @@ bool d3d_initialize_symbols(void)
#ifdef HAVE_DYNAMIC_D3D
D3DCreate = (D3DCreate_t)dylib_proc(g_d3d_dll, "Direct3DCreate8");
#ifdef UNICODE
D3DCreateFontIndirect = (D3DXCreateFontIndirect_t)dylib_proc(g_d3dx_dll, "D3DXCreateFontIndirectW");
D3DCreateFontIndirect = D3DXCreateFontIndirectW;
#else
D3DCreateFontIndirect = (D3DXCreateFontIndirect_t)dylib_proc(g_d3dx_dll, "D3DXCreateFontIndirectA");
D3DCreateFontIndirect = D3DXCreateFontIndirectA;
#endif
D3DCreateTextureFromFile = (D3DCreateTextureFromFile_t)dylib_proc(g_d3dx_dll, "D3DXCreateTextureFromFileExA");
#else
D3DCreate = Direct3DCreate8;
D3DCreateFontIndirect = D3DXCreateFontIndirect;