ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify Makefile.common

This commit is contained in:
twinaphex 2018-01-03 19:58:51 +01:00
parent aa255a9ad2
commit 45d532b3a2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.common
View File

@ -649,7 +649,8 @@ endif
ifeq ($(HAVE_DSOUND), 1) ifeq ($(HAVE_DSOUND), 1)
OBJ += audio/drivers/dsound.o OBJ += audio/drivers/dsound.o
DEFINES += -DHAVE_DSOUND DEFINES += -DHAVE_DSOUND
LIBS += -ldxguid -ldsound HAVE_DX_COMMON = 1
LIBS += -ldsound
endif endif
ifeq ($(HAVE_WASAPI), 1) ifeq ($(HAVE_WASAPI), 1)
@ -870,7 +871,8 @@ endif
#Input #Input
ifeq ($(HAVE_DINPUT), 1) ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32 HAVE_DX_COMMON = 1
LIBS += -ldinput8 -lole32
DEFINES += -DHAVE_DINPUT DEFINES += -DHAVE_DINPUT
OBJ += input/drivers/dinput.o \ OBJ += input/drivers/dinput.o \
input/drivers_joypad/dinput_joypad.o input/drivers_joypad/dinput_joypad.o
@ -1261,7 +1263,7 @@ ifeq ($(HAVE_D3D9), 1)
ifneq ($(HAVE_DYLIB), 1) ifneq ($(HAVE_DYLIB), 1)
LIBS += -ld3d9 -ld3dx9 LIBS += -ld3d9 -ld3dx9
endif endif
LIBS += -ldxguid HAVE_DX_COMMON = 1
OBJ += gfx/drivers_font/d3d_w32_font.o OBJ += gfx/drivers_font/d3d_w32_font.o
ifeq ($(HAVE_CG), 1) ifeq ($(HAVE_CG), 1)
LIBS += -lcgD3D9 LIBS += -lcgD3D9
@ -1276,15 +1278,19 @@ endif
ifeq ($(HAVE_D3D8), 1) ifeq ($(HAVE_D3D8), 1)
HAVE_D3D_COMMON = 1 HAVE_D3D_COMMON = 1
HAVE_DX_COMMON = 1
DEFINES += -DHAVE_D3D8 DEFINES += -DHAVE_D3D8
ifneq ($(HAVE_DYLIB), 1) ifneq ($(HAVE_DYLIB), 1)
LIBS += -ld3d8 -ld3dx8 LIBS += -ld3d8 -ld3dx8
endif endif
LIBS += -ldxguid
OBJ += gfx/drivers_renderchain/d3d8_renderchain.o OBJ += gfx/drivers_renderchain/d3d8_renderchain.o
endif endif
ifeq ($(HAVE_DX_COMMON), 1)
LIBS += -ldxguid
endif
ifeq ($(HAVE_D3D_COMMON), 1) ifeq ($(HAVE_D3D_COMMON), 1)
DEFINES += -DHAVE_D3D DEFINES += -DHAVE_D3D
OBJ += gfx/drivers/d3d.o \ OBJ += gfx/drivers/d3d.o \