Final BeOS updates used to created 0.9.19-cvs-2007.12.11 for BeOS x86.
This commit is contained in:
parent
344492dad4
commit
8014500811
4 changed files with 10 additions and 175 deletions
4
Makefile
4
Makefile
|
|
@ -7,7 +7,7 @@
|
||||||
# bill@newbreedsoftware.com
|
# bill@newbreedsoftware.com
|
||||||
# http://www.tuxpaint.org/
|
# http://www.tuxpaint.org/
|
||||||
|
|
||||||
# June 14, 2002 - December 6, 2007
|
# June 14, 2002 - December 11, 2007
|
||||||
|
|
||||||
|
|
||||||
# The version number, for release:
|
# The version number, for release:
|
||||||
|
|
@ -271,7 +271,7 @@ beos:
|
||||||
CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall" \
|
CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall" \
|
||||||
RSRC_CMD="xres -o tuxpaint src/tuxpaint.rsrc" \
|
RSRC_CMD="xres -o tuxpaint src/tuxpaint.rsrc" \
|
||||||
MIMESET_CMD="mimeset -f tuxpaint" \
|
MIMESET_CMD="mimeset -f tuxpaint" \
|
||||||
ARCH_LINKS="-L/boot/home/config/lib -lintl -lpng -lz -lbe -liconv" \
|
ARCH_LINKS="-lintl -lpng -lz -lbe -liconv" \
|
||||||
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=./lib/tuxpaint/plugins \
|
MAGIC_PREFIX=./lib/tuxpaint/plugins \
|
||||||
|
|
|
||||||
|
|
@ -1,169 +0,0 @@
|
||||||
## makefile generated by makemake ##
|
|
||||||
## BeOS Generic Makefile v2.2 ##
|
|
||||||
|
|
||||||
# For Tux Paint
|
|
||||||
# Marcin 'Shard' Konicki <shard at beosjournal.org>
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
# (See COPYING.txt)
|
|
||||||
#
|
|
||||||
# Last modified: 2006.Feb.17
|
|
||||||
|
|
||||||
## Application Specific Settings ---------------------------------------------
|
|
||||||
|
|
||||||
# specify the name of the binary
|
|
||||||
NAME= ../tuxpaint
|
|
||||||
|
|
||||||
# specify the type of binary
|
|
||||||
# APP: Application
|
|
||||||
# SHARED: Shared library or add-on
|
|
||||||
# STATIC: Static library archive
|
|
||||||
# DRIVER: Kernel Driver
|
|
||||||
TYPE= APP
|
|
||||||
## (makemake defaults to APP type) ##
|
|
||||||
|
|
||||||
# add support for new Pe and Eddie features
|
|
||||||
# to fill in generic makefile
|
|
||||||
|
|
||||||
#%{
|
|
||||||
# @src->@
|
|
||||||
|
|
||||||
# specify the source files to use
|
|
||||||
# full paths or paths relative to the makefile can be included
|
|
||||||
# all files, regardless of directory, will have their object
|
|
||||||
# files created in the common object directory.
|
|
||||||
# Note that this means this makefile will not work correctly
|
|
||||||
# if two source files with the same name (source.c or source.cpp)
|
|
||||||
# are included from different directories. Also note that spaces
|
|
||||||
# in folder names do not work well with this makefile.
|
|
||||||
SRCS= \
|
|
||||||
src/tuxpaint.c \
|
|
||||||
src/i18n.c \
|
|
||||||
src/BeOS_print.cpp
|
|
||||||
|
|
||||||
# specify the resource files to use
|
|
||||||
# full path or a relative path to the resource file can be used.
|
|
||||||
RSRCS= \
|
|
||||||
src/tuxpaint.rsrc
|
|
||||||
|
|
||||||
# @<-src@
|
|
||||||
#%}
|
|
||||||
|
|
||||||
# end support for Pe and Eddie
|
|
||||||
|
|
||||||
# specify additional libraries to link against
|
|
||||||
# there are two acceptable forms of library specifications
|
|
||||||
# - if your library follows the naming pattern of:
|
|
||||||
# libXXX.so or libXXX.a you can simply specify XXX
|
|
||||||
# library: libbe.so entry: be
|
|
||||||
#
|
|
||||||
# - if your library does not follow the standard library
|
|
||||||
# naming scheme you need to specify the path to the library
|
|
||||||
# and it's name
|
|
||||||
# library: my_lib.a entry: my_lib.a or path/my_lib.a
|
|
||||||
LIBS= \
|
|
||||||
z \
|
|
||||||
png \
|
|
||||||
intl \
|
|
||||||
SDL \
|
|
||||||
SDL_image \
|
|
||||||
SDL_mixer \
|
|
||||||
SDL_ttf \
|
|
||||||
root \
|
|
||||||
be
|
|
||||||
|
|
||||||
# specify additional paths to directories following the standard
|
|
||||||
# libXXX.so or libXXX.a naming scheme. You can specify full paths
|
|
||||||
# or paths relative to the makefile. The paths included may not
|
|
||||||
# be recursive, so include all of the paths where libraries can
|
|
||||||
# be found. Directories where source files are found are
|
|
||||||
# automatically included.
|
|
||||||
LIBPATHS= /boot/home/config/lib/
|
|
||||||
|
|
||||||
# additional paths to look for system headers
|
|
||||||
# thes use the form: #include <header>
|
|
||||||
# source file directories are NOT auto-included here
|
|
||||||
SYSTEM_INCLUDE_PATHS = \
|
|
||||||
/boot/home/config/include \
|
|
||||||
/boot/home/config/include/SDL
|
|
||||||
|
|
||||||
# additional paths to look for local headers
|
|
||||||
# thes use the form: #include "header"
|
|
||||||
# source file directories are automatically included
|
|
||||||
LOCAL_INCLUDE_PATHS = \
|
|
||||||
src/mouse/ \
|
|
||||||
src/
|
|
||||||
|
|
||||||
# specify the level of optimization that you desire
|
|
||||||
# NONE, SOME, FULL
|
|
||||||
OPTIMIZE= SOME
|
|
||||||
|
|
||||||
# specify any preprocessor symbols to be defined. The symbols will not
|
|
||||||
# have their values set automatically; you must supply the value (if any)
|
|
||||||
# to use. For example, setting DEFINES to "DEBUG=1" will cause the
|
|
||||||
# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG"
|
|
||||||
# would pass "-DDEBUG" on the compiler's command line.
|
|
||||||
DEFINES= CONFDIR="\".\"" DOC_PREFIX="\"./docs/\"" DATA_PREFIX="\"./data/\"" LOCALEDIR="\"./data/locale/\"" LARGE_MOUSE_SHAPES OLD_UPPERCASE_CODE
|
|
||||||
|
|
||||||
# specify special warning levels
|
|
||||||
# if unspecified default warnings will be used
|
|
||||||
# NONE = supress all warnings
|
|
||||||
# ALL = enable all warnings
|
|
||||||
WARNINGS =
|
|
||||||
|
|
||||||
# specify whether image symbols will be created
|
|
||||||
# so that stack crawls in the debugger are meaningful
|
|
||||||
# if TRUE symbols will be created
|
|
||||||
SYMBOLS =
|
|
||||||
|
|
||||||
# specify debug settings
|
|
||||||
# if TRUE will allow application to be run from a source-level
|
|
||||||
# debugger. Note that this will disable all optimzation.
|
|
||||||
DEBUGGER =
|
|
||||||
|
|
||||||
# specify additional compiler flags for all files
|
|
||||||
COMPILER_FLAGS =-fomit-frame-pointer -funroll-loops -pipe
|
|
||||||
|
|
||||||
# specify additional linker flags
|
|
||||||
LINKER_FLAGS =-Xlinker -s -Xlinker -x
|
|
||||||
|
|
||||||
# specify the version of this particular item
|
|
||||||
# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL")
|
|
||||||
# This may also be specified in a resource.
|
|
||||||
APP_VERSION =
|
|
||||||
|
|
||||||
# (for TYPE == DRIVER only) Specify desired location of driver in the /dev
|
|
||||||
# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will
|
|
||||||
# instruct the driverinstall rule to place a symlink to your driver's binary in
|
|
||||||
# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at
|
|
||||||
# /dev/video/usb when loaded. Default is "misc".
|
|
||||||
DRIVER_PATH =
|
|
||||||
|
|
||||||
## include the makefile-engine
|
|
||||||
include $(BUILDHOME)/etc/makefile-engine
|
|
||||||
|
|
||||||
clean-trans:
|
|
||||||
@rm -rf data/locale
|
|
||||||
|
|
||||||
# Build the translation files for gettext
|
|
||||||
|
|
||||||
translations:
|
|
||||||
@echo "creating translations";
|
|
||||||
@install -d data/locale;
|
|
||||||
@for a in `ls src/po/ -I*.in -I*.sh -I*.pot -ICVS` ; do \
|
|
||||||
echo $${a%.po}; \
|
|
||||||
install -d data/locale/$${a%.po}/LC_MESSAGES; \
|
|
||||||
msgfmt src/po/$$a -o data/locale/$${a%.po}/LC_MESSAGES/tuxpaint.mo; \
|
|
||||||
done;
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
$Id$
|
$Id$
|
||||||
|
|
||||||
June 14, 2002 - December 6, 2007
|
June 14, 2002 - December 11, 2007
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
@ -54,8 +54,10 @@
|
||||||
#define OLD_UPPERCASE_CODE
|
#define OLD_UPPERCASE_CODE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
|
#ifdef OLD_UPPERCASE_CODE
|
||||||
#include <wctype.h>
|
#include <wctype.h>
|
||||||
|
#elif __BEOS__
|
||||||
|
#include <wchar.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 6, 2007
|
June 14, 2002 - December 11, 2007
|
||||||
$Id$
|
$Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -221,8 +221,10 @@ char *strcasestr(const char *haystack, const char *needle)
|
||||||
|
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
||||||
#if !defined(OLD_UPPERCASE_CODE) || defined(__BEOS__)
|
#ifdef OLD_UPPERCASE_CODE
|
||||||
#include <wctype.h>
|
#include <wctype.h>
|
||||||
|
#elif __BEOS__
|
||||||
|
#include <wchar.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue