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

Enabled compiling on John Popplewell's build environment (for Windows 2000 & XP)

Browse source
This commit is contained in:
dolphin6k 2020-11-15 13:47:29 +09:00
parent a36dcee321
commit 968de6f0ea
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -23,7 +23,12 @@ SYSNAME:=$(shell uname -s)
ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32)
OS:=windows OS:=windows
GPERF:=/usr/bin/gperf GPERF:=/usr/bin/gperf
MINGW_DIR:=/mingw32 ifeq ($(findstring NT-6.2, $(SYSNAME)),NT-6.2)
BDIST_2KXP:=True
MINGW_DIR:=/usr/local
else
MINGW_DIR:=/mingw32
endif
else else
ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64) ifeq ($(findstring MINGW64, $(SYSNAME)),MINGW64)
OS:=windows OS:=windows
@ -888,6 +893,11 @@ install-dlls:
@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
@if [ "x$(BDIST_2KXP)" = "xTrue" ]; then \
mkdir -p $(BIN_PREFIX)/lib/pango/1.6.0/modules; \
cp /usr/local/lib/pango/1.6.0/modules/*.dll $(BIN_PREFIX)/lib/pango/1.6.0/modules; \
strip -s $(BIN_PREFIX)/lib/pango/1.6.0/modules/*.dll; \
fi
# Install symlink: # Install symlink:
.PHONY: install-haiku .PHONY: install-haiku

9
src/tuxpaint.c
View file

@ -455,7 +455,9 @@ static void mtw(wchar_t * wtok, char *tok)
#else #else
#include <librsvg/rsvg.h> #include <librsvg/rsvg.h>
/* #include <librsvg/rsvg-cairo.h> -- Deprecated */ #if defined (__MINGW32__) && (__GNUC__ <= 4 )
#include <librsvg/rsvg-cairo.h>
#endif
#if !defined(RSVG_H) || !defined(RSVG_CAIRO_H) #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
#error "---------------------------------------------------" #error "---------------------------------------------------"
@ -16915,8 +16917,11 @@ static void do_render_cur_text(int do_blit)
{ {
#if defined(_FRIBIDI_H) || defined(FRIBIDI_H) #if defined(_FRIBIDI_H) || defined(FRIBIDI_H)
//FriBidiCharType baseDir = FRIBIDI_TYPE_LTR; //FriBidiCharType baseDir = FRIBIDI_TYPE_LTR;
//FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal <shaiay@gmail.com>, 2009-01-14 */ #if defined (__MINGW32__) && (__GNUC__ <= 4 )
FriBidiCharType baseDir = FRIBIDI_TYPE_WL; /* Per: Shai Ayal <shaiay@gmail.com>, 2009-01-14 */
#else
FriBidiParType baseDir = FRIBIDI_TYPE_WL; //EP to avoid warning on types in now commented line above FriBidiParType baseDir = FRIBIDI_TYPE_WL; //EP to avoid warning on types in now commented line above
#endif
FriBidiChar *unicodeIn, *unicodeOut; FriBidiChar *unicodeIn, *unicodeOut;
unsigned int i; unsigned int i;