|
1499
|
1 |
diff -ur SimGear-1.0.0.orig/simgear/compiler.h SimGear-1.0.0/simgear/compiler.h
|
|
|
2 |
--- SimGear-1.0.0.orig/simgear/compiler.h Sat Nov 17 08:35:44 2007
|
|
|
3 |
+++ SimGear-1.0.0/simgear/compiler.h Sun Nov 16 20:35:30 2008
|
|
|
4 |
@@ -324,6 +324,26 @@
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
#if defined (__sun)
|
|
|
8 |
+ // g++-3.0.x
|
|
|
9 |
+# define SG_EXPLICIT_FUNCTION_TMPL_ARGS
|
|
|
10 |
+# define SG_NEED_AUTO_PTR
|
|
|
11 |
+# define SG_MEMBER_TEMPLATES
|
|
|
12 |
+# define SG_NAMESPACES
|
|
|
13 |
+# define SG_HAVE_STD
|
|
|
14 |
+# define SG_HAVE_STREAMBUF
|
|
|
15 |
+# define SG_CLASS_PARTIAL_SPECIALIZATION
|
|
|
16 |
+# define SG_HAVE_STD_INCLUDES
|
|
|
17 |
+
|
|
|
18 |
+# define STL_ALGORITHM <algorithm>
|
|
|
19 |
+# define STL_FUNCTIONAL <functional>
|
|
|
20 |
+# define STL_IOMANIP <iomanip>
|
|
|
21 |
+# define STL_IOSTREAM <iostream>
|
|
|
22 |
+# define STL_ITERATOR <iterator>
|
|
|
23 |
+# define STL_FSTREAM <fstream>
|
|
|
24 |
+# define STL_STDEXCEPT <stdexcept>
|
|
|
25 |
+# define STL_STRING <string>
|
|
|
26 |
+# define STL_STRSTREAM <strstream>
|
|
|
27 |
+
|
|
|
28 |
# include <strings.h>
|
|
|
29 |
# include <memory.h>
|
|
|
30 |
# if defined ( __cplusplus )
|
|
|
31 |
diff -ur SimGear-1.0.0.orig/simgear/nasal/lib.c SimGear-1.0.0/simgear/nasal/lib.c
|
|
|
32 |
--- SimGear-1.0.0.orig/simgear/nasal/lib.c Sat Nov 17 08:35:44 2007
|
|
|
33 |
+++ SimGear-1.0.0/simgear/nasal/lib.c Sun Nov 16 20:58:45 2008
|
|
|
34 |
@@ -12,9 +12,12 @@
|
|
|
35 |
#include "nasal.h"
|
|
|
36 |
#include "code.h"
|
|
|
37 |
|
|
|
38 |
+#define __FUNCTION__ __func__
|
|
|
39 |
+
|
|
|
40 |
#define NEWSTR(c, s, l) naStr_fromdata(naNewString(c), s, l)
|
|
|
41 |
#define NEWCSTR(c, s) NEWSTR(c, s, strlen(s))
|
|
|
42 |
|
|
|
43 |
+
|
|
|
44 |
// Generic argument error, assumes that the symbol "c" is a naContext,
|
|
|
45 |
// and that the __FUNCTION__ string is of the form "f_NASALSYMBOL".
|
|
|
46 |
#define ARGERR() \
|
|
|
47 |
diff -ur SimGear-1.0.0.orig/simgear/nasal/mathlib.c SimGear-1.0.0/simgear/nasal/mathlib.c
|
|
|
48 |
--- SimGear-1.0.0.orig/simgear/nasal/mathlib.c Sat Nov 17 08:35:44 2007
|
|
|
49 |
+++ SimGear-1.0.0/simgear/nasal/mathlib.c Sun Nov 16 20:59:33 2008
|
|
|
50 |
@@ -3,6 +3,9 @@
|
|
|
51 |
|
|
|
52 |
#include "nasal.h"
|
|
|
53 |
|
|
|
54 |
+#define __FUNCTION__ __func__
|
|
|
55 |
+
|
|
|
56 |
+
|
|
|
57 |
// Toss a runtime error for any NaN or Inf values produced. Note that
|
|
|
58 |
// this assumes an IEEE 754 format.
|
|
|
59 |
#define VALIDATE(r) (valid(r.num) ? (r) : die(c, __FUNCTION__+2))
|
|
|
60 |
diff -ur SimGear-1.0.0.orig/simgear/props/Makefile.am SimGear-1.0.0/simgear/props/Makefile.am
|
|
|
61 |
--- SimGear-1.0.0.orig/simgear/props/Makefile.am Sat Nov 17 08:35:44 2007
|
|
|
62 |
+++ SimGear-1.0.0/simgear/props/Makefile.am Mon Nov 17 14:40:21 2008
|
|
|
63 |
@@ -9,7 +9,7 @@
|
|
|
64 |
|
|
|
65 |
libsgprops_a_SOURCES = \
|
|
|
66 |
condition.cxx \
|
|
|
67 |
- props.cxx \
|
|
|
68 |
+ Props.cxx \
|
|
|
69 |
props_io.cxx
|
|
|
70 |
|
|
|
71 |
noinst_PROGRAMS = props_test
|
|
|
72 |
diff -ur SimGear-1.0.0.orig/simgear/props/Makefile.in SimGear-1.0.0/simgear/props/Makefile.in
|
|
|
73 |
--- SimGear-1.0.0.orig/simgear/props/Makefile.in Tue Dec 11 06:37:23 2007
|
|
|
74 |
+++ SimGear-1.0.0/simgear/props/Makefile.in Mon Nov 17 15:35:41 2008
|
|
|
75 |
@@ -61,7 +61,7 @@
|
|
|
76 |
LIBRARIES = $(lib_LIBRARIES)
|
|
|
77 |
libsgprops_a_AR = $(AR) $(ARFLAGS)
|
|
|
78 |
libsgprops_a_LIBADD =
|
|
|
79 |
-am_libsgprops_a_OBJECTS = condition.$(OBJEXT) props.$(OBJEXT) \
|
|
|
80 |
+am_libsgprops_a_OBJECTS = condition.$(OBJEXT) Props.$(OBJEXT) \
|
|
|
81 |
props_io.$(OBJEXT)
|
|
|
82 |
libsgprops_a_OBJECTS = $(am_libsgprops_a_OBJECTS)
|
|
|
83 |
PROGRAMS = $(noinst_PROGRAMS)
|
|
|
84 |
@@ -212,7 +212,7 @@
|
|
|
85 |
|
|
|
86 |
libsgprops_a_SOURCES = \
|
|
|
87 |
condition.cxx \
|
|
|
88 |
- props.cxx \
|
|
|
89 |
+ Props.cxx \
|
|
|
90 |
props_io.cxx
|
|
|
91 |
|
|
|
92 |
props_test_SOURCES = props_test.cxx
|
|
|
93 |
diff -ur SimGear-1.0.0.orig/simgear/props/props.hxx SimGear-1.0.0/simgear/props/props.hxx
|
|
|
94 |
--- SimGear-1.0.0.orig/simgear/props/props.hxx Sat Nov 17 08:35:44 2007
|
|
|
95 |
+++ SimGear-1.0.0/simgear/props/props.hxx Mon Nov 17 15:02:08 2008
|
|
|
96 |
@@ -535,7 +535,8 @@
|
|
|
97 |
* Last used attribute
|
|
|
98 |
* Update as needed when enum Attribute is changed
|
|
|
99 |
*/
|
|
|
100 |
- static const int LAST_USED_ATTRIBUTE;
|
|
|
101 |
+ //static const int LAST_USED_ATTRIBUTE = TRACE_WRITE;
|
|
|
102 |
+ static const int LAST_USED_ATTRIBUTE ;
|
|
|
103 |
|
|
|
104 |
|
|
|
105 |
/**
|
|
|
106 |
diff -ur SimGear-1.0.0.orig/simgear/scene/sky/oursun.cxx SimGear-1.0.0/simgear/scene/sky/oursun.cxx
|
|
|
107 |
--- SimGear-1.0.0.orig/simgear/scene/sky/oursun.cxx Sat Nov 17 08:35:45 2007
|
|
|
108 |
+++ SimGear-1.0.0/simgear/scene/sky/oursun.cxx Mon Nov 17 15:31:49 2008
|
|
|
109 |
@@ -289,12 +289,14 @@
|
|
|
110 |
sun_tl->add( vb );
|
|
|
111 |
|
|
|
112 |
|
|
|
113 |
- ssgLeaf *sun =
|
|
|
114 |
+// funny when you are working on Sun.
|
|
|
115 |
+ //ssgLeaf *sun =
|
|
|
116 |
+ ssgLeaf *Thesun =
|
|
|
117 |
new ssgVtxTable ( GL_TRIANGLE_STRIP, sun_vl, NULL, sun_tl, sun_cl );
|
|
|
118 |
- sun->setState( sun_state );
|
|
|
119 |
+ Thesun->setState( sun_state );
|
|
|
120 |
|
|
|
121 |
- sun->setCallback( SSG_CALLBACK_PREDRAW, sgSunPreDraw );
|
|
|
122 |
- sun->setCallback( SSG_CALLBACK_POSTDRAW, sgSunPostDraw );
|
|
|
123 |
+ Thesun->setCallback( SSG_CALLBACK_PREDRAW, sgSunPreDraw );
|
|
|
124 |
+ Thesun->setCallback( SSG_CALLBACK_POSTDRAW, sgSunPostDraw );
|
|
|
125 |
|
|
|
126 |
|
|
|
127 |
|
|
|
128 |
@@ -408,7 +410,7 @@
|
|
|
129 |
|
|
|
130 |
sun_transform->addKid( ohalo );
|
|
|
131 |
sun_transform->addKid( ihalo );
|
|
|
132 |
- sun_transform->addKid( sun );
|
|
|
133 |
+ sun_transform->addKid( Thesun );
|
|
|
134 |
|
|
|
135 |
#ifdef FG_TEST_CHEESY_LENS_FLARE
|
|
|
136 |
// cheesy lens flair
|