mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move more to Makefile.common

Browse Source
This commit is contained in:
twinaphex 2014-09-14 02:05:17 +02:00
parent 322093f600
commit effaf1562f
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -177,12 +177,6 @@ ifeq ($(HAVE_SDL2), 1)
LIBS += $(SDL2_LIBS) LIBS += $(SDL2_LIBS)
endif endif
ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d9/d3d.o gfx/d3d9/d3d_wrapper.o gfx/d3d9/render_chain.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
DEFINES += -DHAVE_WIN32_D3D9
LIBS += -ld3d9 -ld3dx9 -ldxguid
endif
ifeq ($(HAVE_DINPUT), 1) ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32 LIBS += -ldinput8 -ldxguid -lole32
OBJ += input/dinput.o OBJ += input/dinput.o
@ -288,18 +282,6 @@ ifeq ($(HAVE_WAYLAND), 1)
LIBS += $(WAYLAND_LIBS) LIBS += $(WAYLAND_LIBS)
endif endif
ifeq ($(HAVE_CG), 1)
OBJ += gfx/shader_cg.o
ifeq ($(OSX), 1)
LIBS += -framework Cg
else
LIBS += -lCg -lCgGL
ifeq ($(HAVE_D3D9),1)
LIBS += -lcgD3D9
endif
endif
endif
ifeq ($(HAVE_LIBXML2), 1) ifeq ($(HAVE_LIBXML2), 1)
LIBS += $(LIBXML2_LIBS) LIBS += $(LIBXML2_LIBS)
DEFINES += $(LIBXML2_CFLAGS) DEFINES += $(LIBXML2_CFLAGS)

26
Makefile.common
View File

@ -125,3 +125,29 @@ ifeq ($(HAVE_XVIDEO), 1)
DEFINES += $(XVIDEO_CFLAGS) DEFINES += $(XVIDEO_CFLAGS)
endif endif
ifeq ($(HAVE_CG), 1)
DEFINES += -DHAVE_CG
OBJ += gfx/shader_cg.o
ifeq ($(OSX), 1)
LIBS += -framework Cg
else
LIBS += -lCg -lCgGL
ifeq ($(HAVE_D3D9),1)
LIBS += -lcgD3D9
endif
endif
endif
ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d9/d3d.o \
gfx/d3d9/render_chain.o \
gfx/d3d9/d3d_wrapper.o \
gfx/fonts/d3d_font.o \
gfx/fonts/d3d_w32_font.o \
gfx/context/d3d_ctx.o
DEFINES += -DHAVE_WIN32_D3D9
LIBS += -ld3d9 -ld3dx9 -ldxguid
ifeq ($(HAVE_CG), 1)
LIBS += -lcg -lcgD3D9
endif
endif

14
Makefile.win
View File

@ -114,20 +114,6 @@ ifeq ($(HAVE_OPENGL), 1)
LIBS += -lopengl32 -lgdi32 -lcomdlg32 LIBS += -lopengl32 -lgdi32 -lcomdlg32
endif endif
ifeq ($(HAVE_CG), 1)
OBJ += gfx/shader_cg.o
LIBS += -lcg -lcgGL
DEFINES += -DHAVE_CG
else
HAVE_D3D9 = 0
endif
ifeq ($(HAVE_D3D9), 1)
OBJ += gfx/d3d9/d3d.o gfx/d3d9/render_chain.o gfx/d3d9/d3d_wrapper.o gfx/fonts/d3d_font.o gfx/fonts/d3d_w32_font.o gfx/context/d3d_ctx.o
DEFINES += -DHAVE_WIN32_D3D9
LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
endif
ifeq ($(HAVE_XAUDIO), 1) ifeq ($(HAVE_XAUDIO), 1)
OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o
DEFINES += -DHAVE_XAUDIO DEFINES += -DHAVE_XAUDIO