Merge pull request #737 from aliaspider/master

(PSP) fix WHOLE_ARCHIVE_LINK makefile option
This commit is contained in:
Twinaphex 2014-06-07 01:44:07 +02:00
commit f22799fb00

View File

@ -12,6 +12,11 @@ else
OPTIMIZE_LV := -O2 -g
endif
ifeq ($(WHOLE_ARCHIVE_LINK), 1)
WHOLE_START := -Wl,--whole-archive
WHOLE_END := -Wl,--no-whole-archive
endif
INCDIR = $(PSPPATH)/include
CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
ASFLAGS = $(CFLAGS)
@ -20,7 +25,7 @@ RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX1 -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_Z
LIBDIR =
LDFLAGS =
LIBS = -lretro_psp1 -lstdc++ -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc
LIBS = $(WHOLE_START) -lretro_psp1 $(WHOLE_END) -lstdc++ -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc
ifeq ($(HAVE_THREADS), 1)
RARCH_DEFINES += -DHAVE_THREADS
@ -35,10 +40,6 @@ ifeq ($(HAVE_KERNEL_PRX), 1)
CFLAGS += -DHAVE_KERNEL_PRX
endif
ifeq ($(WHOLE_ARCHIVE_LINK), 1)
LDFLAGS += -Wl, --whole-archive
endif
CFLAGS += $(RARCH_DEFINES)