mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 01:21:47 +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 01:58:57 +02:00
parent 064bddc84e
commit 322093f600
4 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Makefile
View File

@ -10,13 +10,14 @@ ifeq ($(GLOBAL_CONFIG_DIR),)
endif
OBJ :=
JOYCONFIG_OBJ :=
LIBS :=
DEFINES += -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
include Makefile.common
JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \
JOYCONFIG_OBJ += tools/retroarch-joyconfig.o \
conf/config_file.o \
file_path.o \
compat/compat.o \
@ -182,11 +183,6 @@ ifeq ($(HAVE_D3D9), 1)
LIBS += -ld3d9 -ld3dx9 -ldxguid
endif
ifeq ($(HAVE_WINXINPUT), 1)
OBJ += input/winxinput_joypad.o
JOYCONFIG_OBJ += input/winxinput_joypad.o
endif
ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32
OBJ += input/dinput.o
@ -292,24 +288,6 @@ ifeq ($(HAVE_WAYLAND), 1)
LIBS += $(WAYLAND_LIBS)
endif
ifeq ($(HAVE_VG), 1)
OBJ += gfx/vg.o gfx/math/matrix_3x3.o
DEFINES += $(VG_CFLAGS)
LIBS += $(VG_LIBS)
endif
ifeq ($(HAVE_XVIDEO), 1)
OBJ += gfx/xvideo.o
LIBS += $(XVIDEO_LIBS)
DEFINES += $(XVIDEO_CFLAGS)
endif
ifeq ($(HAVE_X11), 1)
OBJ += input/x11_input.o gfx/context/x11_common.o
LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
endif
ifeq ($(HAVE_CG), 1)
OBJ += gfx/shader_cg.o
ifeq ($(OSX), 1)
@ -369,19 +347,6 @@ ifeq ($(HAVE_PYTHON), 1)
OBJ += gfx/py_state/py_state.o
endif
ifeq ($(HAVE_UDEV), 1)
DEFINES += $(UDEV_CFLAGS)
LIBS += $(UDEV_LIBS)
JOYCONFIG_LIBS += $(UDEV_LIBS)
OBJ += input/udev_input.o input/udev_joypad.o
JOYCONFIG_OBJ += tools/udev_joypad.o
endif
ifeq ($(HAVE_XKBCOMMON), 1)
DEFINES += $(XKBCOMMON_CFLAGS)
LIBS += $(XKBCOMMON_LIBS)
endif
ifeq ($(HAVE_NEON),1)
OBJ += audio/resamplers/sinc_neon.o
# When compiled without this, tries to attempt to compile sinc lerp,

42
Makefile.common
View File

@ -83,3 +83,45 @@ ifeq ($(HAVE_THREADS), 1)
LIBS += -lpthread
endif
endif
#Input
ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT
OBJ += input/winxinput_joypad.o
JOYCONFIG_OBJ += input/winxinput_joypad.o
endif
ifeq ($(HAVE_X11), 1)
OBJ += input/x11_input.o gfx/context/x11_common.o
LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
endif
ifeq ($(HAVE_XKBCOMMON), 1)
DEFINES += $(XKBCOMMON_CFLAGS)
LIBS += $(XKBCOMMON_LIBS)
endif
ifeq ($(HAVE_UDEV), 1)
DEFINES += $(UDEV_CFLAGS)
LIBS += $(UDEV_LIBS)
JOYCONFIG_LIBS += $(UDEV_LIBS)
OBJ += input/udev_input.o input/udev_joypad.o
JOYCONFIG_OBJ += tools/udev_joypad.o
endif
# Video
ifeq ($(HAVE_VG), 1)
OBJ += gfx/vg.o gfx/math/matrix_3x3.o
DEFINES += $(VG_CFLAGS)
LIBS += $(VG_LIBS)
endif
ifeq ($(HAVE_XVIDEO), 1)
OBJ += gfx/xvideo.o
LIBS += $(XVIDEO_LIBS)
DEFINES += $(XVIDEO_CFLAGS)
endif

2
Makefile.emscripten
View File

@ -96,7 +96,7 @@ $(TARGET): $(OBJ)
clean:
rm -f *.o
rm -f deps/miniz/*.o
rm -f deps/rzlib/*.o
rm -f frontend/*.o
rm -f frontend/menu/*.o
rm -f frontend/menu/disp/*.o

7
Makefile.win
View File

@ -205,11 +205,6 @@ ifeq ($(HAVE_PYTHON), 1)
OBJ += gfx/py_state/py_state.o
endif
ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT
OBJ += input/winxinput_joypad.o
endif
ifeq ($(HAVE_DINPUT), 1)
LIBS += -ldinput8 -ldxguid -lole32
DEFINES += -DHAVE_DINPUT
@ -219,9 +214,9 @@ endif
OBJ += record/ffemu.o
ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/ffmpeg.o
LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz
DEFINES += -DHAVE_FFMPEG -Iffmpeg
OBJ += record/ffmpeg.o
endif
ifeq ($(HAVE_7ZIP),1)