diff options
| author | wkendrick <wkendrick> | 2011-08-09 18:41:30 (GMT) |
|---|---|---|
| committer | wkendrick <wkendrick> | 2011-08-09 18:41:30 (GMT) |
| commit | 0d18a0019c7072cdd9f6dd146e253e7882a77afb (patch) | |
| tree | 33204f179fb86ff8a718be337b373fc2db41845c | |
| parent | a3818b47f83c9a918d698bd044be2f0edae63846 (diff) | |
Using $LDFLAGS when linking Magic tool plugins and Tux Paint binary. (SF.Net Bug #3389067)
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | docs/CHANGES.txt | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -4,7 +4,7 @@ # bill@newbreedsoftware.com # http://www.tuxpaint.org/ -# June 14, 2002 - July 2, 2011 +# June 14, 2002 - August 9, 2011 # The version number, for release: @@ -939,7 +939,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \ $(ARCH_LIBS) @echo @echo "...Linking Tux Paint..." - $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ + $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ -o tuxpaint $^ \ $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) @$(RSRC_CMD) @@ -1133,7 +1133,7 @@ MAGIC_C:=$(wildcard magic/src/*.c) MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C)) $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c - $(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS) + $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS) # Probably should separate the various flags like the following: # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index e884914..f10e06a 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -6,7 +6,7 @@ Copyright (c) 2002-2011 by Bill Kendrick and others bill@newbreedsoftware.com http://www.tuxpaint.org/ -$Id: CHANGES.txt,v 1.785 2011/08/08 17:59:12 wkendrick Exp $ +$Id: CHANGES.txt,v 1.786 2011/08/09 18:41:30 wkendrick Exp $ 2011.July.2 (0.9.22) @@ -63,6 +63,9 @@ $Id: CHANGES.txt,v 1.785 2011/08/08 17:59:12 wkendrick Exp $ For more info, see http://www.tuxpaint.org/docs/opencandy/ + * Using $LDFLAGS when linking Magic tool plugins and Tux Paint binary. + Volkov Peter <volkov_peter@users.sourceforge.net> (SF.Net Bug #3389067) + * Accessibility Improvements: --------------------------- * Added a mouse accessibility mode to avoid the need to drag the mouse. |