diff --git a/Makefile b/Makefile index 6a7acfc325..14591efc4f 100644 --- a/Makefile +++ b/Makefile @@ -4,55 +4,9 @@ TARGET = retroarch tools/retroarch-joyconfig tools/retrolaunch/retrolaunch OBJDIR := obj-unix -OBJ = frontend/frontend.o \ - frontend/frontend_context.o \ - frontend/platform/platform_null.o \ - retroarch.o \ - file.o \ - file_list.o \ - file_path.o \ - hash.o \ - driver.o \ - settings.o \ - settings_data.o \ - dynamic.o \ - dynamic_dummy.o \ - message_queue.o \ - rewind.o \ - gfx/gfx_common.o \ - gfx/fonts/bitmapfont.o \ - input/input_common.o \ - input/keyboard_line.o \ - input/overlay.o \ - patch.o \ - fifo_buffer.o \ - core_options.o \ - compat/compat.o \ - cheats.o \ - core_info.o \ - conf/config_file.o \ - screenshot.o \ - gfx/scaler/scaler.o \ - gfx/shader_common.o \ - gfx/shader_parse.o \ - gfx/scaler/pixconv.o \ - gfx/scaler/scaler_int.o \ - gfx/scaler/scaler_filter.o \ - gfx/image/image_rpng.o \ - gfx/fonts/fonts.o \ - audio/resamplers/resampler.o \ - audio/dsp_filter.o \ - audio/resamplers/sinc.o \ - audio/resamplers/nearest.o \ - audio/resamplers/cc_resampler.o \ - location/nulllocation.o \ - camera/nullcamera.o \ - gfx/nullgfx.o \ - audio/nullaudio.o \ - input/nullinput.o \ - input/osk/nullosk.o \ - performance.o +OBJ := +include Makefile.common JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ conf/config_file.o \ @@ -84,7 +38,6 @@ endif DEFINES = -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY - ifeq ($(GLOBAL_CONFIG_DIR),) GLOBAL_CONFIG_DIR = /etc endif diff --git a/Makefile.common b/Makefile.common new file mode 100644 index 0000000000..973c339749 --- /dev/null +++ b/Makefile.common @@ -0,0 +1,48 @@ +OBJ += frontend/frontend.o \ + frontend/frontend_context.o \ + frontend/platform/platform_null.o \ + retroarch.o \ + file.o \ + file_list.o \ + file_path.o \ + hash.o \ + driver.o \ + settings.o \ + settings_data.o \ + dynamic.o \ + dynamic_dummy.o \ + message_queue.o \ + rewind.o \ + gfx/gfx_common.o \ + gfx/fonts/bitmapfont.o \ + input/input_common.o \ + input/keyboard_line.o \ + input/overlay.o \ + patch.o \ + fifo_buffer.o \ + core_options.o \ + compat/compat.o \ + cheats.o \ + core_info.o \ + conf/config_file.o \ + screenshot.o \ + gfx/scaler/scaler.o \ + gfx/shader_common.o \ + gfx/shader_parse.o \ + gfx/scaler/pixconv.o \ + gfx/scaler/scaler_int.o \ + gfx/scaler/scaler_filter.o \ + gfx/image/image_rpng.o \ + gfx/fonts/fonts.o \ + audio/resamplers/resampler.o \ + audio/dsp_filter.o \ + audio/resamplers/sinc.o \ + audio/resamplers/nearest.o \ + audio/resamplers/cc_resampler.o \ + location/nulllocation.o \ + camera/nullcamera.o \ + gfx/nullgfx.o \ + audio/nullaudio.o \ + input/nullinput.o \ + input/osk/nullosk.o \ + performance.o diff --git a/Makefile.emscripten b/Makefile.emscripten index 7f5b6678d8..aebff44b49 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -1,63 +1,13 @@ TARGET = retroarch.js -OBJ = frontend/platform/platform_emscripten.o \ - frontend/platform/platform_null.o \ - frontend/frontend.o \ - frontend/frontend_context.o \ - retroarch.o \ - file.o \ - file_list.o \ - file_path.o \ - driver.o \ - conf/config_file.o \ - settings.o \ - settings_data.o \ - hash.o \ - dynamic.o \ - dynamic_dummy.o \ - message_queue.o \ - rewind.o \ - movie.o \ - gfx/gfx_common.o \ - input/nullinput.o \ - input/input_common.o \ - input/rwebinput_input.o \ - input/keyboard_line.o \ - core_options.o \ - patch.o \ - compat/compat.o \ - compat/rxml/rxml.o \ - screenshot.o \ - cheats.o \ - audio/utils.o \ - audio/rwebaudio.o \ - audio/dsp_filter.o \ - input/overlay.o \ - fifo_buffer.o \ - gfx/scaler/scaler.o \ - gfx/shader_common.o \ - gfx/scaler/pixconv.o \ - gfx/scaler/scaler_int.o \ - gfx/scaler/scaler_filter.o \ - gfx/state_tracker.o \ - gfx/shader_parse.o \ - gfx/fonts/fonts.o \ - gfx/fonts/bitmapfont.o \ - gfx/image/image_rpng.o \ - gfx/filter.o \ - audio/resamplers/resampler.o \ - audio/resamplers/sinc.o \ - audio/resamplers/nearest.o \ - audio/resamplers/cc_resampler.o \ - audio/nullaudio.o \ - performance.o \ - core_info.o \ - location/nulllocation.o \ - camera/nullcamera.o \ - camera/rwebcam.o \ - input/osk/nullosk.o \ - gfx/nullgfx.o +OBJ := +include Makefile.common + +OBJ += frontend/platform/platform_emscripten.o \ + input/rwebinput_input.o \ + audio/rwebaudio.o \ + camera/rwebcam.o HAVE_OPENGL = 1 HAVE_RGUI = 1 diff --git a/Makefile.win b/Makefile.win index fa091dece8..f179b2e7e0 100644 --- a/Makefile.win +++ b/Makefile.win @@ -1,83 +1,6 @@ TARGET = retroarch.exe JTARGET = tools/retroarch-joyconfig.exe -OBJDIR := obj-w32 - -OBJ = frontend/frontend.o \ - frontend/frontend_context.o \ - frontend/platform/platform_null.o \ - retroarch.o \ - file.o \ - file_list.o \ - file_path.o \ - driver.o \ - conf/config_file.o \ - settings.o \ - settings_data.o \ - hash.o \ - dynamic.o \ - dynamic_dummy.o \ - message_queue.o \ - rewind.o \ - movie.o \ - gfx/gfx_common.o \ - input/input_common.o \ - input/keyboard_line.o \ - input/autoconf/builtin_win.o \ - core_options.o \ - patch.o \ - compat/compat.o \ - screenshot.o \ - cheats.o \ - core_info.o \ - audio/utils.o \ - input/overlay.o \ - fifo_buffer.o \ - media/rarch.o \ - gfx/context/win32_common.o \ - gfx/scaler/scaler.o \ - gfx/shader_common.o \ - gfx/scaler/pixconv.o \ - gfx/scaler/scaler_int.o \ - gfx/scaler/scaler_filter.o \ - gfx/state_tracker.o \ - gfx/shader_parse.o \ - gfx/fonts/fonts.o \ - gfx/fonts/bitmapfont.o \ - gfx/image/image_rpng.o \ - audio/resamplers/resampler.o \ - audio/dsp_filter.o \ - audio/resamplers/sinc.o \ - audio/resamplers/nearest.o \ - audio/resamplers/cc_resampler.o \ - location/nulllocation.o \ - camera/nullcamera.o \ - gfx/nullgfx.o \ - audio/nullaudio.o \ - input/nullinput.o \ - input/osk/nullosk.o \ - performance.o - -JOBJ := conf/config_file.o \ - tools/retroarch-joyconfig.o \ - compat/compat.o \ - file_path.o \ - tools/input_common_joyconfig.o \ - input/dinput.o \ - input/winxinput_joypad.o - -HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h) - -ifneq ($(HOST_PREFIX),) - CC = $(HOST_PREFIX)gcc - CXX = $(HOST_PREFIX)g++ - WINDRES = $(HOST_PREFIX)windres -else - CC = gcc - CXX = g++ - WINDRES = windres -endif - HAVE_DINPUT = 1 HAVE_XAUDIO = 1 HAVE_DSOUND = 1 @@ -108,6 +31,36 @@ ifeq ($(SLIM),) HAVE_FFMPEG = 1 endif +OBJDIR := obj-w32 + +OBJ := + +include Makefile.common + +OBJ += media/rarch.o \ + gfx/context/win32_common.o + +JOBJ := conf/config_file.o \ + tools/retroarch-joyconfig.o \ + compat/compat.o \ + file_path.o \ + tools/input_common_joyconfig.o \ + input/dinput.o \ + input/winxinput_joypad.o + +HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h) + +ifneq ($(HOST_PREFIX),) + CC = $(HOST_PREFIX)gcc + CXX = $(HOST_PREFIX)g++ + WINDRES = $(HOST_PREFIX)windres +else + CC = gcc + CXX = g++ + WINDRES = windres +endif + + libretro ?= -lretro LIBS = -lm