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

Preferred way of checking for FriBidi.

Browse source
This commit is contained in:
William Kendrick 2009-01-02 09:24:05 +00:00
parent 2481e656ba
commit a1e0cf75ba
2 changed files with 6 additions and 6 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 - December 3, 2008 # June 14, 2002 - January 2, 2009
# The version number, for release: # The version number, for release:
@ -74,8 +74,8 @@ PAPER_LIB:=$(call linktest,-lpaper,)
PNG:=$(call linktest,-lpng,) PNG:=$(call linktest,-lpng,)
PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,)) PNG:=$(if $(PNG),$(PNG),$(call linktest,-lpng12,))
FRIBIDI_LIB:=$(shell fribidi-config --libs) FRIBIDI_LIB:=$(shell pkg-config --libs fribidi)
FRIBIDI_CFLAGS:=$(shell fribidi-config --cflags) FRIBIDI_CFLAGS:=$(shell pkg-config --cflags fribidi)
windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)

6
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - December 7, 2008 June 14, 2002 - January 2, 2009
$Id$ $Id$
*/ */
@ -965,7 +965,7 @@ char *papersize = NULL;
#if 1 /* FIXME: ifdef for platforms that lack fribidi? */ #if 1 /* FIXME: ifdef for platforms that lack fribidi? */
#include <fribidi/fribidi.h> #include <fribidi/fribidi.h>
#if !defined(FRIBIDI_H) #if !defined(_FRIBIDI_H) && !defined(FRIBIDI_H)
#error "---------------------------------------------------" #error "---------------------------------------------------"
#error "If you installed libfribidi from a package, be sure" #error "If you installed libfribidi from a package, be sure"
#error "to get the development package, as well!" #error "to get the development package, as well!"
@ -15498,7 +15498,7 @@ static void do_render_cur_text(int do_blit)
if (texttool_len > 0) if (texttool_len > 0)
{ {
#ifdef FRIBIDI_H #if defined(_FRIBIDI_H) || defined(FRIBIDI_H)
FriBidiCharType baseDir = FRIBIDI_TYPE_LTR; FriBidiCharType baseDir = FRIBIDI_TYPE_LTR;
FriBidiChar *unicodeIn, *unicodeOut; FriBidiChar *unicodeIn, *unicodeOut;
unsigned int i; unsigned int i;