mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't use LD variable for linker

Browse Source
This commit is contained in:
Richard Howell 2014-06-15 21:45:25 +02:00
parent d7fc6accbe
commit a3da3b696a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -388,10 +388,10 @@ endif
CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I.
ifeq ($(CXX_BUILD), 1) ifeq ($(CXX_BUILD), 1)
LD = $(CXX) LINK = $(CXX)
CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
else else
LD = $(CC) LINK = $(CC)
ifneq ($(GNU90_BUILD), 1) ifneq ($(GNU90_BUILD), 1)
ifneq ($(findstring icc,$(CC)),) ifneq ($(findstring icc,$(CC)),)
CFLAGS += -std=c99 -D_GNU_SOURCE CFLAGS += -std=c99 -D_GNU_SOURCE
@ -428,7 +428,7 @@ config.mk: configure qb/*
retroarch: $(RARCH_OBJ) retroarch: $(RARCH_OBJ)
@$(if $(Q), $(shell echo echo LD $@),) @$(if $(Q), $(shell echo echo LD $@),)
$(Q)$(LD) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) $(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
tools/retroarch-joyconfig: $(RARCH_JOYCONFIG_OBJ) tools/retroarch-joyconfig: $(RARCH_JOYCONFIG_OBJ)
@$(if $(Q), $(shell echo echo LD $@),) @$(if $(Q), $(shell echo echo LD $@),)
@ -440,7 +440,7 @@ endif
tools/retrolaunch/retrolaunch: $(RARCH_RETROLAUNCH_OBJ) tools/retrolaunch/retrolaunch: $(RARCH_RETROLAUNCH_OBJ)
@$(if $(Q), $(shell echo echo LD $@),) @$(if $(Q), $(shell echo echo LD $@),)
$(Q)$(LD) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) $(Q)$(LINK) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
$(OBJDIR)/%.o: %.c config.h config.mk $(OBJDIR)/%.o: %.c config.h config.mk
@mkdir -p $(dir $@) @mkdir -p $(dir $@)