forked from bartvdbraak/blender
remove support for irix
This commit is contained in:
Campbell Barton
parent
b4907ced60
commit
4b449aefea
@ -48,7 +48,7 @@ def get_platform(filename):
|
||||
tokens = filename.split("-")
|
||||
platforms = ('osx', 'mac', 'bsd',
|
||||
'win', 'linux', 'source',
|
||||
'irix', 'solaris')
|
||||
'solaris')
|
||||
platform_tokens = []
|
||||
found = False
|
||||
|
||||
|
||||
@ -1,208 +0,0 @@
|
||||
import os
|
||||
|
||||
LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips"
|
||||
LIBDIR = LCGDIR
|
||||
|
||||
BF_PYTHON = LCGDIR+'/python'
|
||||
BF_PYTHON_VERSION = '3.2'
|
||||
WITH_BF_STATICPYTHON = 'true'
|
||||
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
|
||||
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
|
||||
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
|
||||
BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
|
||||
BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
|
||||
|
||||
WITH_BF_OPENAL = 'true'
|
||||
WITH_BF_STATICOPENAL = 'true'
|
||||
BF_OPENAL = LCGDIR+'/openal'
|
||||
BF_OPENAL_INC = '${BF_OPENAL}/include'
|
||||
BF_OPENAL_LIB = 'openal'
|
||||
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
|
||||
BF_OPENAL_LIBPATH = LIBDIR + '/lib'
|
||||
|
||||
BF_CXX = '/usr'
|
||||
WITH_BF_STATICCXX = 'false'
|
||||
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
|
||||
|
||||
BF_LIBSAMPLERATE = LCGDIR+'/samplerate'
|
||||
BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
|
||||
BF_LIBSAMPLERATE_LIB = 'samplerate'
|
||||
BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
|
||||
|
||||
WITH_BF_SDL = 'true'
|
||||
BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
|
||||
BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
|
||||
BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
|
||||
BF_SDL_LIBPATH = '${BF_SDL}/lib'
|
||||
|
||||
WITH_BF_OPENEXR = 'false'
|
||||
WITH_BF_STATICOPENEXR = 'false'
|
||||
BF_OPENEXR = '/usr'
|
||||
# when compiling with your own openexr lib you might need to set...
|
||||
# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
|
||||
|
||||
BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
|
||||
BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
|
||||
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
|
||||
# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
|
||||
|
||||
|
||||
WITH_BF_DDS = 'false'
|
||||
|
||||
WITH_BF_JPEG = 'false'
|
||||
BF_JPEG = LCGDIR+'/jpeg'
|
||||
BF_JPEG_INC = '${BF_JPEG}/include'
|
||||
BF_JPEG_LIB = 'jpeg'
|
||||
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
|
||||
|
||||
WITH_BF_PNG = 'false'
|
||||
BF_PNG = LCGDIR+"/png"
|
||||
BF_PNG_INC = '${BF_PNG}/include'
|
||||
BF_PNG_LIB = 'png'
|
||||
BF_PNG_LIBPATH = '${BF_PNG}/lib'
|
||||
|
||||
BF_TIFF = '/usr/nekoware'
|
||||
BF_TIFF_INC = '${BF_TIFF}/include'
|
||||
|
||||
WITH_BF_ZLIB = 'true'
|
||||
BF_ZLIB = LCGDIR+"/zlib"
|
||||
BF_ZLIB_INC = '${BF_ZLIB}/include'
|
||||
BF_ZLIB_LIB = 'z'
|
||||
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
|
||||
|
||||
WITH_BF_INTERNATIONAL = 'true'
|
||||
|
||||
BF_GETTEXT = LCGDIR+'/gettext'
|
||||
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
|
||||
BF_GETTEXT_LIB = 'gettextpo intl'
|
||||
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
|
||||
|
||||
WITH_BF_GAMEENGINE='false'
|
||||
WITH_BF_PLAYER = 'false'
|
||||
|
||||
WITH_BF_BULLET = 'true'
|
||||
BF_BULLET = '#extern/bullet2/src'
|
||||
BF_BULLET_INC = '${BF_BULLET}'
|
||||
BF_BULLET_LIB = 'extern_bullet'
|
||||
|
||||
#WITH_BF_NSPR = 'true'
|
||||
#BF_NSPR = $(LIBDIR)/nspr
|
||||
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
|
||||
#BF_NSPR_LIB =
|
||||
|
||||
# Uncomment the following line to use Mozilla inplace of netscape
|
||||
#CPPFLAGS += -DMOZ_NOT_NET
|
||||
# Location of MOZILLA/Netscape header files...
|
||||
#BF_MOZILLA = $(LIBDIR)/mozilla
|
||||
#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
|
||||
#BF_MOZILLA_LIB =
|
||||
# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
|
||||
# if this is not set.
|
||||
#
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
#BF_PARANOID = 'true'
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
BF_FREETYPE = LCGDIR+'/freetype'
|
||||
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
|
||||
BF_FREETYPE_LIB = 'freetype'
|
||||
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
|
||||
|
||||
WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
|
||||
BF_QUICKTIME = '/usr/local'
|
||||
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
|
||||
|
||||
WITH_BF_ICONV = 'true'
|
||||
BF_ICONV = LIBDIR + "/iconv"
|
||||
BF_ICONV_INC = '${BF_ICONV}/include'
|
||||
BF_ICONV_LIB = 'iconv charset'
|
||||
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
|
||||
|
||||
WITH_BF_BINRELOC = 'false'
|
||||
|
||||
# enable ffmpeg support
|
||||
WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
|
||||
# Uncomment the following two lines to use system's ffmpeg
|
||||
BF_FFMPEG = LCGDIR+'/ffmpeg'
|
||||
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z'
|
||||
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
|
||||
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
|
||||
|
||||
# enable ogg, vorbis and theora in ffmpeg
|
||||
WITH_BF_OGG = 'false' # -DWITH_OGG
|
||||
BF_OGG = '/usr'
|
||||
BF_OGG_INC = '${BF_OGG}/include'
|
||||
BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
|
||||
|
||||
WITH_BF_OPENJPEG = 'false'
|
||||
BF_OPENJPEG = '#extern/libopenjpeg'
|
||||
BF_OPENJPEG_LIB = ''
|
||||
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
|
||||
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
|
||||
|
||||
WITH_BF_REDCODE = 'false'
|
||||
BF_REDCODE = '#extern/libredcode'
|
||||
BF_REDCODE_LIB = ''
|
||||
BF_REDCODE_INC = '${BF_REDCODE}/include'
|
||||
BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
|
||||
|
||||
# Mesa Libs should go here if your using them as well....
|
||||
WITH_BF_STATICOPENGL = 'false'
|
||||
BF_OPENGL = '/usr'
|
||||
BF_OPENGL_INC = '${BF_OPENGL}/include'
|
||||
BF_OPENGL_LIB = 'GL GLU X11 Xi Xext'
|
||||
BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
|
||||
BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
|
||||
|
||||
|
||||
CC = 'c99'
|
||||
CXX = 'CC'
|
||||
|
||||
|
||||
CCFLAGS = ['-pipe','-fPIC', '-n32']
|
||||
|
||||
CPPFLAGS = []
|
||||
CXXFLAGS = ['-pipe','-fPIC', '-n32']
|
||||
REL_CFLAGS = ['-DNDEBUG', '-O2']
|
||||
REL_CCFLAGS = ['-DNDEBUG', '-O2']
|
||||
##BF_DEPEND = 'true'
|
||||
##
|
||||
##AR = ar
|
||||
##ARFLAGS = ruv
|
||||
##ARFLAGSQUIET = ru
|
||||
##
|
||||
C_WARN = ['-no_prelink', '-ptused']
|
||||
|
||||
CC_WARN = ['-no_prelink', '-ptused']
|
||||
|
||||
##FIX_STUBS_WARNINGS = -Wno-unused
|
||||
|
||||
LLIBS = 'c m dl pthread dmedia movie'
|
||||
##LOPTS = --dynamic
|
||||
##DYNLDFLAGS = -shared $(LDFLAGS)
|
||||
|
||||
BF_PROFILE_FLAGS = ['-pg','-g']
|
||||
BF_PROFILE = 'false'
|
||||
|
||||
BF_DEBUG = 'false'
|
||||
BF_DEBUG_CCFLAGS = ['-g']
|
||||
|
||||
BF_BUILDDIR = '../build/irix6'
|
||||
BF_INSTALLDIR='../install/irix6'
|
||||
|
||||
#Link against pthread
|
||||
LDIRS = []
|
||||
LDIRS.append(BF_FREETYPE_LIBPATH)
|
||||
LDIRS.append(BF_PNG_LIBPATH)
|
||||
LDIRS.append(BF_ZLIB_LIBPATH)
|
||||
LDIRS.append(BF_SDL_LIBPATH)
|
||||
LDIRS.append(BF_OPENAL_LIBPATH)
|
||||
LDIRS.append(BF_ICONV_LIBPATH)
|
||||
|
||||
PLATFORM_LINKFLAGS = []
|
||||
for x in LDIRS:
|
||||
PLATFORM_LINKFLAGS.append("-L"+x)
|
||||
|
||||
PLATFORM_LINKFLAGS += ['-L${LCGDIR}/jpeg/lib' , '-L/usr/lib32', '-n32', '-v', '-no_prelink']
|
||||
print PLATFORM_LINKFLAGS
|
||||
LINKFLAGS= PLATFORM_LINKFLAGS
|
||||
@ -26,7 +26,7 @@ if env['WITH_GHOST_SDL']:
|
||||
pass
|
||||
incs += ' ' + env['BF_SDL_INC']
|
||||
defs += ['WITH_GHOST_SDL']
|
||||
elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'):
|
||||
elif window_system in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'):
|
||||
for f in pf:
|
||||
try:
|
||||
sources.remove('intern' + os.sep + f + 'Win32.cpp')
|
||||
|
||||
@ -57,16 +57,6 @@
|
||||
#include <X11/XF86keysym.h>
|
||||
#endif
|
||||
|
||||
#ifdef __sgi
|
||||
|
||||
#if defined(_SGI_EXTRA_PREDEFINES) && !defined(NO_FAST_ATOMS)
|
||||
#include <X11/SGIFastAtom.h>
|
||||
#else
|
||||
#define XSGIFastInternAtom(dpy,string,fast_name,how) XInternAtom(dpy,string,how)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
// For timing
|
||||
|
||||
#include <sys/time.h>
|
||||
@ -98,16 +88,9 @@ GHOST_SystemX11(
|
||||
std::cerr << "Unable to open a display" << std::endl;
|
||||
abort(); //was return before, but this would just mean it will crash later
|
||||
}
|
||||
|
||||
#ifdef __sgi
|
||||
m_delete_window_atom
|
||||
= XSGIFastInternAtom(m_display,
|
||||
"WM_DELETE_WINDOW",
|
||||
SGI_XA_WM_DELETE_WINDOW, False);
|
||||
#else
|
||||
|
||||
m_delete_window_atom
|
||||
= XInternAtom(m_display, "WM_DELETE_WINDOW", True);
|
||||
#endif
|
||||
|
||||
m_wm_protocols= XInternAtom(m_display, "WM_PROTOCOLS", False);
|
||||
m_wm_take_focus= XInternAtom(m_display, "WM_TAKE_FOCUS", False);
|
||||
@ -630,7 +613,6 @@ GHOST_SystemX11::processEvent(XEvent *xe)
|
||||
{
|
||||
XClientMessageEvent & xcme = xe->xclient;
|
||||
|
||||
#ifndef __sgi
|
||||
if (((Atom)xcme.data.l[0]) == m_delete_window_atom) {
|
||||
g_event = new
|
||||
GHOST_Event(
|
||||
@ -638,10 +620,8 @@ GHOST_SystemX11::processEvent(XEvent *xe)
|
||||
GHOST_kEventWindowClose,
|
||||
window
|
||||
);
|
||||
} else
|
||||
#endif
|
||||
|
||||
if (((Atom)xcme.data.l[0]) == m_wm_take_focus) {
|
||||
}
|
||||
else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) {
|
||||
XWindowAttributes attr;
|
||||
Window fwin;
|
||||
int revert_to;
|
||||
|
||||
@ -25,6 +25,11 @@
|
||||
* Contributor(s): none yet.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file MEM_sys_types.h
|
||||
* \ingroup MEM
|
||||
*
|
||||
* A platform-independent definition of [u]intXX_t
|
||||
* Plus the accompanying header include for htonl/ntohl
|
||||
*
|
||||
@ -44,10 +49,6 @@
|
||||
// doxygen would get a conflict
|
||||
*/
|
||||
|
||||
/** \file MEM_sys_types.h
|
||||
* \ingroup MEM
|
||||
*/
|
||||
|
||||
#ifndef MEM_SYS_TYPES_H
|
||||
#define MEM_SYS_TYPES_H
|
||||
|
||||
@ -60,6 +61,7 @@ extern "C" {
|
||||
/* The __intXX are built-in types of the visual complier! So we don't
|
||||
* need to include anything else here. */
|
||||
|
||||
|
||||
typedef signed __int8 int8_t;
|
||||
typedef signed __int16 int16_t;
|
||||
typedef signed __int32 int32_t;
|
||||
@ -104,11 +106,12 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
|
||||
|
||||
#else
|
||||
|
||||
/* FreeBSD, Irix, Solaris */
|
||||
/* FreeBSD, Solaris */
|
||||
#include <sys/types.h>
|
||||
|
||||
#endif /* ifdef platform for types */
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef FREE_WINDOWS
|
||||
#ifndef htonl
|
||||
@ -122,7 +125,7 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
|
||||
#include <sys/param.h>
|
||||
#elif defined (__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#else /* irix sun linux */
|
||||
#else /* sun linux */
|
||||
#include <netinet/in.h>
|
||||
#endif /* ifdef platform for htonl/ntohl */
|
||||
|
||||
|
||||
@ -364,22 +364,9 @@ void *MEM_mapallocN(size_t len, const char *str)
|
||||
mem_lock_thread();
|
||||
|
||||
len = (len + 3 ) & ~3; /* allocate in units of 4 */
|
||||
|
||||
#ifdef __sgi
|
||||
{
|
||||
#include <fcntl.h>
|
||||
|
||||
int fd;
|
||||
fd = open("/dev/zero", O_RDWR);
|
||||
|
||||
memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
|
||||
PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
close(fd);
|
||||
}
|
||||
#else
|
||||
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
|
||||
PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
|
||||
#endif
|
||||
|
||||
if(memh!=(MemHead *)-1) {
|
||||
make_memhead_header(memh, len, str);
|
||||
|
||||
@ -25,6 +25,11 @@
|
||||
* Contributor(s): none yet.
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
/** \file superlu_sys_types.h
|
||||
* \ingroup opennl
|
||||
*
|
||||
* A platform-independent definition of [u]intXX_t
|
||||
* Plus the accompanying header include for htonl/ntohl
|
||||
*
|
||||
@ -37,10 +42,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/** \file superlu_sys_types.h
|
||||
* \ingroup opennl
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
// DG: original BLO_sys_types.h is in source/blender/blenkernel
|
||||
@ -99,29 +100,32 @@ typedef unsigned long uintptr_t;
|
||||
#include <inttypes.h>
|
||||
|
||||
#elif defined(FREE_WINDOWS)
|
||||
|
||||
/* define htoln here, there must be a syntax error in winsock2.h in MinGW */
|
||||
unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
|
||||
#include <stdint.h>
|
||||
|
||||
#else
|
||||
|
||||
/* FreeBSD, Irix, Solaris */
|
||||
/* FreeBSD, Solaris */
|
||||
#include <sys/types.h>
|
||||
|
||||
#endif /* ifdef platform for types */
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef FREE_WINDOWS
|
||||
#ifndef htonl
|
||||
#define htonl(x) correctByteOrder(x)
|
||||
#endif
|
||||
#ifndef ntohl
|
||||
#define ntohl(x) correctByteOrder(x)
|
||||
#endif
|
||||
#endif
|
||||
#elif defined (__FreeBSD__) || defined (__OpenBSD__)
|
||||
#include <sys/param.h>
|
||||
#elif defined (__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#else /* irix sun linux */
|
||||
#else /* sun linux */
|
||||
#include <netinet/in.h>
|
||||
#endif /* ifdef platform for htonl/ntohl */
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,34 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
# ***** BEGIN GPL LICENSE BLOCK *****
|
||||
#
|
||||
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
||||
# All rights reserved.
|
||||
#
|
||||
# The Original Code is: all of this file.
|
||||
#
|
||||
# Contributor(s): none yet.
|
||||
#
|
||||
# ***** END GPL LICENSE BLOCK *****
|
||||
#
|
||||
# OS specific stuff for the package, only to be executed by ../Makefile
|
||||
#
|
||||
|
||||
# Add icon to package
|
||||
cp -f extra/blender.icon $DISTDIR/
|
||||
@ -41,8 +41,6 @@ struct rctf;
|
||||
|
||||
#if defined _WIN32
|
||||
# define DO_INLINE __inline
|
||||
#elif defined (__sgi)
|
||||
# define DO_INLINE
|
||||
#elif defined (__sun) || defined (__sun__)
|
||||
# define DO_INLINE
|
||||
#else
|
||||
|
||||
@ -1155,8 +1155,8 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check)
|
||||
|
||||
void BLI_setenv(const char *env, const char*val)
|
||||
{
|
||||
/* SGI or free windows */
|
||||
#if (defined(__sgi) || ((defined(WIN32) || defined(WIN64)) && defined(FREE_WINDOWS)))
|
||||
/* free windows */
|
||||
#if (defined(WIN32) || defined(WIN64)) && defined(FREE_WINDOWS)
|
||||
char *envstr= MEM_mallocN(sizeof(char) * (strlen(env) + strlen(val) + 2), "envstr"); /* one for = another for \0 */
|
||||
|
||||
sprintf(envstr, "%s=%s", env, val);
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
|
||||
#if defined (__sun__) || defined (__sun) || defined (__NetBSD__)
|
||||
#include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
|
||||
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
|
||||
#include <sys/statfs.h>
|
||||
@ -165,7 +165,7 @@ double BLI_diskfree(const char *dir)
|
||||
return (double) (freec*bytesps*sectorspc);
|
||||
#else
|
||||
|
||||
#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
|
||||
#if defined (__sun__) || defined (__sun) || defined (__NetBSD__)
|
||||
struct statvfs disk;
|
||||
#else
|
||||
struct statfs disk;
|
||||
@ -187,7 +187,7 @@ double BLI_diskfree(const char *dir)
|
||||
if (statfs(name, &disk)) return(-1);
|
||||
#endif
|
||||
|
||||
#if defined (__sun__) || defined (__sun) || defined (__sgi) || defined (__NetBSD__)
|
||||
#if defined (__sun__) || defined (__sun) || defined (__NetBSD__)
|
||||
if (statvfs(name, &disk)) return(-1);
|
||||
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
|
||||
/* WARNING - This may not be supported by geeneric unix os's - Campbell */
|
||||
|
||||
@ -318,8 +318,6 @@ int BLI_system_thread_count( void )
|
||||
mib[1] = HW_NCPU;
|
||||
len = sizeof(t);
|
||||
sysctl(mib, 2, &t, &len, NULL, 0);
|
||||
# elif defined(__sgi)
|
||||
t = sysconf(_SC_NPROC_ONLN);
|
||||
# else
|
||||
t = (int)sysconf(_SC_NPROCESSORS_ONLN);
|
||||
# endif
|
||||
|
||||
@ -99,7 +99,7 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
|
||||
|
||||
#else
|
||||
|
||||
/* FreeBSD, Irix, Solaris */
|
||||
/* FreeBSD, Solaris */
|
||||
#include <sys/types.h>
|
||||
|
||||
#endif /* ifdef platform for types */
|
||||
@ -118,7 +118,7 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
|
||||
#include <sys/param.h>
|
||||
#elif defined (__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#else /* irix sun linux */
|
||||
#else /* sun linux */
|
||||
#include <netinet/in.h>
|
||||
#endif /* ifdef platform for htonl/ntohl */
|
||||
|
||||
|
||||
@ -279,18 +279,7 @@ void setlinestyle(int nr)
|
||||
void set_inverted_drawing(int enable)
|
||||
{
|
||||
glLogicOp(enable?GL_INVERT:GL_COPY);
|
||||
|
||||
/* Use GL_BLEND_EQUATION_EXT on sgi (if we have it),
|
||||
* apparently GL_COLOR_LOGIC_OP doesn't work on O2?
|
||||
* Is this an sgi bug or our bug?
|
||||
*/
|
||||
#if defined(__sgi) && defined(GL_BLEND_EQUATION_EXT)
|
||||
glBlendEquationEXT(enable?GL_LOGIC_OP:GL_FUNC_ADD_EXT);
|
||||
glToggle(GL_BLEND, enable);
|
||||
#else
|
||||
glToggle(GL_COLOR_LOGIC_OP, enable);
|
||||
#endif
|
||||
|
||||
glToggle(GL_DITHER, !enable);
|
||||
}
|
||||
|
||||
|
||||
@ -114,109 +114,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/****/
|
||||
|
||||
#ifdef __sgi
|
||||
|
||||
#include <dmedia/moviefile.h>
|
||||
|
||||
static void movie_printerror(char * str) {
|
||||
const char * errstr = mvGetErrorStr(mvGetErrno());
|
||||
|
||||
if (str) {
|
||||
if (errstr) printf("%s: %s\n", str, errstr);
|
||||
else printf("%s: returned error\n", str);
|
||||
} else printf("%s\n", errstr);
|
||||
}
|
||||
|
||||
static int startmovie(struct anim * anim) {
|
||||
if (anim == 0) return(-1);
|
||||
|
||||
if ( mvOpenFile (anim->name, O_BINARY|O_RDONLY, &anim->movie ) != DM_SUCCESS ) {
|
||||
printf("Can't open movie: %s\n", anim->name);
|
||||
return(-1);
|
||||
}
|
||||
if ( mvFindTrackByMedium (anim->movie, DM_IMAGE, &anim->track) != DM_SUCCESS ) {
|
||||
printf("No image track in movie: %s\n", anim->name);
|
||||
mvClose(anim->movie);
|
||||
return(-1);
|
||||
}
|
||||
|
||||
anim->duration = mvGetTrackLength (anim->track);
|
||||
anim->params = mvGetParams( anim->track );
|
||||
|
||||
anim->x = dmParamsGetInt( anim->params, DM_IMAGE_WIDTH);
|
||||
anim->y = dmParamsGetInt( anim->params, DM_IMAGE_HEIGHT);
|
||||
anim->interlacing = dmParamsGetEnum (anim->params, DM_IMAGE_INTERLACING);
|
||||
anim->orientation = dmParamsGetEnum (anim->params, DM_IMAGE_ORIENTATION);
|
||||
anim->framesize = dmImageFrameSize(anim->params);
|
||||
|
||||
anim->curposition = 0;
|
||||
anim->preseek = 0;
|
||||
|
||||
/*printf("x:%d y:%d size:%d interl:%d dur:%d\n", anim->x, anim->y, anim->framesize, anim->interlacing, anim->duration);*/
|
||||
return (0);
|
||||
}
|
||||
|
||||
static ImBuf * movie_fetchibuf(struct anim * anim, int position) {
|
||||
ImBuf * ibuf;
|
||||
/* extern rectcpy(); */
|
||||
int size;
|
||||
unsigned int *rect1, *rect2;
|
||||
|
||||
if (anim == 0) return (0);
|
||||
|
||||
ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
|
||||
|
||||
if ( mvReadFrames(anim->track, position, 1, ibuf->x * ibuf->y *
|
||||
sizeof(int), ibuf->rect ) != DM_SUCCESS ) {
|
||||
movie_printerror("mvReadFrames");
|
||||
IMB_freeImBuf(ibuf);
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
if (anim->interlacing == DM_IMAGE_INTERLACED_EVEN) {
|
||||
rect1 = ibuf->rect + (ibuf->x * ibuf->y) - 1;
|
||||
rect2 = rect1 - ibuf->x;
|
||||
|
||||
for (size = ibuf->x * (ibuf->y - 1); size > 0; size--){
|
||||
*rect1-- = *rect2--;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (anim->interlacing == DM_IMAGE_INTERLACED_EVEN)
|
||||
{
|
||||
rect1 = ibuf->rect;
|
||||
rect2 = rect1 + ibuf->x;
|
||||
|
||||
for (size = ibuf->x * (ibuf->y - 1); size > 0; size--){
|
||||
*rect1++ = *rect2++;
|
||||
}
|
||||
}
|
||||
/*if (anim->orientation == DM_TOP_TO_BOTTOM) IMB_flipy(ibuf);*/
|
||||
|
||||
|
||||
return(ibuf);
|
||||
}
|
||||
|
||||
static void free_anim_movie(struct anim * anim) {
|
||||
if (anim == NULL) return;
|
||||
|
||||
if (anim->movie) {
|
||||
mvClose(anim->movie);
|
||||
anim->movie = NULL;
|
||||
}
|
||||
anim->duration = 0;
|
||||
}
|
||||
|
||||
int ismovie(char *name) {
|
||||
return (mvIsMovieFile(name) == DM_TRUE);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int ismovie(const char *UNUSED(name)) {
|
||||
return 0;
|
||||
}
|
||||
@ -226,7 +123,6 @@ static int startmovie(struct anim *UNUSED(anim)) { return 1; }
|
||||
static ImBuf * movie_fetchibuf(struct anim *UNUSED(anim), int UNUSED(position)) { return NULL; }
|
||||
static void free_anim_movie(struct anim *UNUSED(anim)) { ; }
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
# define PATHSEPERATOR '\\'
|
||||
|
||||
@ -66,8 +66,6 @@ const char *node_filter_label(struct bNode *node);
|
||||
// this is needed for inlining behaviour
|
||||
#if defined _WIN32
|
||||
# define DO_INLINE __inline
|
||||
#elif defined (__sgi)
|
||||
# define DO_INLINE
|
||||
#elif defined (__sun) || defined (__sun__)
|
||||
# define DO_INLINE
|
||||
#else
|
||||
|
||||
@ -46,12 +46,6 @@
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
/* for setuid / getuid */
|
||||
#ifdef __sgi
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
/* This little block needed for linking to Blender... */
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
@ -156,7 +150,7 @@ char btempdir[FILE_MAX];
|
||||
static void setCallbacks(void);
|
||||
|
||||
/* set breakpoints here when running in debug mode, useful to catch floating point errors */
|
||||
#if defined(__sgi) || defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
|
||||
#if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
|
||||
static void fpe_handler(int UNUSED(sig))
|
||||
{
|
||||
// printf("SIGFPE trapped\n");
|
||||
@ -365,7 +359,7 @@ static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
|
||||
|
||||
static int set_fpe(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
|
||||
{
|
||||
#if defined(__sgi) || defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
|
||||
#if defined(__linux__) || defined(_WIN32) || defined(OSX_SSE_FPE)
|
||||
/* zealous but makes float issues a heck of a lot easier to find!
|
||||
* set breakpoints on fpe_handler */
|
||||
signal(SIGFPE, fpe_handler);
|
||||
@ -1193,10 +1187,6 @@ int main(int argc, const char **argv)
|
||||
|
||||
BLI_argsParse(ba, 1, NULL, NULL);
|
||||
|
||||
#ifdef __sgi
|
||||
setuid(getuid()); /* end superuser */
|
||||
#endif
|
||||
|
||||
#if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
|
||||
G.background= 1; /* python module mode ALWAYS runs in background mode (for now) */
|
||||
#else
|
||||
|
||||
@ -32,11 +32,7 @@
|
||||
*/
|
||||
|
||||
|
||||
#if defined (__sgi)
|
||||
#include <math.h>
|
||||
#else
|
||||
#include <cmath>
|
||||
#endif
|
||||
|
||||
#include "SCA_LogicManager.h"
|
||||
#include "BL_ShapeActionActuator.h"
|
||||
|
||||
@ -33,12 +33,7 @@
|
||||
* \ingroup ketsji
|
||||
*/
|
||||
|
||||
|
||||
#if defined (__sgi)
|
||||
#include <math.h>
|
||||
#else
|
||||
#include <cmath>
|
||||
#endif
|
||||
|
||||
#include "KX_IpoActuator.h"
|
||||
#include "KX_GameObject.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user