From dd4bbdbd897921e781c856ec9daa4363461dc2e6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Sep 2014 00:55:17 +0200 Subject: [PATCH] Move LDFLAGS to top of Makefiles --- Makefile.emscripten | 3 ++- Makefile.win | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.emscripten b/Makefile.emscripten index db5cb1d60a..2830ff75aa 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -18,6 +18,8 @@ ifneq ($(NATIVE_ZLIB),) WANT_MINIZ = 0 endif +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 OBJ += frontend/platform/platform_emscripten.o \ @@ -28,7 +30,6 @@ OBJ += frontend/platform/platform_emscripten.o \ libretro = libretro_emscripten.bc 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 OBJ += playlist.o diff --git a/Makefile.win b/Makefile.win index 5c6e2b646f..84f48dd86b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -33,10 +33,11 @@ endif OBJDIR := obj-w32 -OBJ := -LIBS := -lm +OBJ := +LIBS := -lm JOYCONFIG_LIBS := -DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY +DEFINES := -I. -DHAVE_BUILTIN_AUTOCONFIG -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_OVERLAY +LDFLAGS := -L. -static-libgcc include Makefile.common @@ -66,7 +67,6 @@ endif libretro ?= -lretro -LDFLAGS = -L. -static-libgcc ifeq ($(TDM_GCC),) LDCXXFLAGS += -static-libstdc++