notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using $LDFLAGS when linking Magic tool plugins and Tux Paint binary. (SF.Net Bug #3389067)

Browse source
This commit is contained in:
William Kendrick 2011-08-09 18:41:30 +00:00
parent 42dae52291
commit b0d231d240
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -4,7 +4,7 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - July 2, 2011 # June 14, 2002 - August 9, 2011
# The version number, for release: # 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) $(ARCH_LIBS)
@echo @echo
@echo "...Linking Tux Paint..." @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 $^ \ -o tuxpaint $^ \
$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
@$(RSRC_CMD) @$(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:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.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: # Probably should separate the various flags like the following:
# $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS) # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)

3
docs/CHANGES.txt
View file

@ -63,6 +63,9 @@ $Id$
For more info, see http://www.tuxpaint.org/docs/opencandy/ 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: * Accessibility Improvements:
--------------------------- ---------------------------
* Added a mouse accessibility mode to avoid the need to drag the mouse. * Added a mouse accessibility mode to avoid the need to drag the mouse.