Move more to Makefile.common

This commit is contained in:
twinaphex 2014-09-14 00:11:08 +02:00
parent 33809a9ca3
commit ce55990a3e
3 changed files with 23 additions and 24 deletions

View File

@ -4,7 +4,14 @@ TARGET = retroarch tools/retroarch-joyconfig tools/retrolaunch/retrolaunch
OBJDIR := obj-unix OBJDIR := obj-unix
ifeq ($(GLOBAL_CONFIG_DIR),)
GLOBAL_CONFIG_DIR = /etc
endif
OBJ := OBJ :=
LIBS :=
DEFINES += -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
include Makefile.common include Makefile.common
@ -28,21 +35,14 @@ RETROLAUNCH_OBJ = tools/retrolaunch/main.o \
HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h) HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
LIBS = -lm LIBS += -lm
DEBUG_FLAG = -g DEBUG_FLAG = -g
else else
LIBS = -lroot -lnetwork LIBS += -lroot -lnetwork
# stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4 # stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4
DEBUG_FLAG = -gdwarf-2 DEBUG_FLAG = -gdwarf-2
endif endif
DEFINES = -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
ifeq ($(GLOBAL_CONFIG_DIR),)
GLOBAL_CONFIG_DIR = /etc
endif
DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifeq ($(REENTRANT_TEST), 1) ifeq ($(REENTRANT_TEST), 1)
DEFINES += -Dmain=retroarch_main DEFINES += -Dmain=retroarch_main
OBJ += console/test.o OBJ += console/test.o
@ -80,7 +80,8 @@ ifeq ($(HAVE_LAKKA), 1)
endif endif
endif endif
OBJ += playlist.o OBJ += playlist.o \
movie.o
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += frontend/menu/backend/menu_common_backend.o \ OBJ += frontend/menu/backend/menu_common_backend.o \
@ -98,8 +99,6 @@ ifeq ($(HAVE_THREADS), 1)
endif endif
endif endif
OBJ += movie.o
ifeq ($(HAVE_NETPLAY), 1) ifeq ($(HAVE_NETPLAY), 1)
OBJ += netplay.o OBJ += netplay.o
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)

View File

@ -1,13 +1,7 @@
TARGET = retroarch.js TARGET = retroarch.js
OBJ := OBJ :=
DEFINES := -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
include Makefile.common
OBJ += frontend/platform/platform_emscripten.o \
input/rwebinput_input.o \
audio/rwebaudio.o \
camera/rwebcam.o
HAVE_OPENGL = 1 HAVE_OPENGL = 1
HAVE_RGUI = 1 HAVE_RGUI = 1
@ -24,10 +18,16 @@ ifneq ($(NATIVE_ZLIB),)
WANT_MINIZ = 0 WANT_MINIZ = 0
endif endif
include Makefile.common
OBJ += frontend/platform/platform_emscripten.o \
input/rwebinput_input.o \
audio/rwebaudio.o \
camera/rwebcam.o
libretro = libretro_emscripten.bc libretro = libretro_emscripten.bc
LIBS = LIBS =
DEFINES = -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
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 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
ifeq ($(HAVE_RGUI), 1) ifeq ($(HAVE_RGUI), 1)

View File

@ -33,7 +33,10 @@ endif
OBJDIR := obj-w32 OBJDIR := obj-w32
OBJ := OBJ :=
LIBS := -lm
JLIBS :=
DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
include Makefile.common include Makefile.common
@ -63,8 +66,6 @@ endif
libretro ?= -lretro libretro ?= -lretro
LIBS = -lm
DEFINES = -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY
LDFLAGS = -L. -static-libgcc LDFLAGS = -L. -static-libgcc
ifeq ($(TDM_GCC),) ifeq ($(TDM_GCC),)
@ -75,7 +76,6 @@ ifeq ($(SCALER_NO_SIMD), 1)
DEFINES += -DSCALER_NO_SIMD DEFINES += -DSCALER_NO_SIMD
endif endif
JLIBS =
ifeq ($(HAVE_RGUI), 1) ifeq ($(HAVE_RGUI), 1)
OBJ += frontend/menu/disp/rgui.o OBJ += frontend/menu/disp/rgui.o