From 36c36cc3327069c9cd33549685c9b4e94124ee23 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Sep 2014 02:52:30 +0200 Subject: [PATCH] Move more to Makefile.common --- Makefile | 135 +--------------------------------------- Makefile.common | 148 ++++++++++++++++++++++++++++++++++++++++++++ Makefile.emscripten | 5 +- Makefile.win | 49 +++------------ 4 files changed, 159 insertions(+), 178 deletions(-) diff --git a/Makefile b/Makefile index b5cad832f6..376a94f810 100644 --- a/Makefile +++ b/Makefile @@ -68,9 +68,6 @@ ifneq ($(findstring Linux,$(OS)),) JOYCONFIG_OBJ += tools/linuxraw_joypad.o endif -OBJ += playlist.o \ - movie.o - ifeq ($(HAVE_NETPLAY), 1) OBJ += netplay.o ifneq ($(findstring Win32,$(OS)),) @@ -78,79 +75,6 @@ ifeq ($(HAVE_NETPLAY), 1) endif endif -ifeq ($(HAVE_COMMAND), 1) - OBJ += command.o -endif - -ifeq ($(HAVE_OSS), 1) - OBJ += audio/oss.o -endif - -ifeq ($(HAVE_OSS_BSD), 1) - OBJ += audio/oss.o -endif - -ifeq ($(HAVE_OSS_LIB), 1) - LIBS += -lossaudio -endif - -ifeq ($(HAVE_RSOUND), 1) - OBJ += audio/rsound.o - DEFINES += $(RSOUND_CFLAGS) - LIBS += $(RSOUND_LIBS) -endif - -ifeq ($(HAVE_ALSA), 1) - OBJ += audio/alsa.o audio/alsathread.o - LIBS += $(ALSA_LIBS) - DEFINES += $(ALSA_CFLAGS) -endif - -ifeq ($(HAVE_ROAR), 1) - OBJ += audio/roar.o - LIBS += $(ROAR_LIBS) - DEFINES += $(ROAR_CFLAGS) -endif - -ifeq ($(HAVE_HARD_FLOAT), 1) - DEFINES += -mfloat-abi=hard -endif - -ifeq ($(HAVE_AL), 1) - OBJ += audio/openal.o - ifeq ($(OSX),1) - LIBS += -framework OpenAL - else - LIBS += -lopenal - endif -endif - -ifeq ($(HAVE_V4L2),1) - OBJ += camera/video4linux2.o - DEFINES += -DHAVE_V4L2 -endif - -ifeq ($(HAVE_JACK),1) - OBJ += audio/jack.o - LIBS += $(JACK_LIBS) - DEFINES += $(JACK_CFLAGS) -endif - -ifeq ($(HAVE_PULSE), 1) - OBJ += audio/pulse.o - LIBS += $(PULSE_LIBS) - DEFINES += $(PULSE_CFLAGS) -endif - -ifeq ($(HAVE_COREAUDIO), 1) - OBJ += audio/coreaudio.o - LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit -endif - -ifeq ($(SCALER_NO_SIMD), 1) - DEFINES += -DSCALER_NO_SIMD -endif - ifeq ($(HAVE_SDL), 1) OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o @@ -177,33 +101,6 @@ ifeq ($(HAVE_SDL2), 1) LIBS += $(SDL2_LIBS) endif -ifeq ($(HAVE_DINPUT), 1) - LIBS += -ldinput8 -ldxguid -lole32 - OBJ += input/dinput.o - JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32 - JOYCONFIG_OBJ += input/dinput.o -endif - -ifeq ($(HAVE_XAUDIO), 1) - OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o - LIBS += -lole32 -endif - -ifeq ($(HAVE_DSOUND), 1) - OBJ += audio/dsound.o - LIBS += -ldxguid -ldsound -endif - -ifeq ($(HAVE_OMAP), 1) - OBJ += gfx/omap_gfx.o -endif - -ifeq ($(HAVE_EXYNOS), 1) - OBJ += gfx/exynos_gfx.o mem/neon/memcpy-neon.o - LIBS += $(DRM_LIBS) $(EXYNOS_LIBS) - DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS) -endif - ifeq ($(HAVE_OPENGL), 1) OBJ += gfx/gl.o \ gfx/gfx_context.o \ @@ -266,7 +163,8 @@ ifeq ($(HAVE_OPENGL), 1) LIBS += -framework OpenGL else ifneq ($(findstring Win32,$(OS)),) LIBS += -lopengl32 -lgdi32 -lcomdlg32 - OBJ += gfx/context/wgl_ctx.o gfx/context/win32_common.o + OBJ += gfx/context/wgl_ctx.o \ + gfx/context/win32_common.o else LIBS += -lGL endif @@ -302,8 +200,6 @@ ifeq ($(HAVE_ZLIB), 1) DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB endif -OBJ += record/ffemu.o - ifeq ($(HAVE_FFMPEG), 1) OBJ += record/ffmpeg.o LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) @@ -316,28 +212,6 @@ else LIBS += $(libretro) endif -ifeq ($(HAVE_PYTHON), 1) - DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter - LIBS += $(PYTHON_LIBS) - OBJ += gfx/py_state/py_state.o -endif - -ifeq ($(HAVE_NEON),1) - OBJ += audio/resamplers/sinc_neon.o - # When compiled without this, tries to attempt to compile sinc lerp, - # which will error out - DEFINES += -DSINC_LOWER_QUALITY -endif - -OBJ += audio/utils.o -ifeq ($(HAVE_NEON),1) - OBJ += audio/utils_neon.o -endif - -ifeq ($(HAVE_PRESERVE_DYLIB),1) - DEFINES += -DNO_DLCLOSE -endif - ifneq ($(V),1) Q := @ endif @@ -347,11 +221,6 @@ ifeq ($(DEBUG), 1) OPTIMIZE_FLAG = -O0 endif -ifeq ($(GL_DEBUG), 1) - CFLAGS += -DGL_DEBUG - CXXFLAGS += -DGL_DEBUG -endif - CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I. CXXFLAGS = -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS diff --git a/Makefile.common b/Makefile.common index a3e8286b5d..cd02635883 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2,10 +2,27 @@ ifeq ($(HAVE_FBO), 1) DEFINES += -DHAVE_FBO endif +ifeq ($(SCALER_NO_SIMD), 1) + DEFINES += -DSCALER_NO_SIMD +endif + ifdef HAVE_COMPRESSION DEFINES += -DHAVE_COMPRESSION endif +ifeq ($(HAVE_PRESERVE_DYLIB),1) + DEFINES += -DNO_DLCLOSE +endif + +ifeq ($(GL_DEBUG), 1) + CFLAGS += -DGL_DEBUG + CXXFLAGS += -DGL_DEBUG +endif + +ifeq ($(HAVE_HARD_FLOAT), 1) + DEFINES += -mfloat-abi=hard +endif + OBJ += frontend/frontend.o \ frontend/frontend_context.o \ frontend/platform/platform_null.o \ @@ -53,8 +70,107 @@ OBJ += frontend/frontend.o \ audio/nullaudio.o \ input/nullinput.o \ input/osk/nullosk.o \ + playlist.o \ + movie.o \ + record/ffemu.o \ performance.o +# Miscellaneous + +ifeq ($(HAVE_PYTHON), 1) + DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter + LIBS += $(PYTHON_LIBS) + OBJ += gfx/py_state/py_state.o +endif + +# Audio +# +ifeq ($(HAVE_COREAUDIO), 1) + OBJ += audio/coreaudio.o + LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit +endif + +ifeq ($(HAVE_OSS), 1) + OBJ += audio/oss.o +endif + +ifeq ($(HAVE_OSS_BSD), 1) + OBJ += audio/oss.o +endif + +ifeq ($(HAVE_ALSA), 1) + OBJ += audio/alsa.o audio/alsathread.o + LIBS += $(ALSA_LIBS) + DEFINES += $(ALSA_CFLAGS) +endif + +ifeq ($(HAVE_ROAR), 1) + OBJ += audio/roar.o + LIBS += $(ROAR_LIBS) + DEFINES += $(ROAR_CFLAGS) +endif + +ifeq ($(HAVE_AL), 1) + OBJ += audio/openal.o + ifeq ($(OSX),1) + LIBS += -framework OpenAL + else + LIBS += -lopenal + endif +endif + +ifeq ($(HAVE_JACK),1) + OBJ += audio/jack.o + LIBS += $(JACK_LIBS) + DEFINES += $(JACK_CFLAGS) +endif + +ifeq ($(HAVE_PULSE), 1) + OBJ += audio/pulse.o + LIBS += $(PULSE_LIBS) + DEFINES += $(PULSE_CFLAGS) +endif + +ifeq ($(HAVE_OSS_LIB), 1) + LIBS += -lossaudio +endif + +ifeq ($(HAVE_RSOUND), 1) + OBJ += audio/rsound.o + DEFINES += $(RSOUND_CFLAGS) + LIBS += $(RSOUND_LIBS) +endif + +ifeq ($(HAVE_DSOUND), 1) + OBJ += audio/dsound.o + DEFINES += -DHAVE_DSOUND + LIBS += -ldxguid -ldsound +endif + +ifeq ($(HAVE_XAUDIO), 1) + OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o + DEFINES += -DHAVE_XAUDIO + LIBS += -lole32 +endif + +# Audio Resamplers + +ifeq ($(HAVE_NEON),1) + OBJ += audio/resamplers/sinc_neon.o + # When compiled without this, tries to attempt to compile sinc lerp, + # which will error out + # + # TODO - we need to make quality levels of sinc + # runtime toggleable instead of going by compile-time + # defines + DEFINES += -DSINC_LOWER_QUALITY +endif + +OBJ += audio/utils.o +ifeq ($(HAVE_NEON),1) + OBJ += audio/utils_neon.o +endif + ifeq ($(HAVE_RGUI), 1) OBJ += frontend/menu/disp/rgui.o DEFINES += -DHAVE_MENU -DHAVE_RGUI @@ -92,8 +208,20 @@ ifeq ($(HAVE_THREADS), 1) endif endif +ifeq ($(HAVE_COMMAND), 1) + OBJ += command.o +endif + #Input +ifeq ($(HAVE_DINPUT), 1) + LIBS += -ldinput8 -ldxguid -lole32 + DEFINES += -DHAVE_DINPUT + OBJ += input/dinput.o + JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32 + JOYCONFIG_OBJ += input/dinput.o +endif + ifeq ($(HAVE_WINXINPUT), 1) DEFINES += -DHAVE_WINXINPUT OBJ += input/winxinput_joypad.o @@ -119,8 +247,19 @@ ifeq ($(HAVE_UDEV), 1) JOYCONFIG_OBJ += tools/udev_joypad.o endif + # Video +ifeq ($(HAVE_OMAP), 1) + OBJ += gfx/omap_gfx.o +endif + +ifeq ($(HAVE_EXYNOS), 1) + OBJ += gfx/exynos_gfx.o mem/neon/memcpy-neon.o + LIBS += $(DRM_LIBS) $(EXYNOS_LIBS) + DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS) +endif + ifeq ($(HAVE_VG), 1) OBJ += gfx/vg.o gfx/math/matrix_3x3.o DEFINES += $(VG_CFLAGS) @@ -193,3 +332,12 @@ ifeq ($(HAVE_7ZIP),1) RETROLAUNCH_OBJ += $(7ZOBJ) JOYCONFIG_OBJ += $(7ZOBJ) endif + +# Camera + +ifeq ($(HAVE_V4L2),1) + OBJ += camera/video4linux2.o + DEFINES += -DHAVE_V4L2 +endif + +# Movie diff --git a/Makefile.emscripten b/Makefile.emscripten index 43d498f2fa..603fb69d0a 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -18,6 +18,7 @@ ifneq ($(NATIVE_ZLIB),) WANT_MINIZ = 0 endif +LIBS := LDFLAGS := -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy include Makefile.common @@ -29,10 +30,6 @@ OBJ += frontend/platform/platform_emscripten.o \ libretro = libretro_emscripten.bc -LIBS = - -OBJ += playlist.o - ifeq ($(HAVE_SDL), 1) OBJ += input/sdl_input.o LIBS += -lSDL diff --git a/Makefile.win b/Makefile.win index 4b1597ec59..d3b6832a82 100644 --- a/Makefile.win +++ b/Makefile.win @@ -34,8 +34,14 @@ endif FREETYPE_CFLAGS := -DHAVE_FREETYPE -Ifreetype2 FREETYPE_LIBS := -lfreetype -LIBXML2_CFLAGS := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL -LIBXML2_LIBS := -lxml2 -liconv +LIBXML2_CFLAGS := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL +LIBXML2_LIBS := -lxml2 -liconv + +RSOUND_CFLAGS := -DHAVE_RSOUND +RSOUND_LIBS := -lrsound + +PYTHON_LIBS := -lpython32 +PYTHON_CFLAGS := -DHAVE_PYTHON -Ipython OBJDIR := obj-w32 @@ -82,8 +88,6 @@ ifeq ($(SCALER_NO_SIMD), 1) DEFINES += -DSCALER_NO_SIMD endif -OBJ += playlist.o - ifeq ($(HAVE_SDL2), 1) OBJ += gfx/sdl2_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o @@ -117,24 +121,6 @@ ifeq ($(HAVE_OPENGL), 1) LIBS += -lopengl32 -lgdi32 -lcomdlg32 endif -ifeq ($(HAVE_XAUDIO), 1) - OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o - DEFINES += -DHAVE_XAUDIO - LIBS += -lole32 -endif - -ifeq ($(HAVE_DSOUND), 1) - OBJ += audio/dsound.o - DEFINES += -DHAVE_DSOUND - LIBS += -ldxguid -ldsound -endif - -ifeq ($(HAVE_RSOUND), 1) - OBJ += audio/rsound.o - DEFINES += -DHAVE_RSOUND - LIBS += -lrsound -endif - ifeq ($(HAVE_ZLIB), 1) ZLIB_OBJS = deps/rzlib/unzip.o \ deps/rzlib/ioapi.o \ @@ -177,20 +163,6 @@ else LIBS += $(libretro) endif -ifeq ($(HAVE_PYTHON), 1) - LIBS += -lpython32 - DEFINES += -DHAVE_PYTHON -Ipython - OBJ += gfx/py_state/py_state.o -endif - -ifeq ($(HAVE_DINPUT), 1) - LIBS += -ldinput8 -ldxguid -lole32 - DEFINES += -DHAVE_DINPUT - OBJ += input/dinput.o -endif - -OBJ += record/ffemu.o - ifeq ($(HAVE_FFMPEG), 1) OBJ += record/ffmpeg.o LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz @@ -210,11 +182,6 @@ else LDCXXFLAGS += -s endif -ifeq ($(GL_DEBUG), 1) - CFLAGS += -DGL_DEBUG - CXXFLAGS += -DGL_DEBUG -endif - CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++0x -D__STDC_CONSTANT_MACROS ifeq ($(CXX_BUILD), 1)