mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +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:01:52 +02:00
parent dd4bbdbd89
commit 064bddc84e
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -70,13 +70,6 @@ endif
OBJ += playlist.o \ OBJ += playlist.o \
movie.o movie.o
ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread
endif
endif
ifeq ($(HAVE_NETPLAY), 1) ifeq ($(HAVE_NETPLAY), 1)
OBJ += netplay.o OBJ += netplay.o
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
@ -341,13 +334,6 @@ ifeq ($(HAVE_DYLIB), 1)
OBJ += gfx/filter.o OBJ += gfx/filter.o
endif endif
ifeq ($(HAVE_FREETYPE), 1)
OBJ += gfx/fonts/freetype.o
LIBS += $(FREETYPE_LIBS)
DEFINES += $(FREETYPE_CFLAGS)
endif
ifeq ($(HAVE_ZLIB), 1) ifeq ($(HAVE_ZLIB), 1)
HAVE_COMPRESSION = 1 HAVE_COMPRESSION = 1
ZLIB_OBJS = deps/rzlib/unzip.o \ ZLIB_OBJS = deps/rzlib/unzip.o \

14
Makefile.common
View File

@ -69,3 +69,17 @@ ifeq ($(HAVE_MENU_COMMON), 1)
frontend/menu/menu_action.o \ frontend/menu/menu_action.o \
frontend/menu/menu_entries.o frontend/menu/menu_entries.o
endif endif
ifeq ($(HAVE_FREETYPE), 1)
OBJ += gfx/fonts/freetype.o
LIBS += $(FREETYPE_LIBS)
DEFINES += $(FREETYPE_CFLAGS)
endif
ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
DEFINES += -DHAVE_THREADS
ifeq ($(findstring Haiku,$(OS)),)
LIBS += -lpthread
endif
endif

14
Makefile.win
View File

@ -31,6 +31,9 @@ ifeq ($(SLIM),)
HAVE_FFMPEG = 1 HAVE_FFMPEG = 1
endif endif
FREETYPE_CFLAGS := -DHAVE_FREETYPE -Ifreetype2
FREETYPE_LIBS := -lfreetype
OBJDIR := obj-w32 OBJDIR := obj-w32
OBJ := OBJ :=
@ -105,11 +108,6 @@ ifeq ($(HAVE_SDL), 1)
DEFINES += -ISDL -DHAVE_SDL DEFINES += -ISDL -DHAVE_SDL
endif endif
ifeq ($(HAVE_THREADS), 1)
OBJ += autosave.o thread.o gfx/video_thread_wrapper.o audio/thread_wrapper.o
DEFINES += -DHAVE_THREADS
endif
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o gfx/shader_glsl.o gfx/glsym/rglgen.o gfx/glsym/glsym_gl.o OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o gfx/shader_glsl.o gfx/glsym/rglgen.o gfx/glsym/glsym_gl.o
DEFINES += -DHAVE_OPENGL -DHAVE_GLSL -DHAVE_GL_SYNC DEFINES += -DHAVE_OPENGL -DHAVE_GLSL -DHAVE_GL_SYNC
@ -191,12 +189,6 @@ ifeq ($(HAVE_NETPLAY), 1)
LIBS += -lws2_32 LIBS += -lws2_32
endif endif
ifeq ($(HAVE_FREETYPE), 1)
OBJ += gfx/fonts/freetype.o
DEFINES += -DHAVE_FREETYPE -Ifreetype2
LIBS += -lfreetype -lz
endif
ifeq ($(DYNAMIC), 1) ifeq ($(DYNAMIC), 1)
DEFINES += -DHAVE_DYNAMIC DEFINES += -DHAVE_DYNAMIC
else else