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

BeOS updates.

Browse source
This commit is contained in:
William Kendrick 2007-12-07 00:05:45 +00:00
parent c40cc5aad2
commit 344492dad4
8 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -463,7 +463,7 @@ install-beos:
CONFDIR=./src/ \ CONFDIR=./src/ \
ICON_PREFIX=. \ ICON_PREFIX=. \
X11_ICON_PREFIX=. \ X11_ICON_PREFIX=. \
LOCALE_PREFIX=/boot/home/config/share/locale \ LOCALE_PREFIX=./build/share/locale \
IM_PREFIX=./src \ IM_PREFIX=./src \
SVG_LIB= SVG_CFLAGS= NOSVGFLAG=NOSVG \ SVG_LIB= SVG_CFLAGS= NOSVGFLAG=NOSVG \
NOPANGOFLAG=NO_SDLPANGO SDL_PANGO_LIB= \ NOPANGOFLAG=NO_SDLPANGO SDL_PANGO_LIB= \
@ -472,7 +472,8 @@ install-beos:
MIMESET_CMD="mimeset -f tuxpaint" \ MIMESET_CMD="mimeset -f tuxpaint" \
ARCH_LINKS="-lintl -lpng -lz -lbe" \ ARCH_LINKS="-lintl -lpng -lz -lbe" \
ARCH_HEADERS="src/BeOS_print.h" \ ARCH_HEADERS="src/BeOS_print.h" \
ARCH_LIBS="obj/BeOS_print.o" ARCH_LIBS="obj/BeOS_print.o" \
MAGIC_PREFIX=./build/lib/tuxpaint/plugins
# "make install-win32" installs Tux Paint, but using MinGW/MSYS settings # "make install-win32" installs Tux Paint, but using MinGW/MSYS settings
# Suitable for development/testing in the MinGW/MSYS environment. # Suitable for development/testing in the MinGW/MSYS environment.
@ -885,7 +886,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \
$(SDL_LIBS) \ $(SDL_LIBS) \
$(SVG_LIB) \ $(SVG_LIB) \
$(PAPER_LIB) \ $(PAPER_LIB) \
-lm $(ARCH_LINKS) $(ARCH_LINKS)
@$(RSRC_CMD) @$(RSRC_CMD)
@$(MIMESET_CMD) @$(MIMESET_CMD)

5
docs/CHANGES.txt
View file

@ -9,7 +9,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2007.December.4 (0.9.19) 2007.December.6 (0.9.19)
* Localization Updates: * Localization Updates:
--------------------- ---------------------
* Danish translation * Danish translation
@ -26,7 +26,8 @@ $Id$
* Build System Improvements * Build System Improvements
------------------------- -------------------------
* Cleaned up some BeOS-related things; disabling SVG and Pango for BeOS. * Brought BeOS building up-to-date.
Begasus <Begasus@skynet.be>
* Bug Fixes * Bug Fixes
--------- ---------

11
magic/Makefile
View file

@ -6,7 +6,7 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# July 2007 - October 24, 2007 # July 2007 - December 6, 2007
SO_TYPE=so SO_TYPE=so
@ -59,6 +59,15 @@ clean:
@echo "Cleaning up the Magic plug-ins directory ($(PWD))" @echo "Cleaning up the Magic plug-ins directory ($(PWD))"
@-rm -f *.$(SO_TYPE) @-rm -f *.$(SO_TYPE)
# beos versions of the targets
beos:
make \
SO_TYPE=so \
PLUGIN_LIBS="$(SDL_LIBS) $(ARCH_LINKS) $(SDL_CFLAGS) $(TP_MAGIC_CFLAGS)"
# win32 versions of the targets # win32 versions of the targets
cleanwin32: cleanwin32:

2
src/fonts.h
View file

@ -8,7 +8,7 @@
// plan to rip this out as soon as it is considered stable // plan to rip this out as soon as it is considered stable
//#define THREADED_FONTS //#define THREADED_FONTS
#define FORKED_FONTS #define FORKED_FONTS
#ifdef WIN32 #if defined(WIN32) || defined(__BEOS__)
#undef FORKED_FONTS #undef FORKED_FONTS
#endif #endif

4
src/i18n.c
View file

@ -25,7 +25,7 @@
$Id$ $Id$
June 14, 2002 - July 26, 2007 June 14, 2002 - December 6, 2007
*/ */
#include <stdio.h> #include <stdio.h>
@ -54,7 +54,7 @@
#define OLD_UPPERCASE_CODE #define OLD_UPPERCASE_CODE
#endif #endif
#ifndef OLD_UPPERCASE_CODE #if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
#include <wctype.h> #include <wctype.h>
#endif #endif

2
src/i18n.h
View file

@ -10,7 +10,7 @@
$Id$ $Id$
June 14, 2002 - October 14, 2007 June 14, 2002 - December 6, 2007
*/ */

3
src/im.c
View file

@ -570,9 +570,12 @@ static int charmap_load(CHARMAP* cm, const char* path)
if(charmap_add(cm, section, buf, unicode, flag)) { if(charmap_add(cm, section, buf, unicode, flag)) {
size_t i = 0; size_t i = 0;
#ifndef __BEOS__
fwprintf(stderr, L"Unable to add sequence '%ls', unicode ", buf); fwprintf(stderr, L"Unable to add sequence '%ls', unicode ", buf);
for(i = 0; i < wcslen(unicode); i++) fwprintf(stderr, L"%04X ", (int)unicode[i]); for(i = 0; i < wcslen(unicode); i++) fwprintf(stderr, L"%04X ", (int)unicode[i]);
fwprintf(stderr, L"in section %d\n", section); fwprintf(stderr, L"in section %d\n", section);
#endif
error_code = 1; error_code = 1;
} }
} }

4
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 4, 2007 June 14, 2002 - December 6, 2007
$Id$ $Id$
*/ */
@ -221,7 +221,7 @@ char *strcasestr(const char *haystack, const char *needle)
#include <locale.h> #include <locale.h>
#ifndef OLD_UPPERCASE_CODE #if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
#include <wctype.h> #include <wctype.h>
#endif #endif