[Bf-committers] Compiling for Solaris with Sun CC, next round
Vladimír Marek
vlmarek at volny.cz
Thu Aug 23 15:51:09 CEST 2007
And the promissed patch :) It's not cleaned up, just to show where I am.
--
Vlad
-------------- next part --------------
diff -r e7743aac4228 compile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/compile Thu Aug 23 15:31:59 2007 +0200
@@ -0,0 +1,3 @@
+#J="-j 3"
+J=""
+/store/install/scons/bin/scons $J BF_QUIET=0
diff -r e7743aac4228 extern/qhull/SConscript
--- a/extern/qhull/SConscript Wed Aug 22 22:48:04 2007 +0200
+++ b/extern/qhull/SConscript Thu Aug 23 15:31:59 2007 +0200
@@ -12,7 +12,7 @@ elif env['OURPLATFORM']=='win32-mingw':
elif env['OURPLATFORM']=='win32-mingw':
cflags += ['-O2']
elif sys.platform=='sunos5':
- cflags += ['-O2', '-ansi']
+ cflags += []
elif sys.platform=='darwin':
cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
diff -r e7743aac4228 intern/elbeem/extern/elbeem.h
--- a/intern/elbeem/extern/elbeem.h Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/extern/elbeem.h Thu Aug 23 15:31:59 2007 +0200
@@ -10,6 +10,7 @@
#ifndef ELBEEM_API_H
#define ELBEEM_API_H
+/*#include <stdlib.h>*/
// simulation run callback function type (elbeemSimulationSettings->runsimCallback)
// best use with FLUIDSIM_CBxxx defines below.
diff -r e7743aac4228 intern/elbeem/intern/elbeem.h
--- a/intern/elbeem/intern/elbeem.h Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/elbeem.h Thu Aug 23 15:31:59 2007 +0200
@@ -10,6 +10,9 @@
#ifndef ELBEEM_API_H
#define ELBEEM_API_H
+/*
+#include <stdlib.h>
+*/
// simulation run callback function type (elbeemSimulationSettings->runsimCallback)
// best use with FLUIDSIM_CBxxx defines below.
diff -r e7743aac4228 intern/elbeem/intern/isosurface.cpp
--- a/intern/elbeem/intern/isosurface.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/isosurface.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -7,6 +7,7 @@
*
*****************************************************************************/
+#include <ieeefp.h> /* finite, on linux it needs <math.h> */
#include "isosurface.h"
#include "mcubes_tables.h"
#include "particletracer.h"
diff -r e7743aac4228 intern/elbeem/intern/simulation_object.cpp
--- a/intern/elbeem/intern/simulation_object.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/simulation_object.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -15,6 +15,7 @@
#include "solver_interface.h"
#include "particletracer.h"
#include "elbeem.h"
+#include <stdlib.h> /* exit(3) - also in linux */
#ifdef _WIN32
#else
diff -r e7743aac4228 intern/elbeem/intern/solver_adap.cpp
--- a/intern/elbeem/intern/solver_adap.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/solver_adap.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -7,6 +7,7 @@
*
*****************************************************************************/
+#include <ieeefp.h> /* finite, on linux it needs <math.h> */
#include "solver_class.h"
#include "solver_relax.h"
#include "particletracer.h"
diff -r e7743aac4228 intern/elbeem/intern/solver_interface.cpp
--- a/intern/elbeem/intern/solver_interface.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/solver_interface.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -17,6 +17,7 @@
#include "ntl_world.h"
#include "elbeem.h"
+#include <stdlib.h> /* getenv(3) - also in linux */
diff -r e7743aac4228 intern/elbeem/intern/solver_main.cpp
--- a/intern/elbeem/intern/solver_main.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/solver_main.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -7,6 +7,8 @@
*
*****************************************************************************/
+#include <ieeefp.h> /* finite, on linux it needs <math.h> */
+#include <stdlib.h> /* rand(3) - also in linux */
#include "solver_class.h"
#include "solver_relax.h"
#include "particletracer.h"
diff -r e7743aac4228 intern/elbeem/intern/solver_util.cpp
--- a/intern/elbeem/intern/solver_util.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/solver_util.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -14,6 +14,8 @@
// MPT
#include "ntl_world.h"
#include "simulation_object.h"
+
+#include <stdlib.h> /* rand(3) - also in linux */
#include <zlib.h>
#ifndef sqrtf
diff -r e7743aac4228 intern/elbeem/intern/utilities.cpp
--- a/intern/elbeem/intern/utilities.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/elbeem/intern/utilities.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -10,6 +10,7 @@
#include <iostream>
#include <sstream>
+#include <stdlib.h> /* getenv(3), strtol(3) - also in linux */
#ifdef WIN32
// for timing
#include <windows.h>
diff -r e7743aac4228 intern/ghost/intern/GHOST_WindowX11.cpp
--- a/intern/ghost/intern/GHOST_WindowX11.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -37,6 +37,8 @@
// For standard X11 cursors
#include <X11/cursorfont.h>
#include <X11/Xatom.h>
+
+#include <strings.h> /* strcasecmp(3) - also in linux */
// For obscure full screen mode stuuf
// lifted verbatim from blut.
diff -r e7743aac4228 intern/iksolver/intern/IK_QJacobianSolver.cpp
--- a/intern/iksolver/intern/IK_QJacobianSolver.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -33,6 +33,7 @@
#include "IK_QJacobianSolver.h"
//#include "analyze.h"
+#include <stdio.h> /* printf(3) - also in linux */
void IK_QJacobianSolver::AddSegmentList(IK_QSegment *seg)
{
diff -r e7743aac4228 intern/string/intern/STR_String.cpp
--- a/intern/string/intern/STR_String.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/intern/string/intern/STR_String.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -42,6 +42,7 @@
#include <stdlib.h>
#include <ctype.h>
#include "STR_String.h"
+#include <string.h> /* strcasecmp(3) - also in linux */
/*-------------------------------------------------------------------------------------------------
Construction / destruction
diff -r e7743aac4228 run
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/run Thu Aug 23 15:31:59 2007 +0200
@@ -0,0 +1,1 @@
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/intltool/gettext-tools/lib:/store/install/sdl/lib ../build/sunos5/bin/blender
diff -r e7743aac4228 source/blender/imbuf/intern/dds/BlockDXT.h
--- a/source/blender/imbuf/intern/dds/BlockDXT.h Wed Aug 22 22:48:04 2007 +0200
+++ b/source/blender/imbuf/intern/dds/BlockDXT.h Thu Aug 23 15:31:59 2007 +0200
@@ -144,24 +144,24 @@ struct AlphaBlockDXT5
{
union {
struct {
- unsigned long long alpha0 : 8; // 8
- unsigned long long alpha1 : 8; // 16
- unsigned long long bits0 : 3; // 3 - 19
- unsigned long long bits1 : 3; // 6 - 22
- unsigned long long bits2 : 3; // 9 - 25
- unsigned long long bits3 : 3; // 12 - 28
- unsigned long long bits4 : 3; // 15 - 31
- unsigned long long bits5 : 3; // 18 - 34
- unsigned long long bits6 : 3; // 21 - 37
- unsigned long long bits7 : 3; // 24 - 40
- unsigned long long bits8 : 3; // 27 - 43
- unsigned long long bits9 : 3; // 30 - 46
- unsigned long long bitsA : 3; // 33 - 49
- unsigned long long bitsB : 3; // 36 - 52
- unsigned long long bitsC : 3; // 39 - 55
- unsigned long long bitsD : 3; // 42 - 58
- unsigned long long bitsE : 3; // 45 - 61
- unsigned long long bitsF : 3; // 48 - 64
+ unsigned int alpha0 : 8; // 8
+ unsigned int alpha1 : 8; // 16
+ unsigned int bits0 : 3; // 3 - 19
+ unsigned int bits1 : 3; // 6 - 22
+ unsigned int bits2 : 3; // 9 - 25
+ unsigned int bits3 : 3; // 12 - 28
+ unsigned int bits4 : 3; // 15 - 31
+ unsigned int bits5 : 3; // 18 - 34
+ unsigned int bits6 : 3; // 21 - 37
+ unsigned int bits7 : 3; // 24 - 40
+ unsigned int bits8 : 3; // 27 - 43
+ unsigned int bits9 : 3; // 30 - 46
+ unsigned int bitsA : 3; // 33 - 49
+ unsigned int bitsB : 3; // 36 - 52
+ unsigned int bitsC : 3; // 39 - 55
+ unsigned int bitsD : 3; // 42 - 58
+ unsigned int bitsE : 3; // 45 - 61
+ unsigned int bitsF : 3; // 48 - 64
};
unsigned long long u;
};
diff -r e7743aac4228 source/gameengine/Ketsji/KX_RayCast.cpp
--- a/source/gameengine/Ketsji/KX_RayCast.cpp Wed Aug 22 22:48:04 2007 +0200
+++ b/source/gameengine/Ketsji/KX_RayCast.cpp Thu Aug 23 15:31:59 2007 +0200
@@ -32,6 +32,7 @@
*/
#include <stdlib.h>
+//#include <stdio.h>
#include "KX_RayCast.h"
diff -r e7743aac4228 user-config-gcc.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/user-config-gcc.py Thu Aug 23 15:31:59 2007 +0200
@@ -0,0 +1,10 @@
+WITH_BF_OPENAL = 'false'
+BF_FREETYPE = '/usr/sfw'
+BF_PYTHON = '/usr'
+BF_SDL = '/store/install/sdl'
+WITH_BF_OPENEXR = 'false'
+BF_GETTEXT = '/usr/lib/intltool/gettext-tools'
+
+PLATFORM_LINKFLAGS = ['-lsocket']
+
+CXX=gcc
diff -r e7743aac4228 user-config.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/user-config.py Thu Aug 23 15:31:59 2007 +0200
@@ -0,0 +1,28 @@
+WITH_BF_OPENAL = 'false'
+BF_FREETYPE = '/usr/sfw'
+BF_PYTHON = '/usr'
+BF_PYTHON_VERSION = '2.4'
+BF_SDL = '/store/install/sdl'
+WITH_BF_OPENEXR = 'false'
+WITH_BF_ICONV = 'false'
+BF_GETTEXT = '/usr/lib/intltool/gettext-tools'
+
+PLATFORM_LINKFLAGS = ['-lsocket', '-library=stlport4', '-R/usr/lib/intltool/gettext-tools/lib', '-R/blender']
+
+CC = '/store/build_environment/compiler/12_i386/SUNWspro/bin/cc'
+CXX = '/store/build_environment/compiler/12_i386/SUNWspro/bin/CC'
+
+#CC = '/usr/dist/share/sunstudio_i386/SUNWspro/bin/cc'
+#CXX = '/usr/dist/share/sunstudio_i386/SUNWspro/bin/CC'
+
+CCFLAGS = ['-KPIC', '-DPIC', '-fast', '-xchar=unsigned', '-library=stlport4', '-features=extensions' ]
+CXXFLAGS = ['-KPIC', '-DPIC', '-fast', '-xchar=unsigned', '-library=stlport4', '-features=extensions' ]
+CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS']
+
+REL_CFLAGS = []
+REL_CCFLAGS = []
+
+BF_PYTHON_LINKFLAGS = []
+
+C_WARN = '-errtags=yes -features=extensions -library=stlport4'
+CC_WARN = '-errtags=yes -features=extensions -library=stlport4'
More information about the Bf-committers
mailing list