Menu
▾
▴
crystal-cvs
|
From: <the...@us...> - 2006-09-01 22:59:08
|
Revision: 25269
http://svn.sourceforge.net/crystal/?rev=25269&view=rev
Author: thebolt00
Date: 2006-09-01 15:58:58 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
- Marten fixed [ticket:7], invalid alpha modifier in shader light.xml technique 150.
Modified Paths:
--------------
CS/trunk/data/shader/light.xml
CS/trunk/docs/history.txt
Modified: CS/trunk/data/shader/light.xml
===================================================================
--- CS/trunk/data/shader/light.xml 2006-09-01 20:17:25 UTC (rev 25268)
+++ CS/trunk/data/shader/light.xml 2006-09-01 22:58:58 UTC (rev 25269)
@@ -70,12 +70,12 @@
<fp plugin="glfixed">
<fixedfp>
<layer>
- <alphasource num="0" source="texture" modifier="color" />
+ <alphasource num="0" source="texture" modifier="alpha" />
<alphaoperation operation="replace" />
</layer>
<layer>
- <alphasource num="0" source="texture" modifier="color" />
- <alphasource num="1" source="previous layer" modifier="color" />
+ <alphasource num="0" source="texture" modifier="alpha" />
+ <alphasource num="1" source="previous layer" modifier="alpha" />
<alphaoperation operation="modulate" scale="2" />
</layer>
</fixedfp>
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-01 20:17:25 UTC (rev 25268)
+++ CS/trunk/docs/history.txt 2006-09-01 22:58:58 UTC (rev 25269)
@@ -6,7 +6,10 @@
individual changes for each given day, however, are in normal (ascending)
chronological order.
-31-Aug-2005
+2-Sep-2006
+ - Marten fixed [ticket:7], invalid alpha modifier in shader
+ light.xml technique 150.
+31-Aug-2006
- Marten updated version numbers on trunk to reflect the fact that
the 1.0 branch have been created.
30-Aug-2006
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-02 14:16:21
|
Revision: 25270
http://svn.sourceforge.net/crystal/?rev=25270&view=rev
Author: thebolt00
Date: 2006-09-02 07:16:08 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
- Marten rewrote the OpenGL pixel format picker to enumerate all the values in strictly decreasing order. This should solve ticket:1.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/include/csplugincommon/opengl/glcommon2d.h
CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-01 22:58:58 UTC (rev 25269)
+++ CS/trunk/docs/history.txt 2006-09-02 14:16:08 UTC (rev 25270)
@@ -9,6 +9,9 @@
2-Sep-2006
- Marten fixed [ticket:7], invalid alpha modifier in shader
light.xml technique 150.
+ - Marten rewrote the OpenGL pixel format picker to enumerate
+ all the values in strictly decreasing order. This should solve
+ ticket:1.
31-Aug-2006
- Marten updated version numbers on trunk to reflect the fact that
the 1.0 branch have been created.
Modified: CS/trunk/include/csplugincommon/opengl/glcommon2d.h
===================================================================
--- CS/trunk/include/csplugincommon/opengl/glcommon2d.h 2006-09-01 22:58:58 UTC (rev 25269)
+++ CS/trunk/include/csplugincommon/opengl/glcommon2d.h 2006-09-02 14:16:08 UTC (rev 25270)
@@ -84,19 +84,39 @@
{
csGraphics2DGLCommon* parent;
- GLPixelFormat currentValues;
+ /*
size_t nextValueIndices[glpfvValueCount];
csArray<int> values[glpfvValueCount];
- bool currentValid;
+
char* order;
size_t orderPos;
- size_t orderNum;
+ size_t orderNum;*/
+ // Hold properties for a single pixelformat property
+ struct PixelFormatPropertySet
+ {
+ GLPixelFormatValue valueType;
+ size_t nextIndex;
+ size_t firstIndex;
+ csArray<int> possibleValues;
+ };
+
+ /* Pixel format properties, however this is _not_ indexed by
+ GLPixelFormatValue but sorted by order */
+ PixelFormatPropertySet pixelFormats[glpfvValueCount];
+
+ // Remapping table from real GLPixelFormatValue to index in table above
+ size_t pixelFormatIndexTable[glpfvValueCount];
+
+ GLPixelFormat currentValues;
+ bool currentValid;
+
void ReadStartValues ();
void ReadPickerValues ();
void ReadPickerValue (const char* valuesStr, csArray<int>& values);
void SetInitialIndices ();
+ void SetupIndexTable (const char* orderStr);
bool PickNextFormat ();
public:
csGLPixelFormatPicker (csGraphics2DGLCommon* parent);
Modified: CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp
===================================================================
--- CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp 2006-09-01 22:58:58 UTC (rev 25269)
+++ CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp 2006-09-02 14:16:08 UTC (rev 25270)
@@ -27,6 +27,7 @@
#include "ivaria/reporter.h"
#include "csgeom/csrect.h"
+#include "csgeom/math.h"
#include "csplugincommon/canvas/scrshot.h"
#include "csplugincommon/opengl/glcommon2d.h"
#include "csplugincommon/opengl/glstates.h"
@@ -905,16 +906,13 @@
csGraphics2DGLCommon::csGLPixelFormatPicker::csGLPixelFormatPicker(
- csGraphics2DGLCommon* parent) : order(0)
+ csGraphics2DGLCommon* parent) : parent (parent)
{
- csGLPixelFormatPicker::parent = parent;
-
Reset();
}
csGraphics2DGLCommon::csGLPixelFormatPicker::~csGLPixelFormatPicker()
{
- delete[] order;
}
void csGraphics2DGLCommon::csGLPixelFormatPicker::ReadStartValues ()
@@ -937,27 +935,45 @@
void csGraphics2DGLCommon::csGLPixelFormatPicker::ReadPickerValues ()
{
- order = csStrNew (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.ReductionOrder", "ACmasdc"));
- orderNum = strlen (order);
- orderPos = 0;
+ const char* order = parent->config->GetStr (
+ "Video.OpenGL.FormatPicker.ReductionOrder", "ACmasdc");
+ SetupIndexTable (order);
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.ColorBits"), values[glpfvColorBits]);
+ "Video.OpenGL.FormatPicker.ColorBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvColorBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.AlphaBits"), values[glpfvAlphaBits]);
+ "Video.OpenGL.FormatPicker.AlphaBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvAlphaBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.DepthBits"), values[glpfvDepthBits]);
+ "Video.OpenGL.FormatPicker.DepthBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvDepthBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.StencilBits"), values[glpfvStencilBits]);
+ "Video.OpenGL.FormatPicker.StencilBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvStencilBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.AccumColorBits"), values[glpfvAccumColorBits]);
+ "Video.OpenGL.FormatPicker.AccumColorBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvAccumColorBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.AccumAlphaBits"), values[glpfvAccumAlphaBits]);
+ "Video.OpenGL.FormatPicker.AccumAlphaBits"),
+ pixelFormats[pixelFormatIndexTable[glpfvAccumAlphaBits]].possibleValues);
+
ReadPickerValue (parent->config->GetStr (
- "Video.OpenGL.FormatPicker.MultiSamples"), values[glpfvMultiSamples]);
+ "Video.OpenGL.FormatPicker.MultiSamples"),
+ pixelFormats[pixelFormatIndexTable[glpfvMultiSamples]].possibleValues);
}
+template<class T>
+static int ReverseCompare(T const& r1, T const& r2)
+{
+ return csComparator<T,T>::Compare(r2,r1);
+}
+
void csGraphics2DGLCommon::csGLPixelFormatPicker::ReadPickerValue (
const char* valuesStr, csArray<int>& values)
{
@@ -984,90 +1000,127 @@
if (values.Length() == 0)
values.Push (0);
+
+ values.Sort (ReverseCompare<int>);
}
void csGraphics2DGLCommon::csGLPixelFormatPicker::SetInitialIndices ()
{
- for (size_t v = 0; v < glpfvValueCount; v++)
+ for (size_t format = 0; format < glpfvValueCount; ++format)
{
- size_t closestIndex = 0;
- int closestDiff = 0x7fffffff;
+ size_t formatIdx = pixelFormatIndexTable[format];
- for (size_t i = 0; i < values[v].Length(); i++)
+ const csArray<int>& values = pixelFormats[formatIdx].possibleValues;
+
+ size_t closestIndex = values.GetSize () - 1;
+
+ for (size_t i = 0; i < values.GetSize (); ++i)
{
- int currentDiff = values[v][i] - currentValues[v];
- if (abs (currentDiff) < closestDiff)
+ // find first which is less than value
+ if (values[i] <= currentValues[format])
{
- closestDiff = abs (currentDiff);
- closestIndex = i;
- if (currentDiff >= 0) closestIndex++;
+ closestIndex = i;
+ break;
}
- if (currentDiff == 0) break;
}
- nextValueIndices[v] = closestIndex;
+
+ //pixelFormats[formatIdx].firstIndex = csMin (firstIndex, values.GetSize () - 1);
+ pixelFormats[formatIdx].firstIndex = closestIndex;
+ pixelFormats[formatIdx].nextIndex = pixelFormats[formatIdx].firstIndex;
}
}
-bool csGraphics2DGLCommon::csGLPixelFormatPicker::PickNextFormat ()
+void csGraphics2DGLCommon::csGLPixelFormatPicker::SetupIndexTable (
+ const char* orderStr)
{
- size_t startOrderPos = orderPos;
+ size_t orderIdx = 0;
- bool formatPicked = false;
- do
+ while (*orderStr != 0 && orderIdx < glpfvValueCount)
{
- int nextValue = 0;
- switch (order[orderPos++])
+ char orderVal = *orderStr;
+
+ // Map character to value type
+ GLPixelFormatValue val = glpfvColorBits;
+ switch (orderVal)
{
- case 'c':
- nextValue = glpfvColorBits;
- break;
- case 'a':
- nextValue = glpfvAlphaBits;
- break;
- case 'd':
- nextValue = glpfvDepthBits;
- break;
- case 's':
- nextValue = glpfvStencilBits;
- break;
- case 'C':
- nextValue = glpfvAccumColorBits;
- break;
- case 'A':
- nextValue = glpfvAccumAlphaBits;
- break;
- case 'm':
- nextValue = glpfvMultiSamples;
- break;
- default:
- continue;
+ case 'c':
+ val = glpfvColorBits;
+ break;
+ case 'a':
+ val = glpfvAlphaBits;
+ break;
+ case 'd':
+ val = glpfvDepthBits;
+ break;
+ case 's':
+ val = glpfvStencilBits;
+ break;
+ case 'C':
+ val = glpfvAccumColorBits;
+ break;
+ case 'A':
+ val = glpfvAccumAlphaBits;
+ break;
+ case 'm':
+ val = glpfvMultiSamples;
+ break;
}
- const size_t nextIndex = nextValueIndices[nextValue];
- if (nextIndex < values[nextValue].Length())
+
+ //Now map orderIdx to val
+ pixelFormatIndexTable[val] = orderIdx;
+
+ //Set it to be this value too
+ pixelFormats[orderIdx].valueType = val;
+
+ orderStr++;
+ orderIdx++;
+ }
+}
+
+bool csGraphics2DGLCommon::csGLPixelFormatPicker::PickNextFormat ()
+{
+ bool formatPicked = false;
+
+ for (size_t i = 0; i < glpfvValueCount; ++i)
+ {
+ currentValues[pixelFormats[i].valueType] =
+ pixelFormats[i].possibleValues[pixelFormats[i].nextIndex];
+ }
+
+ // Increment
+ bool incComplete = true;
+ size_t indexToInc = 0;
+
+ do
+ {
+ pixelFormats[indexToInc].nextIndex++;
+ incComplete = true;
+
+ if (pixelFormats[indexToInc].nextIndex >=
+ pixelFormats[indexToInc].possibleValues.GetSize ())
{
- currentValues[nextValue] = values[nextValue][nextIndex];
- nextValueIndices[nextValue]++;
- formatPicked = true;
+ //roll around
+ pixelFormats[indexToInc].nextIndex = pixelFormats[indexToInc].firstIndex;
+ incComplete = false;
+ indexToInc++;
}
- }
- while ((startOrderPos != (orderPos = orderPos % orderNum)) &&
- !formatPicked);
- return formatPicked;
+ } while(!incComplete && indexToInc < glpfvValueCount);
+
+ return incComplete;
}
void csGraphics2DGLCommon::csGLPixelFormatPicker::Reset()
{
- delete[] order;
-
for (size_t v = 0; v < glpfvValueCount; v++)
{
- values[v].DeleteAll();
+ pixelFormats[v].possibleValues.DeleteAll();
}
ReadStartValues();
ReadPickerValues();
SetInitialIndices();
+ PickNextFormat ();
}
bool csGraphics2DGLCommon::csGLPixelFormatPicker::GetNextFormat (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-04 10:24:59
|
Revision: 25274
http://svn.sourceforge.net/crystal/?rev=25274&view=rev
Author: res2002
Date: 2006-09-04 03:24:47 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
res changed the configure program version check to support checking
the same program with different version numbers.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/mk/autoconf/progver.m4
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-03 15:24:38 UTC (rev 25273)
+++ CS/trunk/docs/history.txt 2006-09-04 10:24:47 UTC (rev 25274)
@@ -6,6 +6,9 @@
individual changes for each given day, however, are in normal (ascending)
chronological order.
+4-Sep-2006
+ - res changed the configure program version check to support checking
+ the same program with different version numbers.
2-Sep-2006
- Marten fixed [ticket:7], invalid alpha modifier in shader
light.xml technique 150.
Modified: CS/trunk/mk/autoconf/progver.m4
===================================================================
--- CS/trunk/mk/autoconf/progver.m4 2006-09-03 15:24:38 UTC (rev 25273)
+++ CS/trunk/mk/autoconf/progver.m4 2006-09-04 10:24:47 UTC (rev 25274)
@@ -167,15 +167,19 @@
CS_VCHK_RUNTH([CS_VCHK_PATCOUNT([$3])],
[cs_prog_$4_min_ver_[]i=`echo $cs_prog_$4_min_version${cs_prog_$4_min_suffix} | sed 'CS_VCHK_SEDEXPRNTH([CS_VCHK_RMALL([$3])], [i])'`
])
-cs_cv_prog_$4_version_ok=''
+AS_TR_SH([cs_cv_prog_$4_version_$2_ok])=''
CS_VCHK_RUNTH([CS_VCHK_PATCOUNT([$3])],
-[test -z "$cs_cv_prog_$4_version_ok" && { expr "$cs_prog_$4_is_ver_[]i" "$5" "$cs_prog_$4_min_ver_[]i" >/dev/null || cs_cv_prog_$4_version_ok=no ; }
-test -z "$cs_cv_prog_$4_version_ok" && { expr "$cs_prog_$4_min_ver_[]i" "$5" "$cs_prog_$4_is_ver_[]i" >/dev/null || cs_cv_prog_$4_version_ok=yes ; }
+[test -z "$AS_TR_SH([cs_cv_prog_$4_version_$2_ok])" \
+ && { expr "$cs_prog_$4_is_ver_[]i" "$5" "$cs_prog_$4_min_ver_[]i" >/dev/null \
+ || AS_TR_SH([cs_cv_prog_$4_version_$2_ok])=no ; }
+test -z "$AS_TR_SH([cs_cv_prog_$4_version_$2_ok])" \
+ && { expr "$cs_prog_$4_min_ver_[]i" "$5" "$cs_prog_$4_is_ver_[]i" >/dev/null \
+ || AS_TR_SH([cs_cv_prog_$4_version_$2_ok])=yes ; }
])
-AS_IF([test -z "$cs_cv_prog_$4_version_ok"], [cs_cv_prog_$4_version_ok=yes])
-cs_cv_prog_$4_version_ok_annotated="$cs_cv_prog_$4_version_ok"
+AS_IF([test -z "$AS_TR_SH([cs_cv_prog_$4_version_$2_ok])"], [AS_TR_SH([cs_cv_prog_$4_version_$2_ok])=yes])
+AS_TR_SH([cs_cv_prog_$4_version_$2_ok_annotated])="$AS_TR_SH([cs_cv_prog_$4_version_$2_ok])"
AS_IF([test -n "$cs_prog_$4_is_version"],
- [cs_cv_prog_$4_version_ok_annotated="$cs_cv_prog_$4_version_ok_annotated (version $cs_prog_$4_is_version)"])
+ [AS_TR_SH([cs_cv_prog_$4_version_$2_ok_annotated])="$AS_TR_SH([cs_cv_prog_$4_version_$2_ok_annotated]) (version $cs_prog_$4_is_version)"])
])
##############################################################################
@@ -201,7 +205,7 @@
##############################################################################
AC_DEFUN([CS_CHECK_PROG_VERSION],
[AC_CACHE_CHECK([if $1 version m4_default([$7],[>=]) $3],
- [AS_TR_SH([cs_cv_prog_$1_version_ok_annotated])],
+ [AS_TR_SH([cs_cv_prog_$1_version_$3_ok_annotated])],
[CS_VCHK_EXTRACTVERSION([$2], [$3], [$4], AS_TR_SH([$1]),
m4_default([$7],[>=]))])
-AS_IF([test "$AS_TR_SH([cs_cv_prog_$1_version_ok])" = yes], [$5], [$6])])
+AS_IF([test "$AS_TR_SH([cs_cv_prog_$1_version_$3_ok])" = yes], [$5], [$6])])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-04 11:21:48
|
Revision: 25275
http://svn.sourceforge.net/crystal/?rev=25275&view=rev
Author: res2002
Date: 2006-09-04 04:20:59 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
res separated the configure binutils recency check into it's own
macro.
res changed the --as-needed check to (a) only use --as-needed for
newer binutils versions (b) disable it by default.
Modified Paths:
--------------
CS/trunk/configure
CS/trunk/configure.ac
CS/trunk/docs/history.txt
CS/trunk/mk/autoconf/compiler.m4
Added Paths:
-----------
CS/trunk/mk/autoconf/checkbinutils.m4
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-04 10:24:47 UTC (rev 25274)
+++ CS/trunk/configure 2006-09-04 11:20:59 UTC (rev 25275)
@@ -1,11 +1,10 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.56 for crystalspace 1.1.
+# Generated by GNU Autoconf 2.59 for crystalspace 1.1.
#
# Report bugs to <cry...@li...>.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -22,9 +21,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -43,7 +43,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -229,10 +229,10 @@
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -313,7 +313,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES STRINGS ac_ct_STRINGS OBJCOPY ac_ct_OBJCOPY LIBTOOL_TEST ac_ct_LIBTOOL_TEST LIBTOOL_PATH LIBTOOL ac_ct_LIBTOOL CS_LT_APPLE APPLE_LIBTOOL MKDIR MKDIRS INSTALL TEXI2DVI TEXI2PDF DVIPS DVIPDF MAKEINFO DOXYGEN DOT ac_ct_DOT FLEX BISON HHC ac_ct_HHC SWIG JAM MAKE CSLIBS_CONFIG ac_ct_CSLIBS_CONFIG EGREP PERL PYTHON JAVA JAVAC ANT CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG ac_ct_PKG_CONFIG CONFIG_XXF86VM ac_ct_CONFIG_XXF86VM CONFIG_XAW ac_ct_CONFIG_XAW CONFIG_Z ac_ct_CONFIG_Z CONFIG_ZLIB ac_ct_CONFIG_ZLIB CONFIG_PNG ac_ct_CONFIG_PNG CONFIG_LIBPNG ac_ct_CONFIG_LIBPNG CONFIG_JPEG ac_ct_CONFIG_JPEG CONFIG_LIBJPEG ac_ct_CONFIG_LIBJPEG CONFIG_LCMS ac_ct_CONFIG_LCMS CONFIG_MNG ac_ct_CONFIG_MNG CONFIG_LIBMNG ac_ct_CONFIG_LIBMNG CONFIG_MIKMOD ac_ct_CONFIG_MIKMOD CONFIG_OGG ac_ct_CONFIG_OGG CONFIG_VORBIS ac_ct_CONFIG_VORBIS CONFIG_VORBISFILE ac_ct_CONFIG_VORBISFILE CONFIG_3DS ac_ct_CONFIG_3DS CONFIG_LIB3DS ac_ct_CONFIG_LIB3DS CONFIG_LIB3DS_120 ac_ct_CONFIG_LIB3DS_120 CONFIG_ODE ac_ct_CONFIG_ODE CONFIG_BULLET ac_ct_CONFIG_BULLET CONFIG_FREETYPE2 ac_ct_CONFIG_FREETYPE2 CONFIG_FREETYPE ac_ct_CONFIG_FREETYPE CONFIG_CAL3D ac_ct_CONFIG_CAL3D CONFIG_SDL ac_ct_CONFIG_SDL CONFIG_WX ac_ct_CONFIG_WX CONFIG_CEGUI ac_ct_CONFIG_CEGUI CONFIG_CEGUIBASE ac_ct_CONFIG_CEGUIBASE CONFIG_CG ac_ct_CONFIG_CG CONFIG_CGGL ac_ct_CONFIG_CGGL CONFIG_JACKASYN ac_ct_CONFIG_JACKASYN CONFIG_ASOUND ac_ct_CONFIG_ASOUND CONFIG_CACA ac_ct_CONFIG_CACA CONFIG_LIBCACA ac_ct_CONFIG_LIBCACA CONFIG_JS ac_ct_CONFIG_JS TTREE CONFIG_CPPUNIT ac_ct_CONFIG_CPPUNIT CONFIG_BFD ac_ct_CONFIG_BFD LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX LD ac_ct_LD CXXCPP RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES STRINGS ac_ct_STRINGS OBJCOPY ac_ct_OBJCOPY LIBTOOL_TEST ac_ct_LIBTOOL_TEST LIBTOOL_PATH LIBTOOL ac_ct_LIBTOOL CS_LT_APPLE APPLE_LIBTOOL MKDIR MKDIRS INSTALL TEXI2DVI TEXI2PDF DVIPS DVIPDF MAKEINFO DOXYGEN DOT ac_ct_DOT FLEX BISON HHC ac_ct_HHC SWIG JAM MAKE CSLIBS_CONFIG ac_ct_CSLIBS_CONFIG EGREP PERL PYTHON JAVA JAVAC ANT CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG ac_ct_PKG_CONFIG CONFIG_XXF86VM ac_ct_CONFIG_XXF86VM CONFIG_XAW ac_ct_CONFIG_XAW CONFIG_Z ac_ct_CONFIG_Z CONFIG_ZLIB ac_ct_CONFIG_ZLIB CONFIG_PNG ac_ct_CONFIG_PNG CONFIG_LIBPNG ac_ct_CONFIG_LIBPNG CONFIG_JPEG ac_ct_CONFIG_JPEG CONFIG_LIBJPEG ac_ct_CONFIG_LIBJPEG CONFIG_LCMS ac_ct_CONFIG_LCMS CONFIG_MNG ac_ct_CONFIG_MNG CONFIG_LIBMNG ac_ct_CONFIG_LIBMNG CONFIG_MIKMOD ac_ct_CONFIG_MIKMOD CONFIG_OGG ac_ct_CONFIG_OGG CONFIG_VORBIS ac_ct_CONFIG_VORBIS CONFIG_VORBISFILE ac_ct_CONFIG_VORBISFILE CONFIG_3DS ac_ct_CONFIG_3DS CONFIG_LIB3DS ac_ct_CONFIG_LIB3DS CONFIG_LIB3DS_120 ac_ct_CONFIG_LIB3DS_120 CONFIG_ODE ac_ct_CONFIG_ODE CONFIG_BULLET ac_ct_CONFIG_BULLET CONFIG_FREETYPE2 ac_ct_CONFIG_FREETYPE2 CONFIG_FREETYPE ac_ct_CONFIG_FREETYPE CONFIG_CAL3D ac_ct_CONFIG_CAL3D CONFIG_SDL ac_ct_CONFIG_SDL CONFIG_WX ac_ct_CONFIG_WX CONFIG_CEGUI ac_ct_CONFIG_CEGUI CONFIG_CEGUIBASE ac_ct_CONFIG_CEGUIBASE CONFIG_CG ac_ct_CONFIG_CG CONFIG_CGGL ac_ct_CONFIG_CGGL CONFIG_JACKASYN ac_ct_CONFIG_JACKASYN CONFIG_ASOUND ac_ct_CONFIG_ASOUND CONFIG_CACA ac_ct_CONFIG_CACA CONFIG_LIBCACA ac_ct_CONFIG_LIBCACA CONFIG_JS ac_ct_CONFIG_JS TTREE CONFIG_CPPUNIT ac_ct_CONFIG_CPPUNIT CONFIG_BFD ac_ct_CONFIG_BFD LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -672,7 +672,7 @@
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -712,10 +712,10 @@
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -723,13 +723,13 @@
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
@@ -738,7 +738,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -819,9 +819,9 @@
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -866,211 +866,160 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-as-needed Utilize --as-needed linker flag, if supported by
+ linker and if the used binutils version is recent
+ enough to support it properly (default NO)
--enable-static-baselibs
Link statically againts libgcc and libstdc++. Use
- with caution; enabling
- this option may cause
- issues when dynamically linking against other C++
- modules. (default NO)
+ with caution; enabling this option may cause issues
+ when dynamically linking against other C++ modules.
+ (default NO)
--enable-cpu-specific-optimizations=level
enable CPU-specific optimizations; recognized levels
- are `no',
- `minimum' or `min', `maximum' or `max'
- (default MINIMUM); the `minimum'
- option selects
+ are `no', `minimum' or `min', `maximum' or `max'
+ (default MINIMUM); the `minimum' option selects
optimizations which are likely to be supported by
reasonably modern hardware, thus making the
- resulting executables
- fairly portable; use the
- `maximum' option with caution since code for
- one
+ resulting executables fairly portable; use the
+ `maximum' option with caution since code for one
processor will not work with earlier processors (for
- example, Intel
- 686-specific code will not work with
+ example, Intel 686-specific code will not work with
a 586)
--enable-separate-debug-info
split debug information into separate files.
- (default YES if
- binutils >= 2.16 detected and not
- on Cygwin, otherwise default NO)
+ (default YES if binutils >= 2.17 detected and not on
+ Cygwin, otherwise default NO)
--enable-optimize-mode-debug-info
whether to enable debug information even in optimize
- builds.
- (default YES if separate debug information
- is enabled,
- otherwise default NO)
+ builds. (default YES if separate debug information
+ is enabled, otherwise default NO)
--enable-meta-info-embedding
store plugin meta-information directly inside plugin
- modules if
- supported by platform; if disabled,
- meta-information is stored in
- stand-alone .csplugin
+ modules if supported by platform; if disabled,
+ meta-information is stored in stand-alone .csplugin
files; this option is enabled by default for
non-Unix platforms and on Unix platforms with
- ELF-format object
- files; it is disabled by default
- on Unix platforms if ELF is not
- available and the
- project uses a non-GPL-compatible license (such
- as
+ ELF-format object files; it is disabled by default
+ on Unix platforms if ELF is not available and the
+ project uses a non-GPL-compatible license (such as
LGPL) since the non-ELF Unix embedding technology
- requires the
- GPL-licensed libbfd library; if ELF is
- not available, enable this
- option on Unix only if
- you are certain you want a GPL-licensed
- library
+ requires the GPL-licensed libbfd library; if ELF is
+ not available, enable this option on Unix only if
+ you are certain you want a GPL-licensed library
infecting your project
- --enable-optimize build with optimizations enabled (default YES);
- same as --enable-mode=optimize
- --enable-debug build with debugging information (default NO);
- same
+ --enable-optimize build with optimizations enabled (default YES); same
+ as --enable-mode=optimize
+ --enable-debug build with debugging information (default NO); same
as --enable-mode=debug
- --enable-profile build with profiling information (default NO);
- same
+ --enable-profile build with profiling information (default NO); same
as --enable-mode=profile
--enable-mode=mode set build mode; recognized modes are `optimize',
- `debug', `profile'
- (default OPTIMIZE)
+ `debug', `profile' (default OPTIMIZE)
--enable-ptmalloc enable the built-in ptmalloc which provides fast
- memory allocations,
- but may cause problems in rare
+ memory allocations, but may cause problems in rare
cases. (default YES)
--enable-extensive-memory-debugger
enable the extensive memory debugger which catches
- common memory
- management mistakes (default NO)
+ common memory management mistakes (default NO)
--enable-memory-tracker enable the memory tracker which checks memory usage
- per
- source file (default NO)
+ per source file (default NO)
--enable-ref-tracker enable the reference tracker which dumps information
-
- about leaked references (default NO)
+ about leaked references (default NO)
--enable-leak-guard enable the leak guard protection which warns about
- objects not freed
- at program exit (default NO)
+ objects not freed at program exit (default NO)
--enable-shared enable creation of shared libraries
(_EXPERIMENTAL_!) (default NO)
--enable-make-emulation enable emulation layer allowing project to be built
- with `make', in
- addition to `jam' (default YES)
+ with `make', in addition to `jam' (default YES)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-perl use Perl5 scripting interface (default NO)
- --without-python do not use
- Python scripting interface
+ --without-python do not use Python scripting interface
--with-java use Java scripting interface (default YES)
--with-x use the X Window System
--with-Xxf86vm=dir specify location of libXxf86vm if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-Xaw=dir specify location of libXaw if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-mesa use Mesa OpenGL library if available (default YES)
--with-z=dir specify location of libz if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-png=dir specify location of libpng if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-jpeg=dir specify location of libjpeg if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-lcms=dir specify location of liblcms if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-mng=dir specify location of libmng if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-mikmod=dir specify location of libmikmod if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-ogg=dir specify location of libogg if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-vorbis=dir specify location of libvorbis if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-vorbisfile=dir specify location of libvorbisfile if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-3ds=dir specify location of lib3ds if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-ode=dir specify location of libode if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-bullet=dir specify location of libbullet if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-freetype2=dir specify location of libfreetype2 if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-cal3d=dir specify location of libcal3d if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-sdl=dir specify location of libsdl if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-wx=dir specify location of libwx if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-CEGUI=dir specify location of libCEGUI if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-Cg=dir specify location of libCg if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-CgGL=dir specify location of libCgGL if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-jackasyn=dir specify location of libjackasyn if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-asound=dir specify location of libasound if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-caca=dir specify location of libcaca if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-js=dir specify location of libjs if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-cppunit=dir specify location of libcppunit if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
--with-bfd=dir specify location of libbfd if not detected
- automatically; searches
- dir/include, dir/lib, and
+ automatically; searches dir/include, dir/lib, and
dir
Some influential environment variables:
@@ -1122,13 +1071,46 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
if test -f $ac_srcdir/configure.gnu; then
@@ -1138,7 +1120,7 @@
echo
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
@@ -1152,10 +1134,9 @@
if $ac_init_version; then
cat <<\_ACEOF
crystalspace configure 1.1
-generated by GNU Autoconf 2.56
+generated by GNU Autoconf 2.59
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1167,7 +1148,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by crystalspace $as_me 1.1, which was
-generated by GNU Autoconf 2.56. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1244,19 +1225,19 @@
2)
ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
@@ -1290,12 +1271,12 @@
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
}
@@ -1324,7 +1305,7 @@
for ac_var in $ac_subst_files
do
eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1343,7 +1324,7 @@
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
+ rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1423,7 +1404,7 @@
# value.
ac_cache_corrupted=false
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1440,13 +1421,13 @@
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
@@ -1931,7 +1912,6 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1951,8 +1931,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -1972,23 +1952,23 @@
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
@@ -2062,8 +2042,8 @@
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
@@ -2088,7 +2068,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2139,7 +2118,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2159,15 +2137,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -2176,7 +2164,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2192,7 +2180,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2209,15 +2196,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -2226,7 +2223,7 @@
ac_cv_prog_cc_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2253,7 +2250,6 @@
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2281,6 +2277,16 @@
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2307,15 +2313,25 @@
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -2324,7 +2340,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
@@ -2352,19 +2368,28 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2372,14 +2397,13 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_declaration
#include <stdlib.h>
-$ac_declaration
int
main ()
{
@@ -2390,15 +2414,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2407,9 +2441,8 @@
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2426,15 +2459,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -2442,7 +2485,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2456,7 +2499,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2558,7 +2601,6 @@
LDFLAGS="$cs_lflags_test $cs_lflags_save"
LIBS="$cs_libs_test $cs_libs_save"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2575,15 +2617,25 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cs_build_ok=yes
else
@@ -2591,7 +2643,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
break
fi
@@ -2760,7 +2813,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2780,15 +2832,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -2797,7 +2859,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -2813,7 +2875,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2830,15 +2891,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
@@ -2847,7 +2918,7 @@
ac_cv_prog_cxx_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -2867,8 +2938,7 @@
fi
fi
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2876,14 +2946,13 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_declaration
#include <stdlib.h>
-$ac_declaration
int
main ()
{
@@ -2894,15 +2963,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2911,9 +2990,8 @@
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2930,15 +3008,25 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -2946,7 +3034,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -3059,7 +3147,6 @@
LDFLAGS="$cs_lflags_test $cs_lflags_save"
LIBS="$cs_libs_test $cs_libs_save"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3076,15 +3163,25 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cs_build_ok=yes
else
@@ -3092,7 +3189,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
break
fi
@@ -3202,7 +3300,6 @@
LDFLAGS="$cs_lflags_test $cs_lflags_save"
LIBS="$cs_libs_test $cs_libs_save"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3226,11 +3323,18 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
if { ac_try='grep "fPIC" conftest.err >/dev/null 2>&1'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -3248,7 +3352,8 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
break
fi
@@ -3295,7 +3400,323 @@
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ export PATH
+fi
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ld
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LD"; then
+ ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$LD" && break
+ done
+fi
+if test -z "$LD"; then
+ ac_ct_LD=$LD
+ for ac_prog in ld
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_LD"; then
+ ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_LD="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+ac_ct_LD=$ac_cv_prog_ac_ct_LD
+if test -n "$ac_ct_LD"; then
+ echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+echo "${ECHO_T}$ac_ct_LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$ac_ct_LD" && break
+done
+
+ LD=$ac_ct_LD
+fi
+
+ if test -n "$LD"; then
+ # binutils versions come in the flavors X.Y as well as X.Y.Z
+ echo "$as_me:$LINENO: checking if binutils version >= 2.17" >&5
+echo $ECHO_N "checking if binutils version >= 2.17... $ECHO_C" >&6
+if test "${cs_cv_prog_binutils_version_2_17_ok_annotated+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cs_prog_binutils_is_version=
+cs_prog_binutils_min_version=
+cs_prog_binutils_is_suffix=
+cs_prog_binutils_min_suffix=
+cs_prog_binutils_is_suffix_done=
+cs_prog_binutils_min_suffix_done=
+
+
+
+
+
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix= ; }
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0 ; }
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0 ; }
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0.0 ; }
+
+
+
+
+
+
+
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix= ; }
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0 ; }
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0 ; }
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0.0 ; }
+
+
+cs_prog_binutils_is_ver_1=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_is_ver_2=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_is_ver_3=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_is_ver_4=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_is_ver_5=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+
+cs_prog_binutils_min_ver_1=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_min_ver_2=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_min_ver_3=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_min_ver_4=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_min_ver_5=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+
+cs_cv_prog_binutils_version_2_17_ok=''
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_1" ">=" "$cs_prog_binutils_min_ver_1" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_1" ">=" "$cs_prog_binutils_is_ver_1" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_2" ">=" "$cs_prog_binutils_min_ver_2" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_2" ">=" "$cs_prog_binutils_is_ver_2" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_3" ">=" "$cs_prog_binutils_min_ver_3" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_3" ">=" "$cs_prog_binutils_is_ver_3" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_4" ">=" "$cs_prog_binutils_min_ver_4" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_4" ">=" "$cs_prog_binutils_is_ver_4" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_5" ">=" "$cs_prog_binutils_min_ver_5" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_5" ">=" "$cs_prog_binutils_is_ver_5" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ;...
[truncated message content] |
|
From: <re...@us...> - 2006-09-04 13:31:55
|
Revision: 25276
http://svn.sourceforge.net/crystal/?rev=25276&view=rev
Author: res2002
Date: 2006-09-04 06:31:46 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Typo fix
Modified Paths:
--------------
CS/trunk/configure
CS/trunk/mk/autoconf/compiler.m4
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-04 11:20:59 UTC (rev 25275)
+++ CS/trunk/configure 2006-09-04 13:31:46 UTC (rev 25276)
@@ -4586,7 +4586,7 @@
if test "$enable_as_needed" != "no"; then
- if test "cs_cv_binutils_2_17" = "yes"; then
+ if test "$cs_cv_binutils_2_17" = "yes"; then
echo "$as_me:$LINENO: checking if --as-needed is supported" >&5
echo $ECHO_N "checking if --as-needed is supported... $ECHO_C" >&6
if test "${cs_cv_prog_link_as_needed_ok+set}" = set; then
Modified: CS/trunk/mk/autoconf/compiler.m4
===================================================================
--- CS/trunk/mk/autoconf/compiler.m4 2006-09-04 11:20:59 UTC (rev 25275)
+++ CS/trunk/mk/autoconf/compiler.m4 2006-09-04 13:31:46 UTC (rev 25276)
@@ -121,7 +121,7 @@
[enable_as_needed=no])
AS_IF([test "$enable_as_needed" != "no"],
[AC_REQUIRE([CS_CHECK_BINUTILS_2_17])
- AS_IF([test "cs_cv_binutils_2_17" = "yes"],
+ AS_IF([test "$cs_cv_binutils_2_17" = "yes"],
[CS_EMIT_BUILD_FLAGS([if --as-needed is supported],
[cs_cv_prog_link_as_needed], [CS_CREATE_TUPLE([-Wl,--as-needed])], [C++],
[CMD.LINK], [+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-05 23:07:43
|
Revision: 25286
http://svn.sourceforge.net/crystal/?rev=25286&view=rev
Author: res2002
Date: 2006-09-05 16:07:20 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
res fixed the Java bindings to build again.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/include/bindings/java/javapost.i
CS/trunk/include/bindings/java/javapre.i
CS/trunk/include/iutil/eventh.h
CS/trunk/scripts/java/SimpleRoom.java
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-05 14:01:42 UTC (rev 25285)
+++ CS/trunk/docs/history.txt 2006-09-05 23:07:20 UTC (rev 25286)
@@ -6,6 +6,8 @@
individual changes for each given day, however, are in normal (ascending)
chronological order.
+5-Sep-2006
+ - res fixed the Java bindings to build again.
4-Sep-2006
- res changed the configure program version check to support checking
the same program with different version numbers.
Modified: CS/trunk/include/bindings/java/javapost.i
===================================================================
--- CS/trunk/include/bindings/java/javapost.i 2006-09-05 14:01:42 UTC (rev 25285)
+++ CS/trunk/include/bindings/java/javapost.i 2006-09-05 23:07:20 UTC (rev 25286)
@@ -23,59 +23,58 @@
static JavaVM * _the_jvm = 0;
%}
+%template(scfJEventHandler) scfImplementation1<_csJEventHandler, iEventHandler >;
%inline %{
- struct _csJEventHandler : public iEventHandler
+ struct _csJEventHandler : public scfImplementation1<_csJEventHandler,
+ iEventHandler>
{
- SCF_DECLARE_IBASE;
- _csJEventHandler () : my_jobject(0)
+ _csJEventHandler () : scfImplementationType (this), my_jobject(0)
{
- SCF_CONSTRUCT_IBASE(0);
- IncRef();
}
virtual ~_csJEventHandler ()
- {
- SCF_DESTRUCT_IBASE();
- DecRef();
- JNIEnv * env = 0;
- _the_jvm->AttachCurrentThread((void **)&env, NULL);
- env->DeleteGlobalRef(my_jobject);
- }
- static jobject _csJEventHandler_jobject;
- void _importJEventHandler ()
- {
- my_jobject = _csJEventHandler_jobject;
- }
+ {
+ JNIEnv * env = 0;
+ _the_jvm->AttachCurrentThread((void **)&env, NULL);
+ env->DeleteGlobalRef(my_jobject);
+ }
+ static jobject _csJEventHandler_jobject;
+ void _importJEventHandler ()
+ {
+ my_jobject = _csJEventHandler_jobject;
+ }
virtual bool HandleEvent (iEvent & event)
{
- try
- {
- return _HandleEvent(event);
- }
- catch (...)
- {
- JNIEnv * env = 0;
- _the_jvm->AttachCurrentThread((void **)&env, NULL);
- env->ExceptionClear();
- }
- return false;
- }
- bool _HandleEvent (iEvent & event)
- {
- JNIEnv * env = 0;
- _the_jvm->AttachCurrentThread((void **)&env, NULL);
- jclass event_class = env->FindClass("org/crystalspace3d/iEvent");
- jclass handler_class = env->FindClass("org/crystalspace3d/csJEventHandler");
- jmethodID event_ctr_mid = env->GetMethodID(event_class, "<init>", "(JZ)V");
- jmethodID handle_event_mid = env->GetMethodID(handler_class, "HandleEvent", "(Lorg/crystalspace3d/iEvent;)Z");
- jlong cptr = 0;
- *(iEvent **)&cptr = &event;
- jobject event_object = env->NewObject(event_class, event_ctr_mid, cptr, false);
- if (!event_object)
- return false;
- jboolean result = env->CallBooleanMethod(my_jobject, handle_event_mid, event_object);
- return result;
+ try
+ {
+ return _HandleEvent(event);
+ }
+ catch (...)
+ {
+ JNIEnv * env = 0;
+ _the_jvm->AttachCurrentThread((void **)&env, NULL);
+ env->ExceptionClear();
+ }
+ return false;
+ }
+ bool _HandleEvent (iEvent & event)
+ {
+ JNIEnv * env = 0;
+ _the_jvm->AttachCurrentThread((void **)&env, NULL);
+ jclass event_class = env->FindClass("org/crystalspace3d/iEvent");
+ jclass handler_class = env->FindClass("org/crystalspace3d/csJEventHandler");
+ jmethodID event_ctr_mid = env->GetMethodID(event_class, "<init>", "(JZ)V");
+ jmethodID handle_event_mid = env->GetMethodID(handler_class, "HandleEvent", "(Lorg/crystalspace3d/iEvent;)Z");
+ jlong cptr = 0;
+ *(iEvent **)&cptr = &event;
+ jobject event_object = env->NewObject(event_class, event_ctr_mid, cptr, false);
+ if (!event_object)
+ return false;
+ jboolean result = env->CallBooleanMethod(my_jobject, handle_event_mid, event_object);
+ return result;
}
+ CS_EVENTHANDLER_NAMES("crystalspace.java")
+ CS_EVENTHANDLER_NIL_CONSTRAINTS
private:
jobject my_jobject;
};
@@ -90,9 +89,6 @@
#ifndef CS_MINI_SWIG
%{
- SCF_IMPLEMENT_IBASE(_csJEventHandler)
- SCF_IMPLEMENT_IBASE_END
-
jobject _csJEventHandler::_csJEventHandler_jobject;
extern "C" {
@@ -111,80 +107,4 @@
%}
#endif // CS_MINI_SWIG
-/* Following doesn't work for unknown reason.
-// Unresoled symbols when loaded by JVM.
-%define MAKE_CONSTANT(type, name, value)
- type _csjConstant_ ## name() { return value; }
- %{ #define _csjConstant_ ## name() value %}
- %constant type mask = _csjConstant_ ## name();
-%enddef
-
-#undef CSMASK_Nothing
-MAKE_CONSTANT(int, CSMASK_Nothing, (1 << csevNothing))
-#undef CSMASK_FrameProcess
-MAKE_CONSTANT(int, CSMASK_FrameProcess, (CSMASK_Nothing))
-#undef CSMASK_Keyboard
-MAKE_CONSTANT(int, CSMASK_Keyboard, (1 << csevKeyboard))
-#undef CSMASK_MouseMove
-MAKE_CONSTANT(int, CSMASK_MouseMove, (1 << csevMouseMove))
-#undef CSMASK_MouseDown
-MAKE_CONSTANT(int, CSMASK_MouseDown, (1 << csevMouseDown))
-#undef CSMASK_MouseUp
-MAKE_CONSTANT(int, CSMASK_MouseUp, (1 << csevMouseUp))
-#undef CSMASK_MouseClick
-MAKE_CONSTANT(int, CSMASK_MouseClick, (1 << csevMouseClick))
-#undef CSMASK_MouseDoubleClick
-MAKE_CONSTANT(int, CSMASK_MouseDoubleClick, (1 << csevMouseDoubleClick))
-#undef CSMASK_JoystickMove
-MAKE_CONSTANT(int, CSMASK_JoystickMove, (1 << csevJoystickMove))
-#undef CSMASK_JoystickDown
-MAKE_CONSTANT(int, CSMASK_JoystickDown, (1 << csevJoystickDown))
-#undef CSMASK_JoystickUp
-MAKE_CONSTANT(int, CSMASK_JoystickUp, (1 << csevJoystickUp))
-#undef CSMASK_Command
-MAKE_CONSTANT(int, CSMASK_Command, (1 << csevCommand))
-#undef CSMASK_Broadcast
-MAKE_CONSTANT(int, CSMASK_Broadcast, (1 << csevBroadcast))
-#undef CSMASK_Mouse
-MAKE_CONSTANT(int, CSMASK_Mouse, (CSMASK_MouseMove | CSMASK_MouseDown | CSMASK_MouseUp | CSMASK_MouseClick | CSMASK_MouseDoubleClick))
-#undef CSMASK_Joystick
-MAKE_CONSTANT(int, CSMASK_Joystick, (CSMASK_JoystickMove | CSMASK_JoystickDown | CSMASK_JoystickUp))
-#undef CSMASK_Input
-MAKE_CONSTANT(int, CSMASK_Input, (CSMASK_Keyboard | CSMASK_Mouse | CSMASK_Joystick))
-*/
-
-#undef CSMASK_Nothing
-%constant int CSMASK_Nothing = 0x1;
-#undef CSMASK_FrameProcess
-%constant int CSMASK_FrameProcess = 0x1;
-#undef CSMASK_Keyboard
-%constant int CSMASK_Keyboard = 0x2;
-#undef CSMASK_MouseMove
-%constant int CSMASK_MouseMove = 0x4;
-#undef CSMASK_MouseDown
-%constant int CSMASK_MouseDown = 0x8;
-#undef CSMASK_MouseUp
-%constant int CSMASK_MouseUp = 0x10;
-#undef CSMASK_MouseClick
-%constant int CSMASK_MouseClick = 0x20;
-#undef CSMASK_MouseDoubleClick
-%constant int CSMASK_MouseDoubleClick = 0x40;
-#undef CSMASK_JoystickMove
-%constant int CSMASK_JoystickMove = 0x80;
-#undef CSMASK_JoystickDown
-%constant int CSMASK_JoystickDown = 0x100;
-#undef CSMASK_JoystickUp
-%constant int CSMASK_JoystickUp = 0x200;
-#undef CSMASK_Command
-%constant int CSMASK_Command = 0x400;
-#undef CSMASK_Broadcast
-%constant int CSMASK_Broadcast = 0x800;
-#undef CSMASK_Mouse
-%constant int CSMASK_Mouse = (CSMASK_MouseMove | CSMASK_MouseDown | CSMASK_MouseUp | CSMASK_MouseClick | CSMASK_MouseDoubleClick);
-#undef CSMASK_Joystick
-%constant int CSMASK_Joystick = (CSMASK_JoystickMove | CSMASK_JoystickDown | CSMASK_JoystickUp);
-#undef CSMASK_Input
-%constant int CSMASK_Input = (CSMASK_Keyboard | CSMASK_Mouse | CSMASK_Joystick);
-
#endif // SWIGJAVA
-
Modified: CS/trunk/include/bindings/java/javapre.i
===================================================================
--- CS/trunk/include/bindings/java/javapre.i 2006-09-05 14:01:42 UTC (rev 25285)
+++ CS/trunk/include/bindings/java/javapre.i 2006-09-05 23:07:20 UTC (rev 25286)
@@ -36,15 +36,6 @@
%include "enumsimple.swg"
#endif
-// Following are declared as constants here to prevent javac complaining about
-// finding a 'long' where an 'int' is expected.
-%constant int CS_CRYSTAL_PROTOCOL = 0x43533032;
-%constant int CS_MUSCLE_PROTOCOL = 0x504d3030;
-%constant int CS_XML_PROTOCOL = 0x584d4d30;
-%ignore CS_CRYSTAL_PROTOCOL;
-%ignore CS_MUSCLE_PROTOCOL;
-%ignore CS_XML_PROTOCOL;
-
%typemap(javabase) iBase "cspace";
%ignore operator[];
@@ -298,6 +289,17 @@
%enddef
ICONFIGMANAGER_JAVACODE
+#undef CSINITIALIZER_JAVACODE
+%define CSINITIALIZER_JAVACODE
+%typemap(javacode) csInitializer
+%{
+ public static boolean SetupEventHandler(iObjectRegistry arg0, iEventHandler arg1, long[] arg2) {
+ return _SetupEventHandler(arg0, arg1, arg2);
+ }
+%}
+%enddef
+CSINITIALIZER_JAVACODE
+
// Should probably be rewritten using csString for className
%typemap(in) (const char * iface, int iface_ver) (char className[1024])
{
@@ -358,4 +360,6 @@
%typemap(jstype) (int argc, char const * const argv []) "String[]"
%typemap(javain) (int argc, char const * const argv []) "$javainput"
+%include "arrays_java.i"
+
#endif // SWIGJAVA
Modified: CS/trunk/include/iutil/eventh.h
===================================================================
--- CS/trunk/include/iutil/eventh.h 2006-09-05 14:01:42 UTC (rev 25285)
+++ CS/trunk/include/iutil/eventh.h 2006-09-05 23:07:20 UTC (rev 25286)
@@ -163,9 +163,9 @@
* a class of event handlers abstractly without having any of them loaded.
*/
#define CS_EVENTHANDLER_NAMES(x) \
- CS_CONST_METHOD const static char * StaticHandlerName() \
+ CS_CONST_METHOD static const char * StaticHandlerName() \
{ return (x); } \
- CS_CONST_METHOD const static csHandlerID StaticID(csRef<iEventHandlerRegistry> ®) \
+ CS_CONST_METHOD static const csHandlerID StaticID(csRef<iEventHandlerRegistry> ®) \
{return reg->GetGenericID(StaticHandlerName()); } \
CS_CONST_METHOD virtual const char * GenericName() const \
{ return StaticHandlerName(); } \
Modified: CS/trunk/scripts/java/SimpleRoom.java
===================================================================
--- CS/trunk/scripts/java/SimpleRoom.java 2006-09-05 14:01:42 UTC (rev 25285)
+++ CS/trunk/scripts/java/SimpleRoom.java 2006-09-05 23:07:20 UTC (rev 25286)
@@ -81,6 +81,8 @@
protected csView view;
protected iKeyboardDriver kbd;
protected iVirtualClock vc;
+ protected long evPreProcess;
+ protected long evFinalProcess;
public EventHandler (csView v)
{
@@ -89,6 +91,8 @@
vc = r.vc;
kbd = r.kbd;
view = v;
+ evPreProcess = CS.csevPreProcess (CS.getTheObjectRegistry());
+ evFinalProcess = CS.csevFinalProcess (CS.getTheObjectRegistry());
}
protected void SetupFrame ()
@@ -97,17 +101,17 @@
long current_time = vc.GetCurrentTicks();
// Now rotate the camera according to keyboard state
float speed = (float) ((elapsed_time / 1000.) * (0.03 * 20));
- if (kbd.GetKeyState(CSKEY_RIGHT))
+ if (kbd.GetKeyState(CS.CSKEY_RIGHT))
view.GetCamera().GetTransform().RotateThis(CS.CS_VEC_ROT_RIGHT, speed);
- if (kbd.GetKeyState(CSKEY_LEFT))
+ if (kbd.GetKeyState(CS.CSKEY_LEFT))
view.GetCamera().GetTransform().RotateThis(CS.CS_VEC_ROT_LEFT, speed);
- if (kbd.GetKeyState(CSKEY_PGUP))
+ if (kbd.GetKeyState(CS.CSKEY_PGUP))
view.GetCamera().GetTransform().RotateThis(CS.CS_VEC_TILT_UP, speed);
- if (kbd.GetKeyState(CSKEY_PGDN))
+ if (kbd.GetKeyState(CS.CSKEY_PGDN))
view.GetCamera().GetTransform().RotateThis(CS.CS_VEC_TILT_DOWN, speed);
- if (kbd.GetKeyState(CSKEY_UP))
+ if (kbd.GetKeyState(CS.CSKEY_UP))
view.GetCamera().Move(CS.CS_VEC_FORWARD.multiply(4 * speed), true);
- if (kbd.GetKeyState(CSKEY_DOWN))
+ if (kbd.GetKeyState(CS.CSKEY_DOWN))
view.GetCamera().Move(CS.CS_VEC_BACKWARD.multiply(4 * speed), true);
// Move our object.
@@ -118,7 +122,7 @@
movable.UpdateMove();
// Tell 3D driver we're going to display 3D things.
- myG3D.BeginDraw(CSDRAW_3DGRAPHICS);
+ myG3D.BeginDraw(CS.CSDRAW_3DGRAPHICS);
view.Draw();
}
@@ -130,24 +134,23 @@
public boolean HandleEvent (iEvent ev)
{
- if (ev.getType() == csevKeyboard &&
- (csKeyEventHelper.GetEventType(ev) == csKeyEventTypeDown) &&
- (csKeyEventHelper.GetCookedCode(ev) == CSKEY_ESC))
+ if (CS.CS_IS_KEYBOARD_EVENT (CS.getTheObjectRegistry(), ev) &&
+ (csKeyEventHelper.GetEventType(ev) == CS.csKeyEventTypeDown) &&
+ (csKeyEventHelper.GetCookedCode(ev) == CS.CSKEY_ESC))
{
// escape key to quit
- iEventQueue q = (iEventQueue) CS_QUERY_REGISTRY(
- getTheObjectRegistry(), iEventQueue.class);
+ iEventQueue q = (iEventQueue) CS.CS_QUERY_REGISTRY(
+ CS.getTheObjectRegistry(), iEventQueue.class);
if (q != null)
{
- q.GetEventOutlet().Broadcast(cscmdQuit);
+ q.GetEventOutlet().Broadcast(CS.csevQuit(
+ CS.getTheObjectRegistry()));
return true;
}
}
- if (ev.getType() == csevBroadcast
- && csCommandEventHelper.GetCode(ev) == cscmdProcess)
+ else if (ev.getName() == evPreProcess)
SetupFrame();
- if (ev.getType() == csevBroadcast
- && csCommandEventHelper.GetCode(ev) == cscmdFinalProcess)
+ else if (ev.getName() == evFinalProcess)
FinishFrame();
return true;
}
@@ -188,7 +191,8 @@
iMaterialWrapper material = engine.GetMaterialList().FindByName(matname);
System.out.println("creating walls");
- iThingFactoryState fact = thingstate.GetFactory();
+ iThingFactoryState fact = (iThingFactoryState) SCF_QUERY_INTERFACE(
+ walls.GetFactory(), iThingFactoryState.class);
fact.AddInsideBox (
new csVector3(-5,0,-5),
new csVector3(5,20,5));
@@ -254,7 +258,6 @@
System.out.println("Application opened");
System.out.println("Creating the room...");
- int mask = (CSMASK_FrameProcess|CSMASK_Input|CSMASK_Broadcast);
CreateRoom();
System.out.println("Creating the objects...");
@@ -262,8 +265,9 @@
System.out.println("Setting up event handlers...");
EventHandler eventHandler = new EventHandler(view);
- result = csInitializer._SetupEventHandler(object_reg,
- eventHandler, mask);
+ long events[] = {CS.csevPreProcess (CS.getTheObjectRegistry()), 0};
+ result = csInitializer.SetupEventHandler(object_reg,
+ (iEventHandler)eventHandler, events);
System.out.println("Event handler added");
System.out.println("Starting the main runloop...");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2006-09-06 06:34:32
|
Revision: 25287
http://svn.sourceforge.net/crystal/?rev=25287&view=rev
Author: jorrit
Date: 2006-09-05 23:34:21 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
case the iWin32Assistant was gone already. Instead of that it
now just does a test and returns false in case the assistant
is gone. That way stuff can reset the mouse cursor during
destruction of Crystal Space.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/video/canvas/openglwin/oglg2d.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-05 23:07:20 UTC (rev 25286)
+++ CS/trunk/docs/history.txt 2006-09-06 06:34:21 UTC (rev 25287)
@@ -6,6 +6,13 @@
individual changes for each given day, however, are in normal (ascending)
chronological order.
+6-Sep-2006
+ - Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
+ It would assert (in debug mode) or crash (in release mode) in
+ case the iWin32Assistant was gone already. Instead of that it
+ now just does a test and returns false in case the assistant
+ is gone. That way stuff can reset the mouse cursor during
+ destruction of Crystal Space.
5-Sep-2006
- res fixed the Java bindings to build again.
4-Sep-2006
Modified: CS/trunk/plugins/video/canvas/openglwin/oglg2d.cpp
===================================================================
--- CS/trunk/plugins/video/canvas/openglwin/oglg2d.cpp 2006-09-05 23:07:20 UTC (rev 25286)
+++ CS/trunk/plugins/video/canvas/openglwin/oglg2d.cpp 2006-09-06 06:34:21 UTC (rev 25287)
@@ -712,7 +712,7 @@
{
csRef<iWin32Assistant> winhelper (
CS_QUERY_REGISTRY (object_reg, iWin32Assistant));
- CS_ASSERT (winhelper != 0);
+ if (winhelper == 0) return false;
bool rc;
if (!m_bHardwareCursor)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-06 11:14:09
|
Revision: 25288
http://svn.sourceforge.net/crystal/?rev=25288&view=rev
Author: res2002
Date: 2006-09-06 04:13:53 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
res fixed an issue with the Java bindings where symbols didn't get
exported properly from the JNI glue shared library due being hidden
by -fvisibility=hidden. Worked around that by also specifying
-fvisibility=default when compiling the JNI glue, causing the
symbols to get exported correctly again.
Modified Paths:
--------------
CS/trunk/configure
CS/trunk/configure.ac
CS/trunk/docs/history.txt
CS/trunk/plugins/cscript/csjava/Jamfile
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-06 06:34:21 UTC (rev 25287)
+++ CS/trunk/configure 2006-09-06 11:13:53 UTC (rev 25288)
@@ -16209,8 +16209,8 @@
# Check how to set default symbol visibility, and how to override the setting
# in code.
#------------------------------------------------------------------------------
-echo "$as_me:$LINENO: checking for symbol visibility flag" >&5
-echo $ECHO_N "checking for symbol visibility flag... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for \"hidden\" symbol visibility flag" >&5
+echo $ECHO_N "checking for \"hidden\" symbol visibility flag... $ECHO_C" >&6
if test "${cs_cv_prog_cc_visibility_hidden_ok+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16373,6 +16373,170 @@
fi
+echo "$as_me:$LINENO: checking for \"default\" symbol visibility flag" >&5
+echo $ECHO_N "checking for \"default\" symbol visibility flag... $ECHO_C" >&6
+if test "${cs_cv_prog_cc_visibility_default_ok+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @-fvisibility=default@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_cc_visibility_default=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_cc_visibility_default_ok="$cs_cv_prog_cc_visibility_default"
+else
+ cs_cv_prog_cc_visibility_default=''
+ cs_cv_prog_cc_visibility_default_ok=no
+fi
+
+fi
+echo "$as_me:$LINENO: result: $cs_cv_prog_cc_visibility_default_ok" >&5
+echo "${ECHO_T}$cs_cv_prog_cc_visibility_default_ok" >&6
+
+if test -n "$cs_cv_prog_cc_visibility_default"; then
+ cs_build_prop_val="$cs_cv_prog_cc_visibility_default"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS.VISIBILITY_DEFAULT ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+fi
+
+
echo "$as_me:$LINENO: checking how to declare default visibility" >&5
echo $ECHO_N "checking how to declare default visibility... $ECHO_C" >&6
if test "${cs_cv_prog_cxx_declare_visible_def+set}" = set; then
Modified: CS/trunk/configure.ac
===================================================================
--- CS/trunk/configure.ac 2006-09-06 06:34:21 UTC (rev 25287)
+++ CS/trunk/configure.ac 2006-09-06 11:13:53 UTC (rev 25288)
@@ -696,12 +696,19 @@
# Check how to set default symbol visibility, and how to override the setting
# in code.
#------------------------------------------------------------------------------
-CS_CHECK_BUILD_FLAGS([for symbol visibility flag],
+CS_CHECK_BUILD_FLAGS([for "hidden" symbol visibility flag],
[cs_cv_prog_cc_visibility_hidden],
[CS_CREATE_TUPLE([-fvisibility=hidden])])
AS_IF([test -n "$cs_cv_prog_cc_visibility_hidden"],
[CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
[$cs_cv_prog_cc_visibility_hidden], [+])])
+
+CS_CHECK_BUILD_FLAGS([for "default" symbol visibility flag],
+ [cs_cv_prog_cc_visibility_default],
+ [CS_CREATE_TUPLE([-fvisibility=default])])
+AS_IF([test -n "$cs_cv_prog_cc_visibility_default"],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.VISIBILITY_DEFAULT],
+ [$cs_cv_prog_cc_visibility_default])])
CS_SYMBOL_QUALIFIER([how to declare default visibility],
[cs_cv_prog_cxx_declare_visible_def],
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-06 06:34:21 UTC (rev 25287)
+++ CS/trunk/docs/history.txt 2006-09-06 11:13:53 UTC (rev 25288)
@@ -13,6 +13,11 @@
now just does a test and returns false in case the assistant
is gone. That way stuff can reset the mouse cursor during
destruction of Crystal Space.
+ - res fixed an issue with the Java bindings where symbols didn't get
+ exported properly from the JNI glue shared library due being hidden
+ by -fvisibility=hidden. Worked around that by also specifying
+ -fvisibility=default when compiling the JNI glue, causing the
+ symbols to get exported correctly again.
5-Sep-2006
- res fixed the Java bindings to build again.
4-Sep-2006
Modified: CS/trunk/plugins/cscript/csjava/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 06:34:21 UTC (rev 25287)
+++ CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 11:13:53 UTC (rev 25288)
@@ -95,7 +95,8 @@
javamod_OBJECTS = $(javamodobj) ;
LinkWith javamod : crystalspace ;
ExternalLibs javamod : JAVA ;
- CFlags javamod : $(PLUGIN.CFLAGS) $(COMPILER.C++FLAGS.EXCEPTIONS.ENABLE) ;
+ CFlags javamod : $(COMPILER.CFLAGS.VISIBILITY_DEFAULT) $(PLUGIN.CFLAGS)
+ $(COMPILER.C++FLAGS.EXCEPTIONS.ENABLE) ;
LFlags javamod : $(PLUGIN.LFLAGS) $(LINKLIBS) $(CSJAVA.LFLAGS) ;
Depends csjava : $(javamod) ;
MakeLocate $(javamod) : $(LOCATE.TARGETS) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-06 12:39:11
|
Revision: 25289
http://svn.sourceforge.net/crystal/?rev=25289&view=rev
Author: res2002
Date: 2006-09-06 05:39:00 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
res disabled strict aliasing when compiling the Java JNI glue. This
fixes some issues in release builds.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/cscript/csjava/Jamfile
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-06 11:13:53 UTC (rev 25288)
+++ CS/trunk/docs/history.txt 2006-09-06 12:39:00 UTC (rev 25289)
@@ -18,6 +18,8 @@
by -fvisibility=hidden. Worked around that by also specifying
-fvisibility=default when compiling the JNI glue, causing the
symbols to get exported correctly again.
+ - res disabled strict aliasing when compiling the Java JNI glue. This
+ fixes some issues in release builds.
5-Sep-2006
- res fixed the Java bindings to build again.
4-Sep-2006
Modified: CS/trunk/plugins/cscript/csjava/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 11:13:53 UTC (rev 25288)
+++ CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 12:39:00 UTC (rev 25289)
@@ -96,7 +96,8 @@
LinkWith javamod : crystalspace ;
ExternalLibs javamod : JAVA ;
CFlags javamod : $(COMPILER.CFLAGS.VISIBILITY_DEFAULT) $(PLUGIN.CFLAGS)
- $(COMPILER.C++FLAGS.EXCEPTIONS.ENABLE) ;
+ $(COMPILER.C++FLAGS.EXCEPTIONS.ENABLE)
+ $(COMPILER.C++FLAGS.STRICTALIASING.DISABLE) ;
LFlags javamod : $(PLUGIN.LFLAGS) $(LINKLIBS) $(CSJAVA.LFLAGS) ;
Depends csjava : $(javamod) ;
MakeLocate $(javamod) : $(LOCATE.TARGETS) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-06 13:25:48
|
Revision: 25290
http://svn.sourceforge.net/crystal/?rev=25290&view=rev
Author: res2002
Date: 2006-09-06 06:25:35 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
res fixed some errors having crept into SimpleRoom.java when it was
updated to work with latest CS.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/scripts/java/SimpleRoom.java
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-06 12:39:00 UTC (rev 25289)
+++ CS/trunk/docs/history.txt 2006-09-06 13:25:35 UTC (rev 25290)
@@ -20,6 +20,8 @@
symbols to get exported correctly again.
- res disabled strict aliasing when compiling the Java JNI glue. This
fixes some issues in release builds.
+ - res fixed some errors having crept into SimpleRoom.java when it was
+ updated to work with latest CS.
5-Sep-2006
- res fixed the Java bindings to build again.
4-Sep-2006
Modified: CS/trunk/scripts/java/SimpleRoom.java
===================================================================
--- CS/trunk/scripts/java/SimpleRoom.java 2006-09-06 12:39:00 UTC (rev 25289)
+++ CS/trunk/scripts/java/SimpleRoom.java 2006-09-06 13:25:35 UTC (rev 25290)
@@ -192,7 +192,7 @@
System.out.println("creating walls");
iThingFactoryState fact = (iThingFactoryState) SCF_QUERY_INTERFACE(
- walls.GetFactory(), iThingFactoryState.class);
+ walls.GetMeshObject().GetFactory(), iThingFactoryState.class);
fact.AddInsideBox (
new csVector3(-5,0,-5),
new csVector3(5,20,5));
@@ -256,6 +256,11 @@
result = csInitializer.OpenApplication(object_reg);
System.out.println("Application opened");
+
+ iGraphics3D myG3D = (iGraphics3D) CS_QUERY_REGISTRY(
+ getTheObjectRegistry(), iGraphics3D.class);
+ iNativeWindow window = myG3D.GetDriver2D().GetNativeWindow();
+ window.SetTitle ("Crystal Space Java Application");
System.out.println("Creating the room...");
CreateRoom();
@@ -265,7 +270,12 @@
System.out.println("Setting up event handlers...");
EventHandler eventHandler = new EventHandler(view);
- long events[] = {CS.csevPreProcess (CS.getTheObjectRegistry()), 0};
+ long events[] = {
+ CS.csevPreProcess (CS.getTheObjectRegistry()),
+ CS.csevFinalProcess (CS.getTheObjectRegistry()),
+ CS.csevKeyboardEvent (CS.getTheObjectRegistry()),
+ -1 /* CS.CS_EVENTLIST_END */
+ };
result = csInitializer.SetupEventHandler(object_reg,
(iEventHandler)eventHandler, events);
System.out.println("Event handler added");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-06 19:24:35
|
Revision: 25293
http://svn.sourceforge.net/crystal/?rev=25293&view=rev
Author: thebolt00
Date: 2006-09-06 12:24:11 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
- Marten made a small SWIG-tweak to shut up an error from newer SWIG versions.
- Marten made partconv not crash.
- Marten converted nullmesh to new SCF syntax.
Modified Paths:
--------------
CS/trunk/apps/tools/partconv/partconv.cpp
CS/trunk/docs/history.txt
CS/trunk/include/imesh/nullmesh.h
CS/trunk/plugins/cscript/csjava/Jamfile
CS/trunk/plugins/cscript/csperl5/Jamfile
CS/trunk/plugins/cscript/cspython/Jamfile
CS/trunk/plugins/mesh/null/object/nullmesh.cpp
CS/trunk/plugins/mesh/null/object/nullmesh.h
Modified: CS/trunk/apps/tools/partconv/partconv.cpp
===================================================================
--- CS/trunk/apps/tools/partconv/partconv.cpp 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/apps/tools/partconv/partconv.cpp 2006-09-06 19:24:11 UTC (rev 25293)
@@ -427,13 +427,13 @@
CS_NODE_ELEMENT, 0);
newParams->SetValue ("params");
- // Remove old
- factNode->RemoveNode (paramsNode);
-
// Handle any specific stuff (none atm ;)
// Handle the common things
ConvertParticlesCommonParams (paramsNode, newParams);
+
+ // Remove old
+ factNode->RemoveNode (paramsNode);
}
void PartConv::ConvertParticlesObjectParams (iDocumentNode* paramsNode,
@@ -444,8 +444,7 @@
CS_NODE_ELEMENT, 0);
newParams->SetValue ("params");
- // Remove old
- objNode->RemoveNode (paramsNode);
+
// Handle specific stuff
csRef<iDocumentNode> factNode = objNode->GetNode ("factory");
@@ -460,6 +459,9 @@
// Handle common things
ConvertParticlesCommonParams (paramsNode, newParams);
+
+ // Remove old
+ objNode->RemoveNode (paramsNode);
}
void PartConv::ConvertParticlesCommonParams (iDocumentNode* oldParams,
@@ -524,6 +526,8 @@
break;
case XMLTOKEN_SIZE:
syntaxService->ParseVector (child2, emitSize);
+ if (emitSize.SquaredNorm () == 0)
+ emitSize.x = child2->GetContentsValueAsFloat ();
break;
case XMLTOKEN_TIME:
duration = child2->GetContentsValueAsFloat ();
@@ -588,6 +592,7 @@
csRef<iDocumentNode> sizeNode = newParams->CreateNodeBefore (
CS_NODE_ELEMENT, 0);
+ sizeNode->SetValue ("particlesize");
sizeNode->SetAttributeAsFloat ("x", radius);
sizeNode->SetAttributeAsFloat ("y", radius);
}
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/docs/history.txt 2006-09-06 19:24:11 UTC (rev 25293)
@@ -22,6 +22,10 @@
fixes some issues in release builds.
- res fixed some errors having crept into SimpleRoom.java when it was
updated to work with latest CS.
+ - Marten made a small SWIG-tweak to shut up an error from newer
+ SWIG versions.
+ - Marten made partconv not crash.
+ - Marten converted nullmesh to new SCF syntax.
5-Sep-2006
- res fixed the Java bindings to build again.
4-Sep-2006
Modified: CS/trunk/include/imesh/nullmesh.h
===================================================================
--- CS/trunk/include/imesh/nullmesh.h 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/include/imesh/nullmesh.h 2006-09-06 19:24:11 UTC (rev 25293)
@@ -36,7 +36,7 @@
/**
* This interface describes the API for the null mesh object.
*/
-struct iNullMeshState : public iBase
+struct iNullMeshState : public virtual iBase
{
/**
* Set the radius of the sphere represented by this object.
Modified: CS/trunk/plugins/cscript/csjava/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-06 19:24:11 UTC (rev 25293)
@@ -70,7 +70,7 @@
Swig $(common) :
[ DoSourceGrist cspace.i ] :
java :
- -c++ -java -package org.crystalspace3d :
+ -c++ -java -cpperraswarn -package org.crystalspace3d :
[ ConcatDirs $(TOP) include ]
[ ConcatDirs $(BUILDTOP) include ] :
[ ConcatDirs $(TOP) include bindings ] :
Modified: CS/trunk/plugins/cscript/csperl5/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/csperl5/Jamfile 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/plugins/cscript/csperl5/Jamfile 2006-09-06 19:24:11 UTC (rev 25293)
@@ -60,7 +60,7 @@
Swig $(target) $(pmfile) :
[ FGristFiles cspace.i ] :
perl5 :
- -c++ -shadow -const -module cspace :
+ -c++ -shadow -const -cpperraswarn -module cspace :
[ ConcatDirs $(TOP) include ]
[ ConcatDirs $(BUILDTOP) include ] :
[ ConcatDirs $(TOP) include bindings ] :
Modified: CS/trunk/plugins/cscript/cspython/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/cspython/Jamfile 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/plugins/cscript/cspython/Jamfile 2006-09-06 19:24:11 UTC (rev 25293)
@@ -36,7 +36,7 @@
Swig $(common) $(cspacepy) :
[ DoSourceGrist cspace.i ] :
python :
- -c++ -shadow :
+ -c++ -shadow -cpperraswarn :
[ ConcatDirs $(TOP) include ]
[ ConcatDirs $(BUILDTOP) include ] :
[ ConcatDirs $(TOP) include bindings ] :
Modified: CS/trunk/plugins/mesh/null/object/nullmesh.cpp
===================================================================
--- CS/trunk/plugins/mesh/null/object/nullmesh.cpp 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/plugins/mesh/null/object/nullmesh.cpp 2006-09-06 19:24:11 UTC (rev 25293)
@@ -35,79 +35,33 @@
CS_IMPLEMENT_PLUGIN
-SCF_IMPLEMENT_IBASE (csNullmeshMeshObject)
- SCF_IMPLEMENTS_INTERFACE (iMeshObject)
- SCF_IMPLEMENTS_EMBEDDED_INTERFACE (iMeshObjectFactory)
- SCF_IMPLEMENTS_EMBEDDED_INTERFACE (iObjectModel)
- SCF_IMPLEMENTS_EMBEDDED_INTERFACE (iNullMeshState)
- SCF_IMPLEMENTS_EMBEDDED_INTERFACE (iNullFactoryState)
-SCF_IMPLEMENT_IBASE_END
-
-SCF_IMPLEMENT_EMBEDDED_IBASE (csNullmeshMeshObject::MeshObjectFactory)
- SCF_IMPLEMENTS_INTERFACE (iMeshObjectFactory)
-SCF_IMPLEMENT_EMBEDDED_IBASE_END
-
-SCF_IMPLEMENT_EMBEDDED_IBASE (csNullmeshMeshObject::ObjectModel)
- SCF_IMPLEMENTS_INTERFACE (iObjectModel)
-SCF_IMPLEMENT_EMBEDDED_IBASE_END
-
-SCF_IMPLEMENT_EMBEDDED_IBASE (csNullmeshMeshObject::NullFactoryState)
- SCF_IMPLEMENTS_INTERFACE (iNullFactoryState)
-SCF_IMPLEMENT_EMBEDDED_IBASE_END
-
-SCF_IMPLEMENT_EMBEDDED_IBASE (csNullmeshMeshObject::NullMeshState)
- SCF_IMPLEMENTS_INTERFACE (iNullMeshState)
-SCF_IMPLEMENT_EMBEDDED_IBASE_END
-
-
-csNullmeshMeshObject::csNullmeshMeshObject (csNullmeshMeshObject* factory,
+csNullmeshMeshObject::csNullmeshMeshObject (csNullmeshMeshFactory* factory,
iMeshObjectType* parent)
+ : scfImplementationType(this), logparent (0), nullmesh_type (parent),
+ vis_cb (0)
{
- SCF_CONSTRUCT_IBASE (0);
- SCF_CONSTRUCT_EMBEDDED_IBASE (scfiMeshObjectFactory);
- SCF_CONSTRUCT_EMBEDDED_IBASE (scfiObjectModel);
- SCF_CONSTRUCT_EMBEDDED_IBASE (scfiNullFactoryState);
- SCF_CONSTRUCT_EMBEDDED_IBASE (scfiNullMeshState);
- if (factory)
- {
- csNullmeshMeshObject::factory = &(factory->scfiMeshObjectFactory);
- radius = factory->radius;
- box = factory->box;
- }
- else
- {
- csNullmeshMeshObject::factory = 0;
- radius = 0.0001f;
- box.Set (-radius, -radius, -radius, radius, radius, radius);
- }
- logparent = 0;
- logparent_factory = 0;
- nullmesh_type = parent;
- vis_cb = 0;
+ csNullmeshMeshObject::factory = factory;
+ radius = factory->GetRadius ();
+ factory->GetBoundingBox (box);
}
csNullmeshMeshObject::~csNullmeshMeshObject ()
{
if (vis_cb) vis_cb->DecRef ();
-
- SCF_DESTRUCT_EMBEDDED_IBASE (scfiMeshObjectFactory);
- SCF_DESTRUCT_EMBEDDED_IBASE (scfiObjectModel);
- SCF_DESTRUCT_EMBEDDED_IBASE (scfiNullFactoryState);
- SCF_DESTRUCT_IBASE ();
}
void csNullmeshMeshObject::SetRadius (float radius)
{
csNullmeshMeshObject::radius = radius;
box.Set (-radius, -radius, -radius, radius, radius, radius);
- scfiObjectModel.ShapeChanged ();
+ ShapeChanged ();
}
void csNullmeshMeshObject::SetBoundingBox (const csBox3& box)
{
csNullmeshMeshObject::box = box;
radius = csQsqrt (csSquaredDist::PointPoint (box.Max (), box.Min ())) / 2.0;
- scfiObjectModel.ShapeChanged ();
+ ShapeChanged ();
}
void csNullmeshMeshObject::GetObjectBoundingBox (csBox3& bbox)
@@ -123,19 +77,21 @@
void csNullmeshMeshObject::SetObjectBoundingBox (const csBox3& bbox)
{
box = bbox;
- scfiObjectModel.ShapeChanged ();
+ ShapeChanged ();
}
bool csNullmeshMeshObject::HitBeamOutline (const csVector3& /*start*/,
- const csVector3& /*end*/, csVector3& /*isect*/, float* /*pr*/)
+ const csVector3& /*end*/,
+ csVector3& /*isect*/, float* /*pr*/)
{
// @@@ TODO
return false;
}
bool csNullmeshMeshObject::HitBeamObject (const csVector3& /*start*/,
- const csVector3& /*end*/, csVector3& /*isect*/, float* /*pr*/,
- int* /*polygon_idx*/, iMaterialWrapper**)
+ const csVector3& /*end*/,
+ csVector3& /*isect*/, float* /*pr*/,
+ int* /*polygon_idx*/, iMaterialWrapper**)
{
// @@@ TODO
return false;
@@ -147,44 +103,54 @@
cent.Set (box.GetCenter ());
}
-csPtr<iMeshObject> csNullmeshMeshObject::MeshObjectFactory::NewInstance ()
+
+//----------------------------------------------------------------------
+csNullmeshMeshFactory::csNullmeshMeshFactory (csNullmeshMeshObjectType* type)
+: scfImplementationType(this), nullmesh_type (type)
{
- csNullmeshMeshObject* cm = new csNullmeshMeshObject (scfParent,
- scfParent->nullmesh_type);
- csRef<iMeshObject> im (SCF_QUERY_INTERFACE (cm, iMeshObject));
- cm->DecRef ();
+}
+
+
+void csNullmeshMeshFactory::SetRadius (float radius)
+{
+ csNullmeshMeshFactory::radius = radius;
+ box.Set (-radius, -radius, -radius, radius, radius, radius);
+}
+
+void csNullmeshMeshFactory::SetBoundingBox (const csBox3& box)
+{
+ csNullmeshMeshFactory::box = box;
+ radius = csQsqrt (csSquaredDist::PointPoint (box.Max (), box.Min ())) / 2.0;
+}
+
+csPtr<iMeshObject> csNullmeshMeshFactory::NewInstance ()
+{
+ csRef<csNullmeshMeshObject> cm;
+ cm.AttachNew (new csNullmeshMeshObject (this, nullmesh_type));
+
+ csRef<iMeshObject> im = scfQueryInterface<iMeshObject> (cm);
return csPtr<iMeshObject> (im);
}
+
//----------------------------------------------------------------------
-SCF_IMPLEMENT_IBASE (csNullmeshMeshObjectType)
- SCF_IMPLEMENTS_INTERFACE (iMeshObjectType)
- SCF_IMPLEMENTS_EMBEDDED_INTERFACE (iComponent)
-SCF_IMPLEMENT_IBASE_END
-SCF_IMPLEMENT_EMBEDDED_IBASE (csNullmeshMeshObjectType::eiComponent)
- SCF_IMPLEMENTS_INTERFACE (iComponent)
-SCF_IMPLEMENT_EMBEDDED_IBASE_END
-
SCF_IMPLEMENT_FACTORY (csNullmeshMeshObjectType)
csNullmeshMeshObjectType::csNullmeshMeshObjectType (iBase* pParent)
+ : scfImplementationType (this, pParent)
{
- SCF_CONSTRUCT_IBASE (pParent);
- SCF_CONSTRUCT_EMBEDDED_IBASE(scfiComponent);
}
csNullmeshMeshObjectType::~csNullmeshMeshObjectType ()
{
- SCF_DESTRUCT_EMBEDDED_IBASE(scfiComponent);
- SCF_DESTRUCT_IBASE ();
}
csPtr<iMeshObjectFactory> csNullmeshMeshObjectType::NewFactory ()
{
- csNullmeshMeshObject* cm = new csNullmeshMeshObject (0, this);
+ csNullmeshMeshFactory* cm = new csNullmeshMeshFactory (this);
csRef<iMeshObjectFactory> ifact (
SCF_QUERY_INTERFACE (cm, iMeshObjectFactory));
cm->DecRef ();
Modified: CS/trunk/plugins/mesh/null/object/nullmesh.h
===================================================================
--- CS/trunk/plugins/mesh/null/object/nullmesh.h 2006-09-06 17:09:22 UTC (rev 25292)
+++ CS/trunk/plugins/mesh/null/object/nullmesh.h 2006-09-06 19:24:11 UTC (rev 25293)
@@ -34,25 +34,59 @@
struct iMaterialWrapper;
struct iObjectRegistry;
-/**
- * Nullmesh version of mesh object.
- */
-class csNullmeshMeshObject : public iMeshObject
+class csNullmeshMeshObjectType;
+
+class csNullmeshMeshFactory : public scfImplementation2<csNullmeshMeshFactory,
+ iMeshObjectFactory,
+ iNullFactoryState>
{
+public:
+ csNullmeshMeshFactory (csNullmeshMeshObjectType* type);
+
+ void SetRadius (float radius);
+ float GetRadius () const { return radius; }
+ void SetBoundingBox (const csBox3& box);
+ void GetBoundingBox (csBox3& box)
+ {
+ box = csNullmeshMeshFactory::box;
+ }
+
+ virtual csFlags& GetFlags () { return factory_flags; }
+ virtual csPtr<iMeshObject> NewInstance ();
+ virtual csPtr<iMeshObjectFactory> Clone () { return 0; }
+ virtual void HardTransform (const csReversibleTransform&) {}
+ virtual bool SupportsHardTransform () const { return false; }
+ virtual void SetMeshFactoryWrapper (iMeshFactoryWrapper* lp)
+ { logparent_factory = lp; }
+ virtual iMeshFactoryWrapper* GetMeshFactoryWrapper () const
+ { return logparent_factory; }
+ virtual iMeshObjectType* GetMeshObjectType () const
+ { return nullmesh_type; }
+ virtual iObjectModel* GetObjectModel () { return 0; }
+ virtual bool SetMaterialWrapper (iMaterialWrapper*) { return false; }
+ virtual iMaterialWrapper* GetMaterialWrapper () const { return 0; }
+ virtual void SetMixMode (uint) { }
+ virtual uint GetMixMode () const { return 0; }
+
private:
- iMeshObjectFactory* factory;
- iMeshWrapper* logparent;
iMeshFactoryWrapper* logparent_factory;
iMeshObjectType* nullmesh_type;
- iMeshObjectDrawCallback* vis_cb;
float radius;
csBox3 box;
- csFlags object_flags;
csFlags factory_flags;
+};
+/**
+ * Nullmesh version of mesh object.
+ */
+class csNullmeshMeshObject : public scfImplementationExt2<csNullmeshMeshObject,
+ csObjectModel,
+ iMeshObject,
+ iNullMeshState>
+{
public:
/// Constructor.
- csNullmeshMeshObject (csNullmeshMeshObject* factory, iMeshObjectType* parent);
+ csNullmeshMeshObject (csNullmeshMeshFactory* factory, iMeshObjectType* parent);
/// Destructor.
virtual ~csNullmeshMeshObject ();
@@ -71,8 +105,6 @@
}
//----------------------- iMeshObject implementation ------------------------
- SCF_DECLARE_IBASE;
-
virtual iMeshObjectFactory* GetFactory () const
{
return (iMeshObjectFactory*)factory;
@@ -96,8 +128,8 @@
virtual bool HitBeamOutline (const csVector3& start, const csVector3& end,
csVector3& isect, float *pr);
virtual bool HitBeamObject (const csVector3& start, const csVector3& end,
- csVector3& isect, float* pr, int* polygon_idx = 0,
- iMaterialWrapper** material = 0);
+ csVector3& isect, float* pr, int* polygon_idx = 0,
+ iMaterialWrapper** material = 0);
virtual void SetMeshWrapper (iMeshWrapper* lp) { logparent = lp; }
virtual iMeshWrapper* GetMeshWrapper () const { return logparent; }
@@ -107,32 +139,7 @@
num = 0;
return 0;
}
-
- //------------------------- iObjectModel implementation ----------------
- class ObjectModel : public csObjectModel
- {
- SCF_DECLARE_EMBEDDED_IBASE (csNullmeshMeshObject);
- virtual void GetObjectBoundingBox (csBox3& bbox)
- {
- scfParent->GetObjectBoundingBox (bbox);
- }
- virtual const csBox3& GetObjectBoundingBox ()
- {
- return scfParent->GetObjectBoundingBox ();
- }
- virtual void SetObjectBoundingBox (const csBox3& bbox)
- {
- scfParent->SetObjectBoundingBox (bbox);
- }
- virtual void GetRadius (float& rad, csVector3& cent)
- {
- scfParent->GetRadius (rad, cent);
- }
- virtual iTerraFormer* GetTerraFormerColldet () { return 0; }
- } scfiObjectModel;
- friend class ObjectModel;
-
- virtual iObjectModel* GetObjectModel () { return &scfiObjectModel; }
+ virtual iObjectModel* GetObjectModel () { return this; }
virtual bool SetColor (const csColor&) { return false; }
virtual bool GetColor (csColor&) const { return false; }
virtual bool SetMaterialWrapper (iMaterialWrapper*) { return false; }
@@ -141,93 +148,35 @@
virtual uint GetMixMode () const { return CS_FX_COPY; }
virtual void InvalidateMaterialHandles () { }
/**
- * see imesh/object.h for specification. The default implementation
- * does nothing.
- */
+ * see imesh/object.h for specification. The default implementation
+ * does nothing.
+ */
virtual void PositionChild (iMeshObject* /*child*/, csTicks /*current_time*/) { }
- //------------------------- iNullMeshState implementation ----------------
- class NullMeshState : public iNullMeshState
- {
- SCF_DECLARE_EMBEDDED_IBASE (csNullmeshMeshObject);
- virtual void SetRadius (float radius)
- {
- scfParent->SetRadius (radius);
- }
- virtual float GetRadius () const
- {
- return scfParent->GetRadius ();
- }
- virtual void SetBoundingBox (const csBox3& box)
- {
- scfParent->SetBoundingBox (box);
- }
- virtual void GetBoundingBox (csBox3& box)
- {
- scfParent->GetBoundingBox (box);
- }
- } scfiNullMeshState;
- friend class NullMeshState;
- //---------------------- iGeneralMeshFactoryState implementation ------------
- class NullFactoryState : public iNullFactoryState
- {
- SCF_DECLARE_EMBEDDED_IBASE (csNullmeshMeshObject);
- virtual void SetRadius (float radius)
- {
- scfParent->SetRadius (radius);
- }
- virtual float GetRadius () const
- {
- return scfParent->GetRadius ();
- }
- virtual void SetBoundingBox (const csBox3& box)
- {
- scfParent->SetBoundingBox (box);
- }
- virtual void GetBoundingBox (csBox3& box)
- {
- scfParent->GetBoundingBox (box);
- }
- } scfiNullFactoryState;
- friend class NullFactoryState;
-
- //---------------- iMeshObjectFactory interface implementation --------------
- struct MeshObjectFactory : public iMeshObjectFactory
- {
- SCF_DECLARE_EMBEDDED_IBASE (csNullmeshMeshObject);
-
- virtual csFlags& GetFlags () { return scfParent->factory_flags; }
- virtual csPtr<iMeshObject> NewInstance ();
- virtual csPtr<iMeshObjectFactory> Clone () { return 0; }
- virtual void HardTransform (const csReversibleTransform&) {}
- virtual bool SupportsHardTransform () const { return false; }
- virtual void SetMeshFactoryWrapper (iMeshFactoryWrapper* lp)
- { scfParent->logparent_factory = lp; }
- virtual iMeshFactoryWrapper* GetMeshFactoryWrapper () const
- { return scfParent->logparent_factory; }
- virtual iMeshObjectType* GetMeshObjectType () const
- { return scfParent->nullmesh_type; }
- virtual iObjectModel* GetObjectModel () { return 0; }
- virtual bool SetMaterialWrapper (iMaterialWrapper*) { return false; }
- virtual iMaterialWrapper* GetMaterialWrapper () const { return 0; }
- virtual void SetMixMode (uint) { }
- virtual uint GetMixMode () const { return 0; }
- } scfiMeshObjectFactory;
- friend struct MeshObjectFactory;
+private:
+ iMeshObjectFactory* factory;
+ iMeshObjectType* nullmesh_type;
+ iMeshWrapper* logparent;
+ iMeshObjectDrawCallback* vis_cb;
+ float radius;
+ csBox3 box;
+ csFlags object_flags;
};
+
/**
* Genmesh type. This is the plugin you have to use to create instances
* of csNullmeshMeshObjectFactory.
*/
-class csNullmeshMeshObjectType : public iMeshObjectType
+class csNullmeshMeshObjectType :
+ public scfImplementation2<csNullmeshMeshObjectType,
+ iMeshObjectType,
+ iComponent>
{
public:
iObjectRegistry* object_reg;
- SCF_DECLARE_IBASE;
-
/// Constructor.
csNullmeshMeshObjectType (iBase*);
/// Destructor.
@@ -235,20 +184,11 @@
/// Draw.
virtual csPtr<iMeshObjectFactory> NewFactory ();
/// Initialize.
- bool Initialize (iObjectRegistry* object_reg)
+ virtual bool Initialize (iObjectRegistry* object_reg)
{
csNullmeshMeshObjectType::object_reg = object_reg;
return true;
}
-
- struct eiComponent : public iComponent
- {
- SCF_DECLARE_EMBEDDED_IBASE(csNullmeshMeshObjectType);
- virtual bool Initialize (iObjectRegistry* object_reg)
- {
- return scfParent->Initialize (object_reg);
- }
- } scfiComponent;
};
#endif // __CS_NULLMESH_H__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cry...@us...> - 2006-09-07 00:48:01
|
Revision: 25296
http://svn.sourceforge.net/crystal/?rev=25296&view=rev
Author: crystal-manage
Date: 2006-09-06 17:28:01 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
master header files: Automated master header file repair.
Visual-C++ project files: Automated Visual-C++ project file repair.
Texinfo files: Automated Texinfo @node and @menu repair.
Swig Python files: Automated Swig Python file repair.
Swig Perl5 files: Automated Swig Perl5 file repair.
User's Manual: Automated Texinfo to HTML conversion.
Modified Paths:
--------------
CS/trunk/plugins/cscript/cspython/cs_pyth.cpp
CS/trunk/scripts/perl5/cspace.pm
CS/trunk/scripts/perl5/cswigpl5.inc
CS/trunk/scripts/python/cspace.py
Modified: CS/trunk/plugins/cscript/cspython/cs_pyth.cpp
===================================================================
--- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-06 21:04:21 UTC (rev 25295)
+++ CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-07 00:28:01 UTC (rev 25296)
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.24
+ * Version 1.3.28
*
* This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make
@@ -9,6 +9,7 @@
* ----------------------------------------------------------------------------- */
#define SWIGPYTHON
+#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
#ifdef __cplusplus
template<class T> class SwigValueWrapper {
@@ -26,17 +27,93 @@
};
#endif
+/***********************************************************************
+ *
+ * This section contains generic SWIG labels for method/variable
+ * declarations/attributes, and other compiler dependent labels.
+ *
+ ************************************************************************/
-#ifndef SWIG_TEMPLATE_DISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-# define SWIG_TEMPLATE_DISAMBIGUATOR template
-# else
-# define SWIG_TEMPLATE_DISAMBIGUATOR
-# endif
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC)
+# if (__SUNPRO_CC <= 0x560)
+# define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+# define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+# else
+# define SWIGTEMPLATEDISAMBIGUATOR
+# endif
#endif
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+# define SWIGINLINE inline
+# else
+# define SWIGINLINE
+# endif
+#endif
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+# define SWIGUNUSED __attribute__ ((__unused__))
+# else
+# define SWIGUNUSED
+# endif
+# elif defined(__ICC)
+# define SWIGUNUSED __attribute__ ((__unused__))
+# else
+# define SWIGUNUSED
+# endif
+#endif
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+# define SWIGUNUSEDPARM(p)
+# else
+# define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods for Windows DLLs */
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if defined(STATIC_LINKED)
+# define SWIGEXPORT
+# else
+# define SWIGEXPORT __declspec(dllexport)
+# endif
+# else
+# define SWIGEXPORT
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# define SWIGSTDCALL __stdcall
+# else
+# define SWIGSTDCALL
+# endif
+#endif
+
+
+/* Python.h has to appear first */
+
#ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS
#endif
@@ -58,27 +135,17 @@
/* This should only be incremented when either the layout of swig_type_info changes,
or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "1"
+#define SWIG_RUNTIME_VERSION "2"
/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
#ifdef SWIG_TYPE_TABLE
-#define SWIG_QUOTE_STRING(x) #x
-#define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
-#define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+# define SWIG_QUOTE_STRING(x) #x
+# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
#else
-#define SWIG_TYPE_TABLE_NAME
+# define SWIG_TYPE_TABLE_NAME
#endif
-#include <string.h>
-
-#ifndef SWIGINLINE
-#if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
-# define SWIGINLINE inline
-#else
-# define SWIGINLINE
-#endif
-#endif
-
/*
You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
creating a static or dynamic library from the swig runtime code.
@@ -87,13 +154,158 @@
But only do this if is strictly necessary, ie, if you have problems
with your compiler or so.
*/
+
#ifndef SWIGRUNTIME
-#define SWIGRUNTIME static
+# define SWIGRUNTIME SWIGINTERN
#endif
+
#ifndef SWIGRUNTIMEINLINE
-#define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
#endif
+/* Generic buffer size */
+#ifndef SWIG_BUFFER_SIZE
+# define SWIG_BUFFER_SIZE 1024
+#endif
+
+/* Flags for pointer conversions */
+#define SWIG_POINTER_DISOWN 0x1
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_OWN 0x1
+
+
+/*
+ Flags/methods for returning states.
+
+ The swig conversion methods, as ConvertPtr, return and integer
+ that tells if the conversion was successful or not. And if not,
+ an error code can be returned (see swigerrors.swg for the codes).
+
+ Use the following macros/flags to set or process the returning
+ states.
+
+ In old swig versions, you usually write code as:
+
+ if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
+ // success code
+ } else {
+ //fail code
+ }
+
+ Now you can be more explicit as:
+
+ int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
+ if (SWIG_IsOK(res)) {
+ // success code
+ } else {
+ // fail code
+ }
+
+ that seems to be the same, but now you can also do
+
+ Type *ptr;
+ int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
+ if (SWIG_IsOK(res)) {
+ // success code
+ if (SWIG_IsNewObj(res) {
+ ...
+ delete *ptr;
+ } else {
+ ...
+ }
+ } else {
+ // fail code
+ }
+
+ I.e., now SWIG_ConvertPtr can return new objects and you can
+ identify the case and take care of the deallocation. Of course that
+ requires also to SWIG_ConvertPtr to return new result values, as
+
+ int SWIG_ConvertPtr(obj, ptr,...) {
+ if (<obj is ok>) {
+ if (<need new object>) {
+ *ptr = <ptr to new allocated object>;
+ return SWIG_NEWOBJ;
+ } else {
+ *ptr = <ptr to old object>;
+ return SWIG_OLDOBJ;
+ }
+ } else {
+ return SWIG_BADOBJ;
+ }
+ }
+
+ Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
+ more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
+ swig errors code.
+
+ Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+ allows to return the 'cast rank', for example, if you have this
+
+ int food(double)
+ int fooi(int);
+
+ and you call
+
+ food(1) // cast rank '1' (1 -> 1.0)
+ fooi(1) // cast rank '0'
+
+ just use the SWIG_AddCast()/SWIG_CheckState()
+
+
+ */
+#define SWIG_OK (0)
+#define SWIG_ERROR (-1)
+#define SWIG_IsOK(r) (r >= 0)
+#define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError)
+
+/* The CastRankLimit says how many bits are used for the cast rank */
+#define SWIG_CASTRANKLIMIT (1 << 8)
+/* The NewMask denotes the object was created (using new/malloc) */
+#define SWIG_NEWOBJMASK (SWIG_CASTRANKLIMIT << 1)
+/* The TmpMask is for in/out typemaps that use temporal objects */
+#define SWIG_TMPOBJMASK (SWIG_NEWOBJMASK << 1)
+/* Simple returning values */
+#define SWIG_BADOBJ (SWIG_ERROR)
+#define SWIG_OLDOBJ (SWIG_OK)
+#define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK)
+#define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK)
+/* Check, add and del mask methods */
+#define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
+#define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
+#define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
+#define SWIG_AddTmpMask(r) (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
+#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
+#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
+
+
+/* Cast-Rank Mode */
+#if defined(SWIG_CASTRANK_MODE)
+# ifndef SWIG_TypeRank
+# define SWIG_TypeRank unsigned long
+# endif
+# ifndef SWIG_MAXCASTRANK /* Default cast allowed */
+# define SWIG_MAXCASTRANK (2)
+# endif
+# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1)
+# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK)
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
+ return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
+}
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+ return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
+}
+#else /* no cast-rank mode */
+# define SWIG_AddCast
+# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
+#endif
+
+
+
+
+#include <string.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -101,16 +313,36 @@
typedef void *(*swig_converter_func)(void *);
typedef struct swig_type_info *(*swig_dycast_func)(void **);
+/* Structure to store inforomation on one type */
typedef struct swig_type_info {
- const char *name;
- swig_converter_func converter;
- const char *str;
- void *clientdata;
- swig_dycast_func dcast;
- struct swig_type_info *next;
- struct swig_type_info *prev;
+ const char *name; /* mangled name of this type */
+ const char *str; /* human readable name of this type */
+ swig_dycast_func dcast; /* dynamic cast function down a hierarchy */
+ struct swig_cast_info *cast; /* linked list of types that can cast into this type */
+ void *clientdata; /* language specific type data */
+ int owndata; /* flag if the structure owns the clientdata */
} swig_type_info;
+/* Structure to store a type and conversion function used for casting */
+typedef struct swig_cast_info {
+ swig_type_info *type; /* pointer to type that is equivalent to this type */
+ swig_converter_func converter; /* function to cast the void pointers */
+ struct swig_cast_info *next; /* pointer to next cast in linked list */
+ struct swig_cast_info *prev; /* pointer to the previous cast */
+} swig_cast_info;
+
+/* Structure used to store module information
+ * Each module generates one structure like this, and the runtime collects
+ * all of these structures and stores them in a circularly linked list.*/
+typedef struct swig_module_info {
+ swig_type_info **types; /* Array of pointers to swig_type_info structures that are in this module */
+ size_t size; /* Number of types in this module */
+ struct swig_module_info *next; /* Pointer to next element in circularly linked list */
+ swig_type_info **type_initial; /* Array of initially generated type structures */
+ swig_cast_info **cast_initial; /* Array of initially generated casting structures */
+ void *clientdata; /* Language specific module data */
+} swig_module_info;
+
/*
Compare two type names skipping the space characters, therefore
"char*" == "char *" and "Class<int>" == "Class<int >", etc.
@@ -124,13 +356,14 @@
for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
while ((*f1 == ' ') && (f1 != l1)) ++f1;
while ((*f2 == ' ') && (f2 != l2)) ++f2;
- if (*f1 != *f2) return *f1 - *f2;
+ if (*f1 != *f2) return (int)(*f1 - *f2);
}
return (l1 - f1) - (l2 - f2);
}
/*
Check type equivalence in a name list like <name1>|<name2>|...
+ Return 0 if not equal, 1 if equal
*/
SWIGRUNTIME int
SWIG_TypeEquiv(const char *nb, const char *tb) {
@@ -141,96 +374,73 @@
for (nb = ne; *ne; ++ne) {
if (*ne == '|') break;
}
- equiv = SWIG_TypeNameComp(nb, ne, tb, te) == 0;
+ equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
if (*ne) ++ne;
}
return equiv;
}
/*
- Register a type mapping with the type-checking
+ Check type equivalence in a name list like <name1>|<name2>|...
+ Return 0 if equal, -1 if nb < tb, 1 if nb > tb
*/
-SWIGRUNTIME swig_type_info *
-SWIG_TypeRegisterTL(swig_type_info **tl, swig_type_info *ti) {
- swig_type_info *tc, *head, *ret, *next;
- /* Check to see if this type has already been registered */
- tc = *tl;
- while (tc) {
- /* check simple type equivalence */
- int typeequiv = (strcmp(tc->name, ti->name) == 0);
- /* check full type equivalence, resolving typedefs */
- if (!typeequiv) {
- /* only if tc is not a typedef (no '|' on it) */
- if (tc->str && ti->str && !strstr(tc->str,"|")) {
- typeequiv = SWIG_TypeEquiv(ti->str,tc->str);
- }
+SWIGRUNTIME int
+SWIG_TypeCompare(const char *nb, const char *tb) {
+ int equiv = 0;
+ const char* te = tb + strlen(tb);
+ const char* ne = nb;
+ while (!equiv && *ne) {
+ for (nb = ne; *ne; ++ne) {
+ if (*ne == '|') break;
}
- if (typeequiv) {
- /* Already exists in the table. Just add additional types to the list */
- if (ti->clientdata) tc->clientdata = ti->clientdata;
- head = tc;
- next = tc->next;
- goto l1;
- }
- tc = tc->prev;
+ equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+ if (*ne) ++ne;
}
- head = ti;
- next = 0;
+ return equiv;
+}
- /* Place in list */
- ti->prev = *tl;
- *tl = ti;
- /* Build linked lists */
- l1:
- ret = head;
- tc = ti + 1;
- /* Patch up the rest of the links */
- while (tc->name) {
- head->next = tc;
- tc->prev = head;
- head = tc;
- tc++;
- }
- if (next) next->prev = head;
- head->next = next;
+/* think of this as a c++ template<> or a scheme macro */
+#define SWIG_TypeCheck_Template(comparison, ty) \
+ if (ty) { \
+ swig_cast_info *iter = ty->cast; \
+ while (iter) { \
+ if (comparison) { \
+ if (iter == ty->cast) return iter; \
+ /* Move iter to the top of the linked list */ \
+ iter->prev->next = iter->next; \
+ if (iter->next) \
+ iter->next->prev = iter->prev; \
+ iter->next = ty->cast; \
+ iter->prev = 0; \
+ if (ty->cast) ty->cast->prev = iter; \
+ ty->cast = iter; \
+ return iter; \
+ } \
+ iter = iter->next; \
+ } \
+ } \
+ return 0
- return ret;
-}
-
/*
Check the typename
*/
-SWIGRUNTIME swig_type_info *
+SWIGRUNTIME swig_cast_info *
SWIG_TypeCheck(const char *c, swig_type_info *ty) {
- swig_type_info *s;
- if (!ty) return 0; /* Void pointer */
- s = ty->next; /* First element always just a name */
- do {
- if (strcmp(s->name,c) == 0) {
- if (s == ty->next) return s;
- /* Move s to the top of the linked list */
- s->prev->next = s->next;
- if (s->next) {
- s->next->prev = s->prev;
- }
- /* Insert s as second element in the list */
- s->next = ty->next;
- if (ty->next) ty->next->prev = s;
- ty->next = s;
- s->prev = ty;
- return s;
- }
- s = s->next;
- } while (s && (s != ty->next));
- return 0;
+ SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
}
+/* Same as previous function, except strcmp is replaced with a pointer comparison */
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
+ SWIG_TypeCheck_Template(iter->type == from, into);
+}
+
/*
Cast a pointer up an inheritance hierarchy
*/
SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_type_info *ty, void *ptr) {
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
}
@@ -266,6 +476,7 @@
type, separated by vertical-bar characters. We choose
to print the last name, as it is often (?) the most
specific. */
+ if (!type) return NULL;
if (type->str != NULL) {
const char *last_name = type->str;
const char *s;
@@ -277,41 +488,108 @@
return type->name;
}
+/*
+ Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+ swig_cast_info *cast = ti->cast;
+ /* if (ti->clientdata == clientdata) return; */
+ ti->clientdata = clientdata;
+
+ while (cast) {
+ if (!cast->converter) {
+ swig_type_info *tc = cast->type;
+ if (!tc->clientdata) {
+ SWIG_TypeClientData(tc, clientdata);
+ }
+ }
+ cast = cast->next;
+ }
+}
+SWIGRUNTIME void
+SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
+ SWIG_TypeClientData(ti, clientdata);
+ ti->owndata = 1;
+}
+
/*
- Search for a swig_type_info structure
+ Search for a swig_type_info structure only by mangled name
+ Search is a O(log #types)
+
+ We start searching at module start, and finish searching when start == end.
+ Note: if start == end at the beginning of the function, we go all the way around
+ the circular list.
*/
SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryTL(swig_type_info *tl, const char *name) {
- swig_type_info *ty = tl;
- while (ty) {
- if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
- if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
- ty = ty->prev;
- }
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+ swig_module_info *end,
+ const char *name) {
+ swig_module_info *iter = start;
+ do {
+ if (iter->size) {
+ register size_t l = 0;
+ register size_t r = iter->size - 1;
+ do {
+ /* since l+r >= 0, we can (>> 1) instead (/ 2) */
+ register size_t i = (l + r) >> 1;
+ const char *iname = iter->types[i]->name;
+ if (iname) {
+ register int compare = strcmp(name, iname);
+ if (compare == 0) {
+ return iter->types[i];
+ } else if (compare < 0) {
+ if (i) {
+ r = i - 1;
+ } else {
+ break;
+ }
+ } else if (compare > 0) {
+ l = i + 1;
+ }
+ } else {
+ break; /* should never happen */
+ }
+ } while (l <= r);
+ }
+ iter = iter->next;
+ } while (iter != end);
return 0;
}
-/*
- Set the clientdata field for a type
+/*
+ Search for a swig_type_info structure for either a mangled name or a human readable name.
+ It first searches the mangled names of the types, which is a O(log #types)
+ If a type is not found it then searches the human readable names, which is O(#types).
+
+ We start searching at module start, and finish searching when start == end.
+ Note: if start == end at the beginning of the function, we go all the way around
+ the circular list.
*/
-SWIGRUNTIME void
-SWIG_TypeClientDataTL(swig_type_info *tl, swig_type_info *ti, void *clientdata) {
- swig_type_info *tc, *equiv;
- if (ti->clientdata) return;
- /* if (ti->clientdata == clientdata) return; */
- ti->clientdata = clientdata;
- equiv = ti->next;
- while (equiv) {
- if (!equiv->converter) {
- tc = tl;
- while (tc) {
- if ((strcmp(tc->name, equiv->name) == 0))
- SWIG_TypeClientDataTL(tl,tc,clientdata);
- tc = tc->prev;
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryModule(swig_module_info *start,
+ swig_module_info *end,
+ const char *name) {
+ /* STEP 1: Search the name field using binary search */
+ swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
+ if (ret) {
+ return ret;
+ } else {
+ /* STEP 2: If the type hasn't been found, do a complete search
+ of the str field (the human readable name) */
+ swig_module_info *iter = start;
+ do {
+ register size_t i = 0;
+ for (; i < iter->size; ++i) {
+ if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
+ return iter->types[i];
}
- }
- equiv = equiv->next;
+ iter = iter->next;
+ } while (iter != end);
}
+
+ /* neither found a match */
+ return 0;
}
/*
@@ -319,12 +597,11 @@
*/
SWIGRUNTIME char *
SWIG_PackData(char *c, void *ptr, size_t sz) {
- static char hex[17] = "0123456789abcdef";
- unsigned char *u = (unsigned char *) ptr;
- const unsigned char *eu = u + sz;
- register unsigned char uu;
+ static const char hex[17] = "0123456789abcdef";
+ register const unsigned char *u = (unsigned char *) ptr;
+ register const unsigned char *eu = u + sz;
for (; u != eu; ++u) {
- uu = *u;
+ register unsigned char uu = *u;
*(c++) = hex[(uu & 0xf0) >> 4];
*(c++) = hex[uu & 0xf];
}
@@ -337,10 +614,10 @@
SWIGRUNTIME const char *
SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
register unsigned char *u = (unsigned char *) ptr;
- register const unsigned char *eu = u + sz;
+ register const unsigned char *eu = u + sz;
for (; u != eu; ++u) {
- register int d = *(c++);
- register unsigned char uu = 0;
+ register char d = *(c++);
+ register unsigned char uu;
if ((d >= '0') && (d <= '9'))
uu = ((d - '0') << 4);
else if ((d >= 'a') && (d <= 'f'))
@@ -359,30 +636,6 @@
return c;
}
-/*
- This function will propagate the clientdata field of type to any new
- swig_type_info structures that have been added into the list of
- equivalent types. It is like calling SWIG_TypeClientData(type,
- clientdata) a second time.
-*/
-SWIGRUNTIME void
-SWIG_PropagateClientDataTL(swig_type_info *tl, swig_type_info *type) {
- swig_type_info *equiv = type->next;
- swig_type_info *tc;
- if (!type->clientdata) return;
- while (equiv) {
- if (!equiv->converter) {
- tc = tl;
- while (tc) {
- if ((strcmp(tc->name, equiv->name) == 0) && !tc->clientdata)
- SWIG_TypeClientDataTL(tl,tc, type->clientdata);
- tc = tc->prev;
- }
- }
- equiv = equiv->next;
- }
-}
-
/*
Pack 'void *' into a string buffer.
*/
@@ -442,149 +695,260 @@
}
#endif
-/***********************************************************************
- * common.swg
- *
- * This file contains generic SWIG runtime support for pointer
- * type checking as well as a few commonly used macros to control
- * external linkage.
- *
- * Author : David Beazley (be...@cs...)
- *
- * Copyright (c) 1999-2000, The University of Chicago
- *
- * This file may be freely redistributed without license or fee provided
- * this copyright message remains intact.
- ************************************************************************/
+/* Errors in SWIG */
+#define SWIG_UnknownError -1
+#define SWIG_IOError -2
+#define SWIG_RuntimeError -3
+#define SWIG_IndexError -4
+#define SWIG_TypeError -5
+#define SWIG_DivisionByZero -6
+#define SWIG_OverflowError -7
+#define SWIG_SyntaxError -8
+#define SWIG_ValueError -9
+#define SWIG_SystemError -10
+#define SWIG_AttributeError -11
+#define SWIG_MemoryError -12
+#define SWIG_NullReferenceError -13
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-# if !defined(STATIC_LINKED)
-# define SWIGEXPORT(a) __declspec(dllexport) a
-# else
-# define SWIGEXPORT(a) a
-# endif
-#else
-# define SWIGEXPORT(a) a
+
+/* Python.h has to appear first */
+
+ #ifndef __STDC_CONSTANT_MACROS
+ #define __STDC_CONSTANT_MACROS
+ #endif
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
+ #endif
+ #ifndef DEBUG_PYTHON
+ #undef _DEBUG
+ #endif
+ #include <Python.h>
+
+/* Add PyOS_snprintf for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+# define PyOS_snprintf _snprintf
+# else
+# define PyOS_snprintf snprintf
+# endif
#endif
-#ifdef __cplusplus
-extern "C" {
+/* A crude PyString_FromFormat implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+
+#ifndef SWIG_PYBUFFER_SIZE
+#define SWIG_PYBUFFER_SIZE 1024
#endif
+static PyObject *
+PyString_FromFormat(const char *fmt, ...) {
+ va_list ap;
+ char buf[SWIG_PYBUFFER_SIZE * 2];
+ int res;
+ va_start(ap, fmt);
+ res = vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ return (res < 0 || res >= sizeof(buf)) ? 0 : PyString_FromString(buf);
+}
+#endif
-/*************************************************************************/
+/* Add PyObject_Del for old Pythons */
+#if PY_VERSION_HEX < 0x01060000
+#define PyObject_Del(op) PyMem_DEL((op))
+#endif
+#ifndef PyObject_DEL
+#define PyObject_DEL PyObject_Del
+#endif
+/* A crude PyExc_StopIteration exception for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+#define PyExc_StopIteration PyExc_RuntimeError
+#define PyObject_GenericGetAttr 0
+#define Py_NotImplemented PyExc_RuntimeError
+#endif
-/* The static type info list */
-static swig_type_info *swig_type_list = 0;
-static swig_type_info **swig_type_list_handle = &swig_type_list;
-
+/* A crude PyString_AsStringAndSize implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02010000
+#define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
+#endif
-/* Register a type mapping with the type-checking */
-static swig_type_info *
-SWIG_TypeRegister(swig_type_info *ti) {
- return SWIG_TypeRegisterTL(swig_type_list_handle, ti);
-}
+#if PY_VERSION_HEX < 0x02000000
+#define PySequence_Size PySequence_Length
+#endif
-/* Search for a swig_type_info structure */
-static swig_type_info *
-SWIG_TypeQuery(const char *name) {
- return SWIG_TypeQueryTL(*swig_type_list_handle, name);
-}
-/* Set the clientdata field for a type */
-static void
-SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
- SWIG_TypeClientDataTL(*swig_type_list_handle, ti, clientdata);
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME PyObject*
+SWIG_Python_ErrorType(int code) {
+ PyObject* type = 0;
+ switch(code) {
+ case SWIG_MemoryError:
+ type = PyExc_MemoryError;
+ break;
+ case SWIG_IOError:
+ type = PyExc_IOError;
+ break;
+ case SWIG_RuntimeError:
+ type = PyExc_RuntimeError;
+ break;
+ case SWIG_IndexError:
+ type = PyExc_IndexError;
+ break;
+ case SWIG_TypeError:
+ type = PyExc_TypeError;
+ break;
+ case SWIG_DivisionByZero:
+ type = PyExc_ZeroDivisionError;
+ break;
+ case SWIG_OverflowError:
+ type = PyExc_OverflowError;
+ break;
+ case SWIG_SyntaxError:
+ type = PyExc_SyntaxError;
+ break;
+ case SWIG_ValueError:
+ type = PyExc_ValueError;
+ break;
+ case SWIG_SystemError:
+ type = PyExc_SystemError;
+ break;
+ case SWIG_AttributeError:
+ type = PyExc_AttributeError;
+ break;
+ default:
+ type = PyExc_RuntimeError;
+ }
+ return type;
}
-/* This function will propagate the clientdata field of type to
-* any new swig_type_info structures that have been added into the list
-* of equivalent types. It is like calling
-* SWIG_TypeClientData(type, clientdata) a second time.
-*/
-static void
-SWIG_PropagateClientData(swig_type_info *type) {
- SWIG_PropagateClientDataTL(*swig_type_list_handle, type);
+
+SWIGRUNTIME void
+SWIG_Python_AddErrorMsg(const char* mesg)
+{
+ PyObject *type = 0;
+ PyObject *value = 0;
+ PyObject *traceback = 0;
+
+ if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+ if (value) {
+ PyObject *old_str = PyObject_Str(value);
+ PyErr_Clear();
+ Py_XINCREF(type);
+ PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+ Py_DECREF(old_str);
+ Py_DECREF(value);
+ } else {
+ PyErr_Format(PyExc_RuntimeError, mesg);
+ }
}
-#ifdef __cplusplus
-}
+
+
+#if defined(SWIG_PYTHON_NO_THREADS)
+# if defined(SWIG_PYTHON_THREADS)
+# undef SWIG_PYTHON_THREADS
+# endif
#endif
+#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
+# if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
+# if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
+# define SWIG_PYTHON_USE_GIL
+# endif
+# endif
+# if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
+# ifndef SWIG_PYTHON_INITIALIZE_THREADS
+# define SWIG_PYTHON_INITIALIZE_THREADS PyEval_InitThreads()
+# endif
+# ifdef __cplusplus /* C++ code */
+ class SWIG_Python_Thread_Block {
+ bool status;
+ PyGILState_STATE state;
+ public:
+ void end() { if (status) { PyGILState_Release(state); status = false;} }
+ SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
+ ~SWIG_Python_Thread_Block() { end(); }
+ };
+ class SWIG_Python_Thread_Allow {
+ bool status;
+ PyThreadState *save;
+ public:
+ void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
+ SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
+ ~SWIG_Python_Thread_Allow() { end(); }
+ };
+# define SWIG_PYTHON_THREAD_BEGIN_BLOCK SWIG_Python_Thread_Block _swig_thread_block
+# define SWIG_PYTHON_THREAD_END_BLOCK _swig_thread_block.end()
+# define SWIG_PYTHON_THREAD_BEGIN_ALLOW SWIG_Python_Thread_Allow _swig_thread_allow
+# define SWIG_PYTHON_THREAD_END_ALLOW _swig_thread_allow.end()
+# else /* C code */
+# define SWIG_PYTHON_THREAD_BEGIN_BLOCK PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
+# define SWIG_PYTHON_THREAD_END_BLOCK PyGILState_Release(_swig_thread_block)
+# define SWIG_PYTHON_THREAD_BEGIN_ALLOW PyThreadState *_swig_thread_allow = PyEval_SaveThread()
+# define SWIG_PYTHON_THREAD_END_ALLOW PyEval_RestoreThread(_swig_thread_allow)
+# endif
+# else /* Old thread way, not implemented, user must provide it */
+# if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
+# define SWIG_PYTHON_INITIALIZE_THREADS
+# endif
+# if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
+# define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+# endif
+# if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
+# define SWIG_PYTHON_THREAD_END_BLOCK
+# endif
+# if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
+# define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+# endif
+# if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
+# define SWIG_PYTHON_THREAD_END_ALLOW
+# endif
+# endif
+#else /* No thread support */
+# define SWIG_PYTHON_INITIALIZE_THREADS
+# define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+# define SWIG_PYTHON_THREAD_END_BLOCK
+# define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+# define SWIG_PYTHON_THREAD_END_ALLOW
+#endif
/* -----------------------------------------------------------------------------
- * SWIG API. Portion that goes into the runtime
+ * Python API portion that goes into the runtime
* ----------------------------------------------------------------------------- */
#ifdef __cplusplus
extern "C" {
+#if 0
+} /* cc-mode */
#endif
-
-/* -----------------------------------------------------------------------------
- * for internal method declarations
- * ----------------------------------------------------------------------------- */
-
-#ifndef SWIGINTERN
-#define SWIGINTERN static
#endif
-#ifndef SWIGINTERNSHORT
-#ifdef __cplusplus
-#define SWIGINTERNSHORT static inline
-#else /* C case */
-#define SWIGINTERNSHORT static
-#endif /* __cplusplus */
-#endif
-
-
-/*
- Exception handling in wrappers
-*/
-#define SWIG_fail goto fail
-#define SWIG_arg_fail(arg) SWIG_Python_ArgFail(arg)
-#define SWIG_append_errmsg(msg) SWIG_Python_AddErrMesg(msg,0)
-#define SWIG_preppend_errmsg(msg) SWIG_Python_AddErrMesg(msg,1)
-#define SWIG_type_error(type,obj) SWIG_Python_TypeError(type,obj)
-#define SWIG_null_ref(type) SWIG_Python_NullRef(type)
-
-/*
- Contract support
-*/
-#define SWIG_contract_assert(expr, msg) \
- if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else
-
/* -----------------------------------------------------------------------------
* Constant declarations
* ----------------------------------------------------------------------------- */
/* Constant Types */
-#define SWIG_PY_INT 1
-#define SWIG_PY_FLOAT 2
-#define SWIG_PY_STRING 3
#define SWIG_PY_POINTER 4
#define SWIG_PY_BINARY 5
/* Constant information structure */
typedef struct swig_const_info {
- int type;
- char *name;
- long lvalue;
- double dvalue;
- void *pvalue;
- swig_type_info **ptype;
+ int type;
+ char *name;
+ long lvalue;
+ double dvalue;
+ void *pvalue;
+ swig_type_info **ptype;
} swig_const_info;
-
-/* -----------------------------------------------------------------------------
- * Alloc. memory flags
- * ----------------------------------------------------------------------------- */
-#define SWIG_OLDOBJ 1
-#define SWIG_NEWOBJ SWIG_OLDOBJ + 1
-#define SWIG_PYSTR SWIG_NEWOBJ + 1
-
#ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
}
#endif
@@ -600,136 +964,586 @@
************************************************************************/
/* Common SWIG API */
-#define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags)
-#define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags)
-#define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags)
-
-/* Python-specific SWIG API */
-#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags)
-#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type)
+/* for raw pointers */
+#define SWIG_Python_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Python_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
+#define SWIG_NewPointerObj(ptr, type, flags) SWIG_Python_NewPointerObj(ptr, type, flags)
+#define SWIG_CheckImplicit(ty) SWIG_Python_CheckImplicit(ty)
+#define SWIG_AcquirePtr(ptr, src) SWIG_Python_AcquirePtr(ptr, src)
+#define swig_owntype int
+/* for raw packed data */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty) SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewPackedObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type)
-/* -----------------------------------------------------------------------------
- * Pointer declarations
- * ----------------------------------------------------------------------------- */
+/* for class or struct pointers */
+#define SWIG_ConvertInstance(obj, pptr, type, flags) SWIG_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_NewInstanceObj(ptr, type, flags) SWIG_NewPointerObj(ptr, type, flags)
+
+/* for C or C++ function pointers */
+#define SWIG_ConvertFunctionPtr(obj, pptr, type) SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
+#define SWIG_NewFunctionPtrObj(ptr, type) SWIG_Python_NewPointerObj(ptr, type, 0)
+
+/* for C++ member pointers, ie, member methods */
+#define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewMemberObj(ptr, sz, type) SWIG_Python_NewPackedObj(ptr, sz, type)
+
+
+/* Runtime API */
+
+#define SWIG_GetModule(clientdata) SWIG_Python_GetModule()
+#define SWIG_SetModule(clientdata, pointer) SWIG_Python_SetModule(pointer)
+#define SWIG_NewClientData(obj) PySwigClientData_New(obj)
+
+#define SWIG_SetErrorObj SWIG_Python_SetErrorObj
+#define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg
+#define SWIG_ErrorType(code) SWIG_Python_ErrorType(code)
+#define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg)
+#define SWIG_fail goto fail
+
+
+/* Runtime API implementation */
+
+/* Error manipulation */
+
+SWIGINTERN void
+SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
+ SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+ PyErr_SetObject(errtype, obj);
+ Py_DECREF(obj);
+ SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+SWIGINTERN void
+SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
+ SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+ PyErr_SetString(errtype, (char *) msg);
+ SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+#define SWIG_Python_Raise(obj, type, desc) SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
+
+/* Set a constant value */
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {
+ PyDict_SetItemString(d, (char*) name, obj);
+ Py_DECREF(obj);
+}
+
+/* Append a value to the result obj */
+
+SWIGINTERN PyObject*
+SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
+#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
+ if (!result) {
+ result = obj;
+ } else if (result == Py_None) {
+ Py_DECREF(result);
+ result = obj;
+ } else {
+ if (!PyList_Check(result)) {
+ PyObject *o2 = result;
+ result = PyList_New(1);
+ PyList_SetItem(result, 0, o2);
+ }
+ PyList_Append(result,obj);
+ Py_DECREF(obj);
+ }
+ return result;
+#else
+ PyObject* o2;
+ PyObject* o3;
+ if (!result) {
+ result = obj;
+ } else if (result == Py_None) {
+ Py_DECREF(result);
+ result = obj;
+ } else {
+ if (!PyTuple_Check(result)) {
+ o2 = result;
+ result = PyTuple_New(1);
+ PyTuple_SET_ITEM(result, 0, o2);
+ }
+ o3 = PyTuple_New(1);
+ PyTuple_SET_ITEM(o3, 0, obj);
+ o2 = result;
+ result = PySequence_Concat(o2, o3);
+ Py_DECREF(o2);
+ Py_DECREF(o3);
+ }
+ return result;
+#endif
+}
+
+/* Unpack the argument tuple */
+
+SWIGINTERN int
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+{
+ if (!args) {
+ if (!min && !max) {
+ return 1;
+ } else {
+ PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none",
+ name, (min == max ? "" : "at least "), min);
+ return 0;
+ }
+ }
+ if (!PyTuple_Check(args)) {
+ PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
+ return 0;
+ } else {
+ register int l = PyTuple_GET_SIZE(args);
+ if (l < min) {
+ PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d",
+ name, (min == max ? "" : "at least "), min, l);
+ return 0;
+ } else if (l > max) {
+ PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d",
+ name, (min == max ? "" : "at most "), max, l);
+ return 0;
+ } else {
+ register int i;
+ for (i = 0; i < l; ++i) {
+ objs[i] = PyTuple_GET_ITEM(args, i);
+ }
+ for (; l < max; ++l) {
+ objs[l] = 0;
+ }
+ return i + 1;
+ }
+ }
+}
+
+/* A functor is a function object with one single object argument */
+#if PY_VERSION_HEX >= 0x02020000
+#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunctionObjArgs(functor, obj, NULL);
+#else
+#define SWIG_Python_CallFunctor(functor, obj) PyObject_CallFunction(functor, "O", obj);
+#endif
+
/*
- Use SWIG_NO_COBJECT_TYPES to force the use of strings to represent
- C/C++ pointers in the python side. Very useful for debugging, but
- not always safe.
+ Helper for static pointer initialization for both C and C++ code, for example
+ static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
*/
-#if !defined(SWIG_NO_COBJECT_TYPES) && !defined(SWIG_COBJECT_TYPES)
-# define SWIG_COBJECT_TYPES
+#ifdef __cplusplus
+#define SWIG_STATIC_POINTER(var) var
+#else
+#define SWIG_STATIC_POINTER(var) var = 0; if (!var) var
#endif
-/* Flags for pointer conversion */
-#define SWIG_POINTER_EXCEPTION 0x1
-#define SWIG_POINTER_DISOWN 0x2
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+/* Flags for new pointer objects */
+#define SWIG_POINTER_NOSHADOW (SWIG_POINTER_OWN << 1)
+#define SWIG_POINTER_NEW (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
+#define SWIG_POINTER_IMPLICIT_CONV (SWIG_POINTER_DISOWN << 1)
+
#ifdef __cplusplus
extern "C" {
+#if 0
+} /* cc-mode */
#endif
+#endif
-/* -----------------------------------------------------------------------------
- * Create a new pointer string
- * ----------------------------------------------------------------------------- */
+/* How to access Py_None */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# ifndef SWIG_PYTHON_NO_BUILD_NONE
+# ifndef SWIG_PYTHON_BUILD_NONE
+# define SWIG_PYTHON_BUILD_NONE
+# endif
+# endif
+#endif
-#ifndef SWIG_BUFFER_SIZE
-#define SWIG_BUFFER_SIZE 1024
+#ifdef SWIG_PYTHON_BUILD_NONE
+# ifdef Py_None
+# undef Py_None
+# define Py_None SWIG_Py_None()
+# endif
+SWIGRUNTIMEINLINE PyObject *
+_SWIG_Py_None(void)
+{
+ PyObject *none = Py_BuildValue("");
+ Py_DECREF(none);
+ return none;
+}
+SWIGRUNTIME PyObject *
+SWIG_Py_None(void)
+{
+ static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
+ return none;
+}
#endif
-#if defined(SWIG_COBJECT_TYPES)
-#if !defined(SWIG_COBJECT_PYTHON)
-/* -----------------------------------------------------------------------------
- * Implements a simple Swig Object type, and use it instead of PyCObject
- * ----------------------------------------------------------------------------- */
+/* The python void return value */
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Py_Void(void)
+{
+ PyObject *none = Py_None;
+ Py_INCREF(none);
+ return none;
+}
+
+
+/* PySwigClientData */
+
typedef struct {
+ PyObject *klass;
+ PyObject *newraw;
+ PyObject *newargs;
+ PyObject *destroy;
+ int delargs;
+ int implicitconv;
+} PySwigClientData;
+
+SWIGRUNTIMEINLINE int
+SWIG_Python_CheckImplicit(swig_type_info *ty)
+{
+ PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+ return data ? data->implicitconv : 0;
+}
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_ExceptionType(swig_type_info *desc) {
+ PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+ PyObject *klass = data ? data->klass : 0;
+ return (klass ? klass : PyExc_RuntimeError);
+}
+
+
+SWIGRUNTIME PySwigClientData *
+PySwigClientData_New(PyObject* obj)
+{
+ if (!obj) {
+ return 0;
+ } else {
+ PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+ /* the klass element */
+ data->klass = obj;
+ Py_INCREF(obj);
+ /* the newraw method and newargs arguments used to create a new raw instance */
+ if (PyClass_Check(obj)) {
+ data->newraw = 0;
+ data->newargs = obj;
+ Py_INCREF(obj);
+ } else {
+#if (PY_VERSION_HEX < 0x02020000)
+ data->newraw = 0;
+ data->newargs = obj;
+ Py_INCREF(obj);
+#else
+ data->newraw = PyObject_GetAttrString((PyObject*)&PyBaseObject_Type, (char *)"__new__");
+ Py_INCREF(data->newraw);
+ data->newargs = PyTuple_New(1);
+ PyTuple_SetItem(data->newargs, 0, obj);
+ Py_INCREF(data->newargs);
+#endif
+ }
+ /* the destroy method, aka as the C++ delete method */
+ data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+ if (PyErr_Occurred()) {
+ PyErr_Clear();
+ data->destroy = 0;
+ }
+ if (data->destroy) {
+ int flags;
+ Py_INCREF(data->destroy);
+ flags = PyCFunction_GET_FLAGS(data->destroy);
+#ifdef METH_O
+ data->delargs = !(flags & (METH_O));
+#else
+ data->delargs = 0;
+#endif
+ } else {
+ data->delargs = 0;
+ }
+ data->implicitconv = 0;
+ return data;
+ }
+}
+
+SWIGRUNTIME void
+PySwigClientData_Del(PySwigClientData* data)
+{
+ Py_XDECREF(data->klass);
+ Py_XDECREF(data->newraw);
+ Py_XDECREF(data->newargs);
+ Py_XDECREF(data->destroy);
+}
+
+/* =============== PySwigObject =====================*/
+
+typedef struct {
PyObject_HEAD
void *ptr;
- const char *desc;
+ swig_type_info *ty;
+ int own;
+ PyObject *next;
} PySwigObject;
-/* Declarations for objects of type PySwigObject */
+SWIGRUNTIME PyObject *
+PySwigObject_long(PySwigObject *v)
+{
+ return PyLong_FromVoidPtr(v->ptr);
+}
-SWIGRUNTIME int
-PySwigObject_print(PySwigObject *v, FILE *fp, int flags)
+SWIGRUNTIME PyObject *
+PySwigObject_format(const char* fmt, PySwigObject *v)
{
- char result[SWIG_BUFFER_SIZE];
- if (SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result))) {
- fputs("<Swig Object at ", fp); fputs(result, fp); fputs(">", fp);
- return 0;
- } else {
- return 1;
+ PyObject *res = NULL;
+ PyObject *args = PyTuple_New(1);
+ if (args) {
+ if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
+ PyObject *ofmt = PyString_FromString(fmt);
+ if (ofmt) {
+ res = PyString_Format(ofmt,args);
+ Py_DECREF(ofmt);
+ }
+ Py_DECREF(args);
+ }
}
+ return res;
}
-
+
SWIGRUNTIME PyObject *
+PySwigObject_oct(PySwigObject *v)
+{
+ return PySwigObject_format("%o",v);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_hex(PySwigObject *v)
+{
+ return PySwigObject_format("%x",v);
+}
+
+SWIGRUNTIME PyObject *
PySwigObject_repr(PySwigObject *v)
{
- char result[SWIG_BUFFER_SIZE];
- return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
- PyString_FromFormat("<Swig Object at %s>", result) : 0;
+ const char *name = SWIG_TypePrettyName(v->ty);
+ PyObject *hex = PySwigObject_hex(v);
+ PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+ Py_DECREF(hex);
+ if (v->next) {
+ PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+ PyString_ConcatAndDel(&repr,nrep);
+ }
+ return repr;
}
+SWIGRUNTIME int
+PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+ PyObject *repr = PySwigObject_repr(v);
+ if (repr) {
+ fputs(PyString_AsString(repr), fp);
+ Py_DECREF(repr);
+ return 0;
+ } else {
+ return 1;
+ }
+}
+
SWIGRUNTIME PyObject *
PySwigObject_str(PySwigObject *v)
{
char result[SWIG_BUFFER_SIZE];
- return SWIG_PackVoidPtr(result, v->ptr, v->desc, sizeof(result)) ?
+ return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
PyString_FromString(result) : 0;
}
-SWIGRUNTIME PyObject *
-PySwigObject_long(PySwigObject *v)
+SWIGRUNTIME int
+PySwigObject_compare(PySwigObject *v, PySwigObject *w)
{
- return PyLong_FromUnsignedLong((unsigned long) v->ptr);
+ void *i = v->ptr;
+ void *j = w->ptr;
+ return (i < j) ? -1 : ((i > j) ? 1 : 0);
}
+SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
+
+SWIGRUNTIME PyTypeObject*
+PySwigObject_type(void) {
+ static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
+ return type;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigObject_Check(PyObject *op) {
+ return ((op)->ob_type == PySwigObject_type())
+ || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+}
+
SWIGRUNTIME PyObject *
-PySwigObject_oct(PySwigObject *v)
+PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+
+SWIGRUNTIME void
+PySwigObject_dealloc(PyObject *v)
{
- char buf[100];
- unsigned long x = (unsigned long)v->ptr;
- if (x == 0)
- strcpy(buf, "0");
- else
- PyOS_snprintf(buf, sizeof(buf), "0%lo", x);
- return PyString_FromString(buf);
+ PySwigObject *sobj = (PySwigObject *) v;
+ PyObject *next = sobj->next;
+ if (sobj->own) {
+ swig_type_info *ty = sobj->ty;
+ PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+ PyObject *destroy = data ? data->destroy : 0;
+ if (destroy) {
+ /* destroy is always a VARARGS method */
+ PyObject *res;
+ if (data->delargs) {
+ /* we need to create a temporal object to carry the destroy operation */
+ PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+ res = SWIG_Python_CallFunctor(destroy, tmp);
+ Py_DECREF(tmp);
+ } else {
+ PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
+ PyObject *mself = PyCFunction_GET_SELF(destroy);
+ res = ((*meth)(mself, v));
+ }
+ Py_XDECREF(res);
+ } else {
+ const char *name = SWIG_TypePrettyName(ty);
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+ printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
+#endif
+ }
+ }
+ Py_XDECREF(next);
+ PyObject_DEL(v);
}
-SWIGRUNTIME PyObject *
-PySwigObject_hex(PySwigObject *v)
+SWIGRUNTIME PyObject*
+PySwigObject_append(PyObject* v, PyObject* next)
{
- char buf[100];
- PyOS_snprintf(buf, sizeof(buf), "0x%lx", (unsigned long)v->ptr);
- return PyString_FromString(buf);
+ PySwigObject *sobj = (PySwigObject *) v;
+#ifndef METH_O
+ PyObject *tmp = 0;
+ if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
+ next = tmp;
+#endif
+ if (!PySwigObject_Check(next)) {
+ return NULL;
+ }
+ sobj->next = next;
+ Py_INCREF(next);
+ return SWIG_Py_Void();
}
-SWIGRUNTIME int
-PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+SWIGRUNTIME PyObject*
+#ifdef METH_NOARGS
+PySwigObject_next(PyObject* v)
+#else
+PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
{
- int c = strcmp(v->desc, w->desc);
- if (c) {
- return c;
+ PySwigObject *sobj = (PySwigObject *) v;
+ if (sobj->next) {
+ Py_INCREF(sobj->next);
+ return sobj->next;
} else {
- void *i = v->ptr;
- void *j = w->ptr;
- return (i < j) ? -1 : (i > j) ? 1 : 0;
+ return SWIG_Py_Void();
}
}
-SWIGRUNTIME void
-PySwigObject_dealloc(PySwigObject *self)
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_disown(PyObject *v)
+#else
+PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
{
- PyObject_DEL(self);
+ PySwigObject *sobj = (PySwigObject *)v;
+ sobj->own = 0;
+ return SWIG_Py_Void();
}
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_acquire(PyObject *v)
+#else
+PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+ PySwigObject *sobj = (PySwigObject *)v;
+ sobj->own = SWIG_POINTER_OWN;
+ return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+PySwigObject_own(PyObject *v, PyObject *args)
+{
+ PyObject *val = 0;
+#if (PY_VERSION_HEX < 0x02020000)
+ if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
+#else
+ if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val))
+#endif
+ {
+ return NULL;
+ }
+ else
+ {
+ PySwigObject *sobj = (PySwigObject *)v;
+ PyObject *obj = sobj->own ? Py_True : Py_False;
+ if (val) {
+#ifdef METH_NOARGS
+ if (PyObject_IsTrue(val)) {
+ PySwigObject_acquire(v);
+ } else {
+ PySwigObject_disown(v);
+ }
+#else
+ if (PyObject_IsTrue(val)) {
+ PySwigObject_acquire(v,args);
+ } else {
+ PySwigObject_disown(v,args);
+ }
+#endif
+ }
+ Py_INCREF(obj);
+ return obj;
+ }
+}
+
+#ifdef METH_O
+static PyMethodDef
+swigobject_methods[] = {
+ {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"},
+ {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"},
+ {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+ {(char *)"append", (PyCFunction)PySwigObject_append, METH_O, (char *)"appends another 'this' object"},
+ {(char *)"next", (PyCFunction)PySwigObject_next, METH_NOARGS, (char *)"returns the next 'this' object"},
+ {0, 0, 0, 0}
+};
+#else
+static PyMethodDef
+swigobject_methods[] = {
+ {(char *)"disown", (PyCFunction)PySwigObject_disown, METH_VARARGS, (char *)"releases ownership of the pointer"},
+ {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS, (char *)"aquires ownership of the pointer"},
+ {(char *)"own", (PyCFunction)PySwigObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+ {(char *)"append", (PyCFunction)PySwigObject_append, METH_VARARGS, (char *)"appends another 'this' object"},
+ {(char *)"next", (PyCFunction)PySwigObject_next, METH_VARARGS, (char *)"returns the next 'this' object"},
+ {0, 0, 0, 0}
+};
+#endif
+
+#if PY_VERSION_HEX < 0x02020000
+SWIGINTERN PyObject *
+PySwigObject_getattr(PySwigObject *sobj,char *name)
+{
+ return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
+}
+#endif
+
SWIGRUNTIME PyTypeObject*
-PySwigObject_GetType() {
- static char PySwigObject_Type__doc__[] =
- "Swig object carries a C/C++ instance pointer";
+_PySwigObject_type(void) {
+ static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
static PyNumberMethods PySwigObject_as_number = {
(binaryfunc)0, /*nb_add*/
@@ -755,91 +1569,97 @@
(unaryfunc)0, /*nb_float*/
(unaryfunc)PySwigObject_oct, /*nb_oct*/
(unaryfunc)PySwigObject_hex, /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02020000
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000
+ 0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
#endif
};
- static int type_init = 0;
- static PyTypeObject PySwigObject_Type;
-
+ static PyTypeObject pyswigobject_type;
+ static int type_init = 0;
if (!type_init) {
- PyTypeObject tmp = {
- PyObject_HEAD_INIT(&PyType_Type)
- 0, /*ob_size*/
- "PySwigObject", /*tp_name*/
- sizeof(PySwigObject), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- /* methods */
- (destructor)PySwigObject_dealloc, /*tp_dealloc*/
- (printfunc)PySwigObject_print, /*tp_print*/
- (getattrfunc)0, /*tp_getattr*/
- (setattrfunc)0, /*tp_setattr*/
- (cmpfunc)PySwigObject_compare, /*tp_compare*/
- (reprfunc)PySwigObject_repr, /*tp_repr*/
- &PySwigObject_as_number, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- (hashfunc)0, /*tp_hash*/
- (ternaryfunc)0, /*tp_call*/
- (reprfunc)PySwigObject_str, /*tp_str*/
- /* Space for future expansion */
- 0L,0L,0L,0L,
- PySwigObject_Type__doc__, /* Documentation string */
-#if PY_VERSION_HEX >= 0x02000000
- 0, /* tp_traverse */
- 0, /* tp_clear */
+ const PyTypeObject tmp
+ = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ (char *)"PySwigObject", /* tp_name */
+ sizeof(PySwigObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)PySwigObject_dealloc, /* tp_dealloc */
+ (printfunc)PySwigObject_print, /* tp_print */
+#if PY_VERSION_HEX < 0x02020000
+ (getattrfunc)PySwigObject_getattr, /* tp_getattr */
+#else
+ (getattrfunc)0, /* tp_getattr */
#endif
-#if PY_VERSION_HEX >= 0x02010000
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
-#endif
+ (setattrfunc)0, /* tp_setattr */
+ (cmpfunc)PySwigObject_compare, /* tp_compare */
+ (reprfunc)PySwigObject_repr, /* tp_repr */
+ &PySwigObject_as_number, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ (hashfunc)0, /* tp_hash */
+ (ternaryfunc)0, /* tp_call */
+ (reprfunc)PySwigObject_str, /* tp_str */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT, /* tp_flags */
+ swigobject_doc, /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
#if PY_VERSION_HEX >= 0x02020000
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ swigobject_methods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ 0, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+ 0, /* tp_bases */
+ 0, /* tp_mro */
+ 0, /* tp_cache */
+ 0, /* tp_subclasses */
+ 0, /* tp_weaklist */
#endif
#if PY_VERSION_HEX >= 0x02030000
- 0, /* tp_del */
+ 0, /* tp_del */
#endif
#ifdef COUNT_ALLOCS
- 0,0,0,0 /* tp_alloc -> tp_next */
+ 0,0,0,0 /* tp_alloc -> tp_next */
#endif
- };
-
- PySwigObject_Type = tmp;
+ };
+ pyswigobject_type = tmp;
+ pyswigobject_type.ob_type = &PyType_Type;
type_init = 1;
}
-
- return &PySwigObject_Type;
+ return &pyswigobject_type;
}
SWIGRUNTIME PyObject *
-PySwigObject_FromVoidPtrAndDesc(void *ptr, const char *desc)
+PySwigObject_New(void *ptr, swig_type_info *ty, int own)
{
- PySwigObject *self = PyObject_NEW(PySwigObject, PySwigObject_GetType());
- if (self == NULL) return NULL;
- self->ptr = ptr;
- self->desc = desc;
- return (PyObject *)self;
+ PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+ if (sobj) {
+ sobj->ptr = ptr;
+ sobj->ty = ty;
+ sobj->own = own;
+ sobj->next = 0;
+ }
+ return (PyObject *)sobj;
}
-SWIGRUNTIMEINLINE void *
-PySwigObject_AsVoidPtr(PyObject *self)
-{
- return ((PySwigObject *)self)->ptr;
-}
-
-SWIGRUNTIMEINLINE const char *
-PySwigObject_GetDesc(PyObject *self)
-{
- return ((PySwigObject *)self)->desc;
-}
-
-SWIGRUNTIMEINLINE int
-PySwigObject_Check(PyObject *op) {
- return ((op)->ob_type == PySwigObject_GetType())
- || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
-}
-
/* -----------------------------------------------------------------------------
* Implements a simple Swig Packed type, and use it instead of string
* ----------------------------------------------------------------------------- */
@@ -847,12 +1667,12 @@
typedef struct {
PyObject_HEAD
void *pack;
- const char *desc;
+ swig_type...
[truncated message content] |
|
From: <ob...@us...> - 2006-09-07 11:57:27
|
Revision: 25297
http://svn.sourceforge.net/crystal/?rev=25297&view=rev
Author: obi666
Date: 2006-09-07 04:57:12 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Piotr put back r2t support through fbo, available with GL_EXT_framebuffer_object option set to true (which is now set to false by default). Additionally I've made small performance related changes in fbo r2t.
Modified Paths:
--------------
CS/trunk/data/config/r3dopengl.cfg
CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp
CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.h
CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp
Modified: CS/trunk/data/config/r3dopengl.cfg
===================================================================
--- CS/trunk/data/config/r3dopengl.cfg 2006-09-07 00:28:01 UTC (rev 25296)
+++ CS/trunk/data/config/r3dopengl.cfg 2006-09-07 11:57:12 UTC (rev 25297)
@@ -128,7 +128,7 @@
;Video.OpenGL.UseExtension.GL_EXT_texture_filter_anisotropic = false
;Video.OpenGL.UseExtension.GL_EXT_texture_lod_bias = false
Video.OpenGL.UseExtension.GL_ARB_vertex_buffer_object = true
-Video.OpenGL.UseExtension.GL_EXT_framebuffer_object = false
+Video.OpenGL.UseExtension.GL_EXT_framebuffer_object = true
;Video.OpenGL.UseExtension.GL_SGIS_generate_mipmap = false
Video.OpenGL.UseExtension.GL_ARB_point_sprite = false
Modified: CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp
===================================================================
--- CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp 2006-09-07 00:28:01 UTC (rev 25296)
+++ CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp 2006-09-07 11:57:12 UTC (rev 25297)
@@ -74,8 +74,8 @@
}
void csGLRender2TextureEXTfbo::SetRenderTarget (iTextureHandle* handle,
- bool persistent,
- int subtexture)
+ bool persistent,
+ int subtexture)
{
if (enableFBO)
{
@@ -88,58 +88,66 @@
{
handle->GetRendererDimensions (txt_w, txt_h);
csGLTextureHandle* tex_mm = (csGLTextureHandle *)
- handle->GetPrivateObject ();
+ handle->GetPrivateObject ();
if (!tex_mm->IsWasRenderTarget())
{
- tex_mm->SetupAutoMipping();
- tex_mm->SetWasRenderTarget (true);
- G3D->statecache->SetTexture (GL_TEXTURE_2D, tex_mm->GetHandle());
- glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, txt_w, txt_h,
- 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- G3D->statecache->SetTexture (GL_TEXTURE_2D, 0);
+ tex_mm->SetupAutoMipping();
+ tex_mm->SetWasRenderTarget (true);
+ G3D->statecache->SetTexture (GL_TEXTURE_2D, tex_mm->GetHandle());
+ glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA8, txt_w, txt_h,
+ 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ G3D->statecache->SetTexture (GL_TEXTURE_2D, 0);
}
- if ((framebuffer == 0) || (txt_w > fb_w) || (txt_h > fb_h))
+ if ((framebuffer == 0) || txthandle != handle)
{
- FreeBuffers();
+ csGLRender2TextureEXTfbo::txthandle = handle;
+ if ((txt_w > fb_w) || (txt_h > fb_h))
+ {
+ FreeBuffers();
- G3D->ext->glGenFramebuffersEXT (1, &framebuffer);
- G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, framebuffer);
- G3D->ext->glGenRenderbuffersEXT (1, &depthRB);
- G3D->ext->glGenRenderbuffersEXT (1, &stencilRB);
+ G3D->ext->glGenFramebuffersEXT (1, &framebuffer);
+ G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, framebuffer);
+ G3D->ext->glGenRenderbuffersEXT (1, &depthRB);
+ G3D->ext->glGenRenderbuffersEXT (1, &stencilRB);
- G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, depthRB);
- G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
- GL_DEPTH_COMPONENT24_ARB, txt_w, txt_h);
+ G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, depthRB);
+ G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
+ GL_DEPTH_COMPONENT24_ARB, txt_w, txt_h);
- /*G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, stencilRB);
- G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
- GL_STENCIL_INDEX8_EXT, txt_w, txt_h);*/
+ /*G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, stencilRB);
+ G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
+ GL_STENCIL_INDEX8_EXT, txt_w, txt_h);*/
- //G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, 0);
- fb_w = txt_w; fb_h = txt_h;
+ //G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, 0);
+ fb_w = txt_w; fb_h = txt_h;
+ }
+ //glReadBuffer (GL_NONE);
+ G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, framebuffer);
+ //csPrintf ("framebuffer status(%d): %s\n", __LINE__,
+ //FBStatusStr (G3D->ext->glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT)));
+ G3D->ext->glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT,
+ GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex_mm->GetHandle(), 0);
+
+ // initialize depth renderbuffer
+ G3D->ext->glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, depthRB);
+ G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
+ GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depthRB);
+ //G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
+ //GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, stencilRB);
+
+ GLenum fbStatus = G3D->ext->glCheckFramebufferStatusEXT (
+ GL_FRAMEBUFFER_EXT);
+ if (fbStatus != GL_FRAMEBUFFER_COMPLETE_EXT)
+ {
+ G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0);
+ enableFBO = false;
+ //glReadBuffer (GL_BACK);
+ csPrintf ("framebuffer status: %s\n", FBStatusStr (fbStatus));
+ }
}
- //glReadBuffer (GL_NONE);
- G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, framebuffer);
- //csPrintf ("framebuffer status(%d): %s\n", __LINE__,
- //FBStatusStr (G3D->ext->glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT)));
- G3D->ext->glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT,
- GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex_mm->GetHandle(), 0);
- G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
- GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depthRB);
- //G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
- //GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, stencilRB);
- GLenum fbStatus = G3D->ext->glCheckFramebufferStatusEXT (
- GL_FRAMEBUFFER_EXT);
- if (fbStatus != GL_FRAMEBUFFER_COMPLETE_EXT)
- {
- G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0);
- enableFBO = false;
- //glReadBuffer (GL_BACK);
- csPrintf ("framebuffer status: %s\n", FBStatusStr (fbStatus));
- }
}
}
if (enableFBO)
@@ -154,7 +162,9 @@
{
if (enableFBO)
rt_onscreen = false;
+
csGLRender2TextureFramebuf::FinishDraw();
+ //G3D->ext->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
//csGLTextureHandle* tex_mm = (csGLTextureHandle *)
// render_target->GetPrivateObject ();
Modified: CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.h
===================================================================
--- CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.h 2006-09-07 00:28:01 UTC (rev 25296)
+++ CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.h 2006-09-07 11:57:12 UTC (rev 25297)
@@ -27,12 +27,13 @@
bool enableFBO;
GLuint framebuffer, depthRB, stencilRB;
int fb_w, fb_h;
+ iTextureHandle* txthandle;
void FreeBuffers();
public:
csGLRender2TextureEXTfbo (csGLGraphics3D* G3D)
: csGLRender2TextureFramebuf (G3D), enableFBO(true), framebuffer (0),
- depthRB(0), stencilRB(0) { }
+ depthRB(0), stencilRB(0), txthandle(0) { }
virtual ~csGLRender2TextureEXTfbo();
virtual void SetRenderTarget (iTextureHandle* handle, bool persistent,
Modified: CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp
===================================================================
--- CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp 2006-09-07 00:28:01 UTC (rev 25296)
+++ CS/trunk/plugins/video/render3d/opengl/gl_render3d.cpp 2006-09-07 11:57:12 UTC (rev 25297)
@@ -1034,12 +1034,12 @@
cache_clip_z_plane = -1;
const char* r2tBackendStr;
- /*if (ext->CS_GL_EXT_framebuffer_object)
+ if (ext->CS_GL_EXT_framebuffer_object)
{
r2tBackendStr = "EXT_framebuffer_object";
r2tbackend = new csGLRender2TextureEXTfbo (this);
}
- else*/
+ else
{
r2tBackendStr = "framebuffer";
r2tbackend = new csGLRender2TextureFramebuf (this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 13:35:53
|
Revision: 25301
http://svn.sourceforge.net/crystal/?rev=25301&view=rev
Author: res2002
Date: 2006-09-08 06:34:53 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res added tests for some more GL types.
Modified Paths:
--------------
CS/trunk/configure
CS/trunk/configure.ac
CS/trunk/docs/history.txt
CS/trunk/include/csplugincommon/opengl/glextmanager.h
CS/trunk/scripts/python/glext/headerfiletemplate
Added Paths:
-----------
CS/trunk/scripts/python/glext/defs_GL
CS/trunk/scripts/python/glext/defs_GLver
CS/trunk/scripts/python/glext/defs_WGL
CS/trunk/scripts/python/glext/ext_flag_GL
CS/trunk/scripts/python/glext/ext_flag_GLver
CS/trunk/scripts/python/glext/ext_flag_WGL
CS/trunk/scripts/python/glext/extcheck_GL
CS/trunk/scripts/python/glext/extcheck_GLver
CS/trunk/scripts/python/glext/extcheck_WGL
CS/trunk/scripts/python/glext/funcs_GL
CS/trunk/scripts/python/glext/funcs_GLver
CS/trunk/scripts/python/glext/funcs_WGL
CS/trunk/scripts/python/glext/initext_GL
CS/trunk/scripts/python/glext/initext_GLver
CS/trunk/scripts/python/glext/initext_WGL
Removed Paths:
-------------
CS/trunk/scripts/python/glext/defs_gl
CS/trunk/scripts/python/glext/defs_glver
CS/trunk/scripts/python/glext/defs_wgl
CS/trunk/scripts/python/glext/ext_flag_gl
CS/trunk/scripts/python/glext/ext_flag_glver
CS/trunk/scripts/python/glext/ext_flag_wgl
CS/trunk/scripts/python/glext/extcheck_gl
CS/trunk/scripts/python/glext/extcheck_glver
CS/trunk/scripts/python/glext/extcheck_wgl
CS/trunk/scripts/python/glext/funcs_gl
CS/trunk/scripts/python/glext/funcs_glver
CS/trunk/scripts/python/glext/funcs_wgl
CS/trunk/scripts/python/glext/initext_gl
CS/trunk/scripts/python/glext/initext_glver
CS/trunk/scripts/python/glext/initext_wgl
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/configure 2006-09-08 13:34:53 UTC (rev 25301)
@@ -25701,8 +25701,8 @@
#------------------------------------------------------------------------------
# Check for OpenGL and companions. Also check if GLX extensions are supported
# and define the (backward) header property CSGL_EXT_STATIC_ASSERTION if they
-# are _not_ supported. Finally, check if the type GLhandleARB is exported by
-# the GL headers. It is starting to show up in very modern headers, but is
+# are _not_ supported. Finally, check if the some GL types are exported by
+# the GL headers. Some are starting to show up in very modern headers, but are
# absent from most.
#
# IMPLEMENTATION NOTES
@@ -26270,12 +26270,12 @@
fi
+
if test $cs_cv_libgl = yes; then
- # Check for GLhandleARB.
- if test "" != yes; then
+ if test "" != yes; then
echo "$as_me:$LINENO: checking for GLhandleARB" >&5
echo $ECHO_N "checking for GLhandleARB... $ECHO_C" >&6
-if test "${cs_cv_libgl_glhandlearb+set}" = set; then
+if test "${cs_cv_libgl_GLhandleARB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_ext=c
@@ -26429,17 +26429,17 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libgl_glhandlearb=yes
- cs_cv_libgl_glhandlearb_cflags=$cs_build_cflags
- cs_cv_libgl_glhandlearb_lflags=$cs_build_lflags
- cs_cv_libgl_glhandlearb_libs=$cs_build_libs
+ cs_cv_libgl_GLhandleARB=yes
+ cs_cv_libgl_GLhandleARB_cflags=$cs_build_cflags
+ cs_cv_libgl_GLhandleARB_lflags=$cs_build_lflags
+ cs_cv_libgl_GLhandleARB_libs=$cs_build_libs
else
- cs_cv_libgl_glhandlearb=no
+ cs_cv_libgl_GLhandleARB=no
fi
fi
-echo "$as_me:$LINENO: result: $cs_cv_libgl_glhandlearb" >&5
-echo "${ECHO_T}$cs_cv_libgl_glhandlearb" >&6
+echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandleARB" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLhandleARB" >&6
else
echo "$as_me:$LINENO: checking for GLhandleARB" >&5
echo $ECHO_N "checking for GLhandleARB... $ECHO_C" >&6
@@ -26594,31 +26594,1063 @@
cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libgl_glhandlearb=yes
- cs_cv_libgl_glhandlearb_cflags=$cs_build_cflags
- cs_cv_libgl_glhandlearb_lflags=$cs_build_lflags
- cs_cv_libgl_glhandlearb_libs=$cs_build_libs
+ cs_cv_libgl_GLhandleARB=yes
+ cs_cv_libgl_GLhandleARB_cflags=$cs_build_cflags
+ cs_cv_libgl_GLhandleARB_lflags=$cs_build_lflags
+ cs_cv_libgl_GLhandleARB_libs=$cs_build_libs
else
- cs_cv_libgl_glhandlearb=no
+ cs_cv_libgl_GLhandleARB=no
fi
- echo "$as_me:$LINENO: result: $cs_cv_libgl_glhandlearb" >&5
-echo "${ECHO_T}$cs_cv_libgl_glhandlearb" >&6
+ echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandleARB" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLhandleARB" >&6
fi
- if test $cs_cv_libgl_glhandlearb = yes; then
+ if test $cs_cv_libgl_GLhandleARB = yes; then
cs_header_text="${cs_header_text}#define CS_HAVE_GLHANDLEARB_T
"
else
- cs_cv_libgl_glhandlearb_cflags=''
- cs_cv_libgl_glhandlearb_lflags=''
- cs_cv_libgl_glhandlearb_libs=''
+ cs_cv_libgl_GLhandleARB_cflags=''
+ cs_cv_libgl_GLhandleARB_lflags=''
+ cs_cv_libgl_GLhandleARB_libs=''
fi
+ if test "" != yes; then
+ echo "$as_me:$LINENO: checking for GLhandle" >&5
+echo $ECHO_N "checking for GLhandle... $ECHO_C" >&6
+if test "${cs_cv_libgl_GLhandle+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
fi
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLhandle x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLhandle=yes
+ cs_cv_libgl_GLhandle_cflags=$cs_build_cflags
+ cs_cv_libgl_GLhandle_lflags=$cs_build_lflags
+ cs_cv_libgl_GLhandle_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLhandle=no
+fi
+
+fi
+echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandle" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLhandle" >&6
+else
+ echo "$as_me:$LINENO: checking for GLhandle" >&5
+echo $ECHO_N "checking for GLhandle... $ECHO_C" >&6
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLhandle x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLhandle=yes
+ cs_cv_libgl_GLhandle_cflags=$cs_build_cflags
+ cs_cv_libgl_GLhandle_lflags=$cs_build_lflags
+ cs_cv_libgl_GLhandle_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLhandle=no
+fi
+
+ echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandle" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLhandle" >&6
+fi
+
+ if test $cs_cv_libgl_GLhandle = yes; then
+ cs_header_text="${cs_header_text}#define CS_HAVE_GLHANDLE_T
+"
+else
+ cs_cv_libgl_GLhandle_cflags=''
+ cs_cv_libgl_GLhandle_lflags=''
+ cs_cv_libgl_GLhandle_libs=''
+
+fi
+
+ if test "" != yes; then
+ echo "$as_me:$LINENO: checking for GLcharARB" >&5
+echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6
+if test "${cs_cv_libgl_GLcharARB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLcharARB x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLcharARB=yes
+ cs_cv_libgl_GLcharARB_cflags=$cs_build_cflags
+ cs_cv_libgl_GLcharARB_lflags=$cs_build_lflags
+ cs_cv_libgl_GLcharARB_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLcharARB=no
+fi
+
+fi
+echo "$as_me:$LINENO: result: $cs_cv_libgl_GLcharARB" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLcharARB" >&6
+else
+ echo "$as_me:$LINENO: checking for GLcharARB" >&5
+echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLcharARB x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLcharARB=yes
+ cs_cv_libgl_GLcharARB_cflags=$cs_build_cflags
+ cs_cv_libgl_GLcharARB_lflags=$cs_build_lflags
+ cs_cv_libgl_GLcharARB_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLcharARB=no
+fi
+
+ echo "$as_me:$LINENO: result: $cs_cv_libgl_GLcharARB" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLcharARB" >&6
+fi
+
+ if test $cs_cv_libgl_GLcharARB = yes; then
+ cs_header_text="${cs_header_text}#define CS_HAVE_GLCHARARB_T
+"
+else
+ cs_cv_libgl_GLcharARB_cflags=''
+ cs_cv_libgl_GLcharARB_lflags=''
+ cs_cv_libgl_GLcharARB_libs=''
+
+fi
+
+ if test "" != yes; then
+ echo "$as_me:$LINENO: checking for GLchar" >&5
+echo $ECHO_N "checking for GLchar... $ECHO_C" >&6
+if test "${cs_cv_libgl_GLchar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLchar x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLchar=yes
+ cs_cv_libgl_GLchar_cflags=$cs_build_cflags
+ cs_cv_libgl_GLchar_lflags=$cs_build_lflags
+ cs_cv_libgl_GLchar_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLchar=no
+fi
+
+fi
+echo "$as_me:$LINENO: result: $cs_cv_libgl_GLchar" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLchar" >&6
+else
+ echo "$as_me:$LINENO: checking for GLchar" >&5
+echo $ECHO_N "checking for GLchar... $ECHO_C" >&6
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if HAVE_WINDOWS_H
+ #if !HAVE_TYPE_INT32
+ typedef long int32;
+ #endif
+ #include <windows.h>
+ #endif
+ #ifndef CS_HEADER_GLOBAL
+ #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
+ #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
+ #endif
+ #ifdef CS_OPENGL_PATH
+ #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
+ #else
+ #include <GL/gl.h>
+ #endif
+int
+main ()
+{
+GLchar x; (void)x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_libgl_GLchar=yes
+ cs_cv_libgl_GLchar_cflags=$cs_build_cflags
+ cs_cv_libgl_GLchar_lflags=$cs_build_lflags
+ cs_cv_libgl_GLchar_libs=$cs_build_libs
+else
+ cs_cv_libgl_GLchar=no
+fi
+
+ echo "$as_me:$LINENO: result: $cs_cv_libgl_GLchar" >&5
+echo "${ECHO_T}$cs_cv_libgl_GLchar" >&6
+fi
+
+ if test $cs_cv_libgl_GLchar = yes; then
+ cs_header_text="${cs_header_text}#define CS_HAVE_GLCHAR_T
+"
+else
+ cs_cv_libgl_GLchar_cflags=''
+ cs_cv_libgl_GLchar_lflags=''
+ cs_cv_libgl_GLchar_libs=''
+
+fi
+
+fi
+
+
if test $cs_cv_libgl = yes; then
if test $with_mesa != no; then
cs_mesa_glu=`echo @@@-lMesaGLU | sed 'y% %#%'`
Modified: CS/trunk/configure.ac
===================================================================
--- CS/trunk/configure.ac 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/configure.ac 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1033,8 +1033,8 @@
#------------------------------------------------------------------------------
# Check for OpenGL and companions. Also check if GLX extensions are supported
# and define the (backward) header property CSGL_EXT_STATIC_ASSERTION if they
-# are _not_ supported. Finally, check if the type GLhandleARB is exported by
-# the GL headers. It is starting to show up in very modern headers, but is
+# are _not_ supported. Finally, check if the some GL types are exported by
+# the GL headers. Some are starting to show up in very modern headers, but are
# absent from most.
#
# IMPLEMENTATION NOTES
@@ -1043,14 +1043,18 @@
# libraries may depend on it (notably Cg).
#------------------------------------------------------------------------------
CS_CHECK_OPENGL
-AS_IF([test $cs_cv_libgl = yes],
- [# Check for GLhandleARB.
- CS_CHECK_BUILD([for GLhandleARB], [cs_cv_libgl_glhandlearb],
+AC_DEFUN([CS_CHECK_OPENGL_TYPE],
+ [CS_CHECK_BUILD([for $1], [cs_cv_libgl_$1],
[AC_LANG_PROGRAM(
[CS_GL_INCLUDE([CS_OPENGL_PATH],[GL],[gl.h])],
- [GLhandleARB x; (void)x;])],
- [], [], [CS_HEADER_PROPERTY([CS_HAVE_GLHANDLEARB_T])], [], [],
+ [$1 x; (void)x;])],
+ [], [], [$2], [], [],
[$cs_cv_libgl_cflags], [$cs_cv_libgl_lflags], [$cs_cv_libgl_libs])])
+AS_IF([test $cs_cv_libgl = yes],
+ [CS_CHECK_OPENGL_TYPE([GLhandleARB], [CS_HEADER_PROPERTY([CS_HAVE_GLHANDLEARB_T])])
+ CS_CHECK_OPENGL_TYPE([GLhandle], [CS_HEADER_PROPERTY([CS_HAVE_GLHANDLE_T])])
+ CS_CHECK_OPENGL_TYPE([GLcharARB], [CS_HEADER_PROPERTY([CS_HAVE_GLCHARARB_T])])
+ CS_CHECK_OPENGL_TYPE([GLchar], [CS_HEADER_PROPERTY([CS_HAVE_GLCHAR_T])])])
CS_CHECK_GLU
CS_CHECK_GLX
# Check for GLX extensions. Define CSGL_EXT_STATIC_ASSERTION if _not_
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/docs/history.txt 2006-09-08 13:34:53 UTC (rev 25301)
@@ -6,6 +6,8 @@
individual changes for each given day, however, are in normal (ascending)
chronological order.
+8-Sep-2006
+ - res added tests for some more GL types.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/include/csplugincommon/opengl/glextmanager.h
===================================================================
--- CS/trunk/include/csplugincommon/opengl/glextmanager.h 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/include/csplugincommon/opengl/glextmanager.h 2006-09-08 13:34:53 UTC (rev 25301)
@@ -129,10 +129,19 @@
/*
Appear in the ARB_shader_objects ext spec.
*/
+#ifndef CS_HAVE_GLCHARARB_T
typedef char GLcharARB;
+#endif
#ifndef CS_HAVE_GLHANDLEARB_T
typedef unsigned int GLhandleARB;
#endif
+/* Identifiers after promotion to core */
+#ifndef CS_HAVE_GLCHAR_T
+typedef GLcharARB GLchar;
+#endif
+#ifndef CS_HAVE_GLHANDLE_T
+typedef GLhandleARB GLhandle;
+#endif
#include "iutil/cmdline.h"
#include "iutil/objreg.h"
Copied: CS/trunk/scripts/python/glext/defs_GL (from rev 25300, CS/trunk/scripts/python/glext/defs_gl)
===================================================================
--- CS/trunk/scripts/python/glext/defs_GL (rev 0)
+++ CS/trunk/scripts/python/glext/defs_GL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,11 @@
+/**\name %Name% constants
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%Tokens%
+/** @} */
+
+/**\name %Name% functions
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%FunctionTypes%
+/** @} */
Copied: CS/trunk/scripts/python/glext/defs_GLver (from rev 25300, CS/trunk/scripts/python/glext/defs_glver)
===================================================================
--- CS/trunk/scripts/python/glext/defs_GLver (rev 0)
+++ CS/trunk/scripts/python/glext/defs_GLver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,13 @@
+/**\name %Name% constants
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+%Tokens%
+/** @} */
+
+/**\name %Name% functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+%FunctionTypes%
+/** @} */
Copied: CS/trunk/scripts/python/glext/defs_WGL (from rev 25300, CS/trunk/scripts/python/glext/defs_wgl)
===================================================================
--- CS/trunk/scripts/python/glext/defs_WGL (rev 0)
+++ CS/trunk/scripts/python/glext/defs_WGL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,14 @@
+#ifdef _WIN32
+/**\name %Name% constants
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%Tokens%
+/** @} */
+
+/**\name %Name% functions
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%FunctionTypes%
+/** @} */
+#endif
+
Deleted: CS/trunk/scripts/python/glext/defs_gl
===================================================================
--- CS/trunk/scripts/python/glext/defs_gl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/defs_gl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,11 +0,0 @@
-/**\name %Name% constants
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%Tokens%
-/** @} */
-
-/**\name %Name% functions
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%FunctionTypes%
-/** @} */
Deleted: CS/trunk/scripts/python/glext/defs_glver
===================================================================
--- CS/trunk/scripts/python/glext/defs_glver 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/defs_glver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,13 +0,0 @@
-/**\name %Name% constants
- * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
- * this extension when the appropriate GL version was detected.
- * @{ */
-%Tokens%
-/** @} */
-
-/**\name %Name% functions
- * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
- * this extension when the appropriate GL version was detected.
- * @{ */
-%FunctionTypes%
-/** @} */
Deleted: CS/trunk/scripts/python/glext/defs_wgl
===================================================================
--- CS/trunk/scripts/python/glext/defs_wgl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/defs_wgl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,14 +0,0 @@
-#ifdef _WIN32
-/**\name %Name% constants
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%Tokens%
-/** @} */
-
-/**\name %Name% functions
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%FunctionTypes%
-/** @} */
-#endif
-
Copied: CS/trunk/scripts/python/glext/ext_flag_GL (from rev 25300, CS/trunk/scripts/python/glext/ext_flag_gl)
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_GL (rev 0)
+++ CS/trunk/scripts/python/glext/ext_flag_GL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,3 @@
+ /** Whether the <a href="%Name:url%">%Name%</a> extension was found.
+ * Set by csGLExtensionManager::Init%Name%(). */
+ bool CS_%Name%;
Copied: CS/trunk/scripts/python/glext/ext_flag_GLver (from rev 25300, CS/trunk/scripts/python/glext/ext_flag_glver)
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_GLver (rev 0)
+++ CS/trunk/scripts/python/glext/ext_flag_GLver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,2 @@
+ /** Whether the corresponding GL version is supported. */
+ bool CS_%Name%;
Copied: CS/trunk/scripts/python/glext/ext_flag_WGL (from rev 25300, CS/trunk/scripts/python/glext/ext_flag_wgl)
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_WGL (rev 0)
+++ CS/trunk/scripts/python/glext/ext_flag_WGL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,3 @@
+ /** Whether the <a href="%Name:url%">%Name%</a> extension was found.
+ * Set by csGLExtensionManager::Init%Name%(). */
+ bool CS_%Name%;
Deleted: CS/trunk/scripts/python/glext/ext_flag_gl
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_gl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/ext_flag_gl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,3 +0,0 @@
- /** Whether the <a href="%Name:url%">%Name%</a> extension was found.
- * Set by csGLExtensionManager::Init%Name%(). */
- bool CS_%Name%;
Deleted: CS/trunk/scripts/python/glext/ext_flag_glver
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_glver 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/ext_flag_glver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,2 +0,0 @@
- /** Whether the corresponding GL version is supported. */
- bool CS_%Name%;
Deleted: CS/trunk/scripts/python/glext/ext_flag_wgl
===================================================================
--- CS/trunk/scripts/python/glext/ext_flag_wgl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/ext_flag_wgl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,3 +0,0 @@
- /** Whether the <a href="%Name:url%">%Name%</a> extension was found.
- * Set by csGLExtensionManager::Init%Name%(). */
- bool CS_%Name%;
Copied: CS/trunk/scripts/python/glext/extcheck_GL (from rev 25300, CS/trunk/scripts/python/glext/extcheck_gl)
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_GL (rev 0)
+++ CS/trunk/scripts/python/glext/extcheck_GL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1 @@
+ CS_%Name% = (strstr (extstrGL, ext) != 0);
Copied: CS/trunk/scripts/python/glext/extcheck_GLver (from rev 25300, CS/trunk/scripts/python/glext/extcheck_glver)
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_GLver (rev 0)
+++ CS/trunk/scripts/python/glext/extcheck_GLver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1 @@
+ CS_%Name% = true;
Copied: CS/trunk/scripts/python/glext/extcheck_WGL (from rev 25300, CS/trunk/scripts/python/glext/extcheck_wgl)
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_WGL (rev 0)
+++ CS/trunk/scripts/python/glext/extcheck_WGL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,3 @@
+ SetupWGLextStr (hDC);
+ if (!extstrWGL) return;
+ CS_%Name% = (strstr (extstrWGL, ext) != 0);
Deleted: CS/trunk/scripts/python/glext/extcheck_gl
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_gl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/extcheck_gl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1 +0,0 @@
- CS_%Name% = (strstr (extstrGL, ext) != 0);
Deleted: CS/trunk/scripts/python/glext/extcheck_glver
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_glver 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/extcheck_glver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1 +0,0 @@
- CS_%Name% = true;
Deleted: CS/trunk/scripts/python/glext/extcheck_wgl
===================================================================
--- CS/trunk/scripts/python/glext/extcheck_wgl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/extcheck_wgl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,3 +0,0 @@
- SetupWGLextStr (hDC);
- if (!extstrWGL) return;
- CS_%Name% = (strstr (extstrWGL, ext) != 0);
Copied: CS/trunk/scripts/python/glext/funcs_GL (from rev 25300, CS/trunk/scripts/python/glext/funcs_gl)
===================================================================
--- CS/trunk/scripts/python/glext/funcs_GL (rev 0)
+++ CS/trunk/scripts/python/glext/funcs_GL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,5 @@
+ /**\name %Name% functions
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%Functions%
+ /** @} */
Copied: CS/trunk/scripts/python/glext/funcs_GLver (from rev 25300, CS/trunk/scripts/python/glext/funcs_glver)
===================================================================
--- CS/trunk/scripts/python/glext/funcs_GLver (rev 0)
+++ CS/trunk/scripts/python/glext/funcs_GLver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,6 @@
+ /**\name %Name% functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when teh appropriate GL version was detected.
+ * @{ */
+%Functions%
+ /** @} */
Copied: CS/trunk/scripts/python/glext/funcs_WGL (from rev 25300, CS/trunk/scripts/python/glext/funcs_wgl)
===================================================================
--- CS/trunk/scripts/python/glext/funcs_WGL (rev 0)
+++ CS/trunk/scripts/python/glext/funcs_WGL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,8 @@
+#ifdef _WIN32
+ /**\name %Name% functions
+ * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
+ * @{ */
+%Functions%
+ /** @} */
+#endif // _WIN32
+
Deleted: CS/trunk/scripts/python/glext/funcs_gl
===================================================================
--- CS/trunk/scripts/python/glext/funcs_gl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/funcs_gl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,5 +0,0 @@
- /**\name %Name% functions
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%Functions%
- /** @} */
Deleted: CS/trunk/scripts/python/glext/funcs_glver
===================================================================
--- CS/trunk/scripts/python/glext/funcs_glver 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/funcs_glver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,6 +0,0 @@
- /**\name %Name% functions
- * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
- * this extension when teh appropriate GL version was detected.
- * @{ */
-%Functions%
- /** @} */
Deleted: CS/trunk/scripts/python/glext/funcs_wgl
===================================================================
--- CS/trunk/scripts/python/glext/funcs_wgl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/funcs_wgl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,8 +0,0 @@
-#ifdef _WIN32
- /**\name %Name% functions
- * For a description of what this ext does, see <a href="%Name:url%">%Name:url%</a>.
- * @{ */
-%Functions%
- /** @} */
-#endif // _WIN32
-
Modified: CS/trunk/scripts/python/glext/headerfiletemplate
===================================================================
--- CS/trunk/scripts/python/glext/headerfiletemplate 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/headerfiletemplate 2006-09-08 13:34:53 UTC (rev 25301)
@@ -125,10 +125,19 @@
/*
Appear in the ARB_shader_objects ext spec.
*/
+#ifndef CS_HAVE_GLCHARARB_T
typedef char GLcharARB;
+#endif
#ifndef CS_HAVE_GLHANDLEARB_T
typedef unsigned int GLhandleARB;
#endif
+/* Identifiers after promotion to core */
+#ifndef CS_HAVE_GLCHAR_T
+typedef GLcharARB GLchar;
+#endif
+#ifndef CS_HAVE_GLHANDLE_T
+typedef GLhandleARB GLhandle;
+#endif
#include "iutil/cmdline.h"
#include "iutil/objreg.h"
Copied: CS/trunk/scripts/python/glext/initext_GL (from rev 25300, CS/trunk/scripts/python/glext/initext_gl)
===================================================================
--- CS/trunk/scripts/python/glext/initext_GL (rev 0)
+++ CS/trunk/scripts/python/glext/initext_GL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,28 @@
+ /** Initialize <a href="%Name:url%">%Name%</a> extension.
+ * Check presence with csGLExtensionFlags::CS_%Name%. */
+ void Init%Name% ()
+ {
+ if (tested_CS_%Name%) return;
+ if (!extstrGL) return;
+ tested_CS_%Name% = true;
+ const char* ext = "%Name%";
+%Depcheck%
+ char cfgkey[%Cfglen% + %Namelen% + 1];
+ sprintf (cfgkey, "%Cfgprefix%%%s", ext);
+
+%Extcheck%
+ bool allclear, funcTest;
+ (void)funcTest; // shut up "variable unused" warnings
+ bool init = CS_%Name%;
+ allclear = true;
+ if (init) // Don't check the functions if ext isn't reported anyway
+ {
+%FunctionsInit%
+ EXTMGR_REPORT_INIT_RESULT("GL", %Name%)
+ }
+ else
+ {
+ Report (msgExtNotFound, "GL", ext);
+ }
+ }
+
Copied: CS/trunk/scripts/python/glext/initext_GLver (from rev 25300, CS/trunk/scripts/python/glext/initext_glver)
===================================================================
--- CS/trunk/scripts/python/glext/initext_GLver (rev 0)
+++ CS/trunk/scripts/python/glext/initext_GLver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,27 @@
+ /**\internal Initialize %Name% pseudo-extension. */
+ void Init%Name% ()
+ {
+ if (tested_CS_%Name%) return;
+ if (!extstrGL) return;
+ tested_CS_%Name% = true;
+ const char* ext = "%Name%";
+%Depcheck%
+ char cfgkey[%Cfglen% + %Namelen% + 1];
+ sprintf (cfgkey, "%Cfgprefix%%%s", ext);
+
+%Extcheck%
+ bool allclear, funcTest;
+ (void)funcTest; // shut up "variable unused" warnings
+ bool init = CS_%Name%;
+ allclear = true;
+ if (init) // Don't check the functions if ext isn't reported anyway
+ {
+%FunctionsInit%
+ EXTMGR_REPORT_INIT_RESULT("GL", %Name%)
+ }
+ else
+ {
+ Report (msgExtNotFound, "GL", ext);
+ }
+ }
+
Copied: CS/trunk/scripts/python/glext/initext_WGL (from rev 25300, CS/trunk/scripts/python/glext/initext_wgl)
===================================================================
--- CS/trunk/scripts/python/glext/initext_WGL (rev 0)
+++ CS/trunk/scripts/python/glext/initext_WGL 2006-09-08 13:34:53 UTC (rev 25301)
@@ -0,0 +1,30 @@
+#ifdef _WIN32
+ /** Initialize <a href="%Name:url%">%Name%</a> extension.
+ * Check presence with csGLExtensionFlags::CS_%Name%. */
+ void Init%Name% (HDC hDC)
+ {
+ if (tested_CS_%Name%) return;
+ tested_CS_%Name% = true;
+ const char* ext = "%Name%";
+ char cfgkey[%Cfglen% + %Namelen% + 1];
+ sprintf (cfgkey, "%Cfgprefix%%%s", ext);
+
+ (void)hDC; // avoid `unused variable' warning.
+%Extcheck%
+ bool allclear, funcTest;
+ (void)funcTest; // avoid `unused variable' warning.
+ bool init = CS_%Name%;
+ allclear = true;
+ if (init)
+ {
+%FunctionsInit%
+ EXTMGR_REPORT_INIT_RESULT("WGL", %Name%)
+ CS_%Name% &= allclear;
+ }
+ else
+ {
+ Report (msgExtNotFound, "WGL", ext);
+ }
+ }
+#endif
+
Deleted: CS/trunk/scripts/python/glext/initext_gl
===================================================================
--- CS/trunk/scripts/python/glext/initext_gl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/initext_gl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,28 +0,0 @@
- /** Initialize <a href="%Name:url%">%Name%</a> extension.
- * Check presence with csGLExtensionFlags::CS_%Name%. */
- void Init%Name% ()
- {
- if (tested_CS_%Name%) return;
- if (!extstrGL) return;
- tested_CS_%Name% = true;
- const char* ext = "%Name%";
-%Depcheck%
- char cfgkey[%Cfglen% + %Namelen% + 1];
- sprintf (cfgkey, "%Cfgprefix%%%s", ext);
-
-%Extcheck%
- bool allclear, funcTest;
- (void)funcTest; // shut up "variable unused" warnings
- bool init = CS_%Name%;
- allclear = true;
- if (init) // Don't check the functions if ext isn't reported anyway
- {
-%FunctionsInit%
- EXTMGR_REPORT_INIT_RESULT("GL", %Name%)
- }
- else
- {
- Report (msgExtNotFound, "GL", ext);
- }
- }
-
Deleted: CS/trunk/scripts/python/glext/initext_glver
===================================================================
--- CS/trunk/scripts/python/glext/initext_glver 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/initext_glver 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,27 +0,0 @@
- /**\internal Initialize %Name% pseudo-extension. */
- void Init%Name% ()
- {
- if (tested_CS_%Name%) return;
- if (!extstrGL) return;
- tested_CS_%Name% = true;
- const char* ext = "%Name%";
-%Depcheck%
- char cfgkey[%Cfglen% + %Namelen% + 1];
- sprintf (cfgkey, "%Cfgprefix%%%s", ext);
-
-%Extcheck%
- bool allclear, funcTest;
- (void)funcTest; // shut up "variable unused" warnings
- bool init = CS_%Name%;
- allclear = true;
- if (init) // Don't check the functions if ext isn't reported anyway
- {
-%FunctionsInit%
- EXTMGR_REPORT_INIT_RESULT("GL", %Name%)
- }
- else
- {
- Report (msgExtNotFound, "GL", ext);
- }
- }
-
Deleted: CS/trunk/scripts/python/glext/initext_wgl
===================================================================
--- CS/trunk/scripts/python/glext/initext_wgl 2006-09-07 15:43:42 UTC (rev 25300)
+++ CS/trunk/scripts/python/glext/initext_wgl 2006-09-08 13:34:53 UTC (rev 25301)
@@ -1,30 +0,0 @@
-#ifdef _WIN32
- /** Initialize <a href="%Name:url%">%Name%</a> extension.
- * Check presence with csGLExtensionFlags::CS_%Name%. */
- void Init%Name% (HDC hDC)
- {
- if (tested_CS_%Name%) return;
- tested_CS_%Name% = true;
- const char* ext = "%Name%";
- char cfgkey[%Cfglen% + %Namelen% + 1];
- sprintf (cfgkey, "%Cfgprefix%%%s", ext);
-
- (void)hDC; // avoid `unused variable' warning.
-%Extcheck%
- bool allclear, funcTest;
- (void)funcTest; // avoid `unused variable' warning.
- bool init = CS_%Name%;
- allclear = true;
- if (init)
- {
-%FunctionsInit%
- EXTMGR_REPORT_INIT_RESULT("WGL", %Name%)
- CS_%Name% &= allclear;
- }
- else
- {
- Report (msgExtNotFound, "WGL", ext);
- }
- }
-#endif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 13:41:42
|
Revision: 25302
http://svn.sourceforge.net/crystal/?rev=25302&view=rev
Author: res2002
Date: 2006-09-08 06:41:28 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Whoops, there is no GLhandle in core.
Modified Paths:
--------------
CS/trunk/configure
CS/trunk/configure.ac
CS/trunk/scripts/python/glext/headerfiletemplate
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure 2006-09-08 13:34:53 UTC (rev 25301)
+++ CS/trunk/configure 2006-09-08 13:41:28 UTC (rev 25302)
@@ -26617,350 +26617,6 @@
fi
if test "" != yes; then
- echo "$as_me:$LINENO: checking for GLhandle" >&5
-echo $ECHO_N "checking for GLhandle... $ECHO_C" >&6
-if test "${cs_cv_libgl_GLhandle+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if HAVE_WINDOWS_H
- #if !HAVE_TYPE_INT32
- typedef long int32;
- #endif
- #include <windows.h>
- #endif
- #ifndef CS_HEADER_GLOBAL
- #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
- #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
- #endif
- #ifdef CS_OPENGL_PATH
- #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
- #else
- #include <GL/gl.h>
- #endif
-int
-main ()
-{
-GLhandle x; (void)x;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libgl_GLhandle=yes
- cs_cv_libgl_GLhandle_cflags=$cs_build_cflags
- cs_cv_libgl_GLhandle_lflags=$cs_build_lflags
- cs_cv_libgl_GLhandle_libs=$cs_build_libs
-else
- cs_cv_libgl_GLhandle=no
-fi
-
-fi
-echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandle" >&5
-echo "${ECHO_T}$cs_cv_libgl_GLhandle" >&6
-else
- echo "$as_me:$LINENO: checking for GLhandle" >&5
-echo $ECHO_N "checking for GLhandle... $ECHO_C" >&6
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_libgl_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_libgl_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_libgl_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if HAVE_WINDOWS_H
- #if !HAVE_TYPE_INT32
- typedef long int32;
- #endif
- #include <windows.h>
- #endif
- #ifndef CS_HEADER_GLOBAL
- #define CS_HEADER_GLOBAL(X,Y) CS_HEADER_GLOBAL_COMPOSE(X,Y)
- #define CS_HEADER_GLOBAL_COMPOSE(X,Y) <X/Y>
- #endif
- #ifdef CS_OPENGL_PATH
- #include CS_HEADER_GLOBAL(CS_OPENGL_PATH,gl.h)
- #else
- #include <GL/gl.h>
- #endif
-int
-main ()
-{
-GLhandle x; (void)x;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_libgl_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_libgl_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_libgl_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libgl_GLhandle=yes
- cs_cv_libgl_GLhandle_cflags=$cs_build_cflags
- cs_cv_libgl_GLhandle_lflags=$cs_build_lflags
- cs_cv_libgl_GLhandle_libs=$cs_build_libs
-else
- cs_cv_libgl_GLhandle=no
-fi
-
- echo "$as_me:$LINENO: result: $cs_cv_libgl_GLhandle" >&5
-echo "${ECHO_T}$cs_cv_libgl_GLhandle" >&6
-fi
-
- if test $cs_cv_libgl_GLhandle = yes; then
- cs_header_text="${cs_header_text}#define CS_HAVE_GLHANDLE_T
-"
-else
- cs_cv_libgl_GLhandle_cflags=''
- cs_cv_libgl_GLhandle_lflags=''
- cs_cv_libgl_GLhandle_libs=''
-
-fi
-
- if test "" != yes; then
echo "$as_me:$LINENO: checking for GLcharARB" >&5
echo $ECHO_N "checking for GLcharARB... $ECHO_C" >&6
if test "${cs_cv_libgl_GLcharARB+set}" = set; then
Modified: CS/trunk/configure.ac
===================================================================
--- CS/trunk/configure.ac 2006-09-08 13:34:53 UTC (rev 25301)
+++ CS/trunk/configure.ac 2006-09-08 13:41:28 UTC (rev 25302)
@@ -1052,7 +1052,6 @@
[$cs_cv_libgl_cflags], [$cs_cv_libgl_lflags], [$cs_cv_libgl_libs])])
AS_IF([test $cs_cv_libgl = yes],
[CS_CHECK_OPENGL_TYPE([GLhandleARB], [CS_HEADER_PROPERTY([CS_HAVE_GLHANDLEARB_T])])
- CS_CHECK_OPENGL_TYPE([GLhandle], [CS_HEADER_PROPERTY([CS_HAVE_GLHANDLE_T])])
CS_CHECK_OPENGL_TYPE([GLcharARB], [CS_HEADER_PROPERTY([CS_HAVE_GLCHARARB_T])])
CS_CHECK_OPENGL_TYPE([GLchar], [CS_HEADER_PROPERTY([CS_HAVE_GLCHAR_T])])])
CS_CHECK_GLU
Modified: CS/trunk/scripts/python/glext/headerfiletemplate
===================================================================
--- CS/trunk/scripts/python/glext/headerfiletemplate 2006-09-08 13:34:53 UTC (rev 25301)
+++ CS/trunk/scripts/python/glext/headerfiletemplate 2006-09-08 13:41:28 UTC (rev 25302)
@@ -135,9 +135,6 @@
#ifndef CS_HAVE_GLCHAR_T
typedef GLcharARB GLchar;
#endif
-#ifndef CS_HAVE_GLHANDLE_T
-typedef GLhandleARB GLhandle;
-#endif
#include "iutil/cmdline.h"
#include "iutil/objreg.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ca...@us...> - 2006-09-08 14:19:02
|
Revision: 25303
http://svn.sourceforge.net/crystal/?rev=25303&view=rev
Author: caedesv
Date: 2006-09-08 07:18:47 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
updated cspace.i for the new particles.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/include/bindings/cspace.i
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 13:41:28 UTC (rev 25302)
+++ CS/trunk/docs/history.txt 2006-09-08 14:18:47 UTC (rev 25303)
@@ -8,6 +8,7 @@
8-Sep-2006
- res added tests for some more GL types.
+ - caedes updated cspace.i for the new particles.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/include/bindings/cspace.i
===================================================================
--- CS/trunk/include/bindings/cspace.i 2006-09-08 13:41:28 UTC (rev 25302)
+++ CS/trunk/include/bindings/cspace.i 2006-09-08 14:18:47 UTC (rev 25303)
@@ -245,10 +245,20 @@
INTERFACE_APPLY(iObjectModelListener)
INTERFACE_APPLY(iObjectRegistry)
INTERFACE_APPLY(iPath)
- INTERFACE_APPLY(iParticlesFactoryState)
- INTERFACE_APPLY(iParticlesObjectState)
- INTERFACE_APPLY(iParticlesPhysics)
- INTERFACE_APPLY(iParticlesStateBase)
+ INTERFACE_APPLY(iParticleEmitter)
+ INTERFACE_APPLY(iParticleEffector)
+ INTERFACE_APPLY(iParticleSystemBase)
+ INTERFACE_APPLY(iParticleSystemFactory)
+ INTERFACE_APPLY(iParticleSystem)
+ INTERFACE_APPLY(iParticleBuiltinEmitterBase)
+ INTERFACE_APPLY(iParticleBuiltinEmitterSphere)
+ INTERFACE_APPLY(iParticleBuiltinEmitterCone)
+ INTERFACE_APPLY(iParticleBuiltinEmitterBox)
+ INTERFACE_APPLY(iParticleBuiltinEmitterCylinder)
+ INTERFACE_APPLY(iParticleBuiltinEmitterFactory)
+ INTERFACE_APPLY(iParticleBuiltinEffectorForce)
+ INTERFACE_APPLY(iParticleBuiltinEffectorLinColor)
+ INTERFACE_APPLY(iParticleBuiltinEffectorFactory)
INTERFACE_APPLY(iPluginManager)
INTERFACE_APPLY(iPolygonMesh)
INTERFACE_APPLY(iPortal)
@@ -421,6 +431,8 @@
%apply float * OUTPUT { float & ra };
%apply float * OUTPUT { float & rb };
%apply float * OUTPUT { float * pr }; // iMeshObject::HitBeam*().
+%apply float * OUTPUT { float & max };
+%apply float * OUTPUT { float & min };
// input/output arguments
%apply bool * INOUT { bool & mirror };
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 15:08:19
|
Revision: 25304
http://svn.sourceforge.net/crystal/?rev=25304&view=rev
Author: res2002
Date: 2006-09-08 08:07:28 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res added some more GL extensions and missing GL versions up to 2.1
to the extension manager.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/include/csplugincommon/opengl/glextmanager.h
CS/trunk/scripts/python/metaglext.xml
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 14:18:47 UTC (rev 25303)
+++ CS/trunk/docs/history.txt 2006-09-08 15:07:28 UTC (rev 25304)
@@ -9,6 +9,8 @@
8-Sep-2006
- res added tests for some more GL types.
- caedes updated cspace.i for the new particles.
+ - res added some more GL extensions and missing GL versions up to 2.1
+ to the extension manager.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/include/csplugincommon/opengl/glextmanager.h
===================================================================
--- CS/trunk/include/csplugincommon/opengl/glextmanager.h 2006-09-08 14:18:47 UTC (rev 25303)
+++ CS/trunk/include/csplugincommon/opengl/glextmanager.h 2006-09-08 15:07:28 UTC (rev 25304)
@@ -139,9 +139,6 @@
#ifndef CS_HAVE_GLCHAR_T
typedef GLcharARB GLchar;
#endif
-#ifndef CS_HAVE_GLHANDLE_T
-typedef GLhandleARB GLhandle;
-#endif
#include "iutil/cmdline.h"
#include "iutil/objreg.h"
@@ -775,6 +772,980 @@
typedef GLvoid (csAPIENTRY* csGLGETCOMPRESSEDTEXIMAGE) (GLenum target, GLint level, GLvoid* img);
/** @} */
+/**\name GL_version_1_4 constants
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+#ifndef GL_GENERATE_MIPMAP
+#define GL_GENERATE_MIPMAP 33169
+#endif
+
+#ifndef GL_DEPTH_COMPONENT16
+#define GL_DEPTH_COMPONENT16 33189
+#endif
+
+#ifndef GL_DEPTH_COMPONENT24
+#define GL_DEPTH_COMPONENT24 33190
+#endif
+
+#ifndef GL_DEPTH_COMPONENT32
+#define GL_DEPTH_COMPONENT32 33191
+#endif
+
+#ifndef GL_TEXTURE_DEPTH_SIZE
+#define GL_TEXTURE_DEPTH_SIZE 34890
+#endif
+
+#ifndef GL_DEPTH_TEXTURE_MODE
+#define GL_DEPTH_TEXTURE_MODE 34891
+#endif
+
+#ifndef GL_TEXTURE_COMPARE_MODE
+#define GL_TEXTURE_COMPARE_MODE 34892
+#endif
+
+#ifndef GL_TEXTURE_COMPARE_FUNC
+#define GL_TEXTURE_COMPARE_FUNC 34893
+#endif
+
+#ifndef GL_COMPARE_R_TO_TEXTURE
+#define GL_COMPARE_R_TO_TEXTURE 34894
+#endif
+
+#ifndef GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORDINATE_SOURCE 33872
+#endif
+
+#ifndef GL_FOG_COORDINATE
+#define GL_FOG_COORDINATE 33873
+#endif
+
+#ifndef GL_FRAGMENT_DEPTH
+#define GL_FRAGMENT_DEPTH 33874
+#endif
+
+#ifndef GL_CURRENT_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORDINATE 33875
+#endif
+
+#ifndef GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORDINATE_ARRAY_TYPE 33876
+#endif
+
+#ifndef GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 33877
+#endif
+
+#ifndef GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORDINATE_ARRAY_POINTER 33878
+#endif
+
+#ifndef GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORDINATE_ARRAY 33879
+#endif
+
+#ifndef GL_POINT_SIZE_MIN
+#define GL_POINT_SIZE_MIN 33062
+#endif
+
+#ifndef GL_POINT_SIZE_MAX
+#define GL_POINT_SIZE_MAX 33063
+#endif
+
+#ifndef GL_POINT_FADE_THRESHOLD_SIZE
+#define GL_POINT_FADE_THRESHOLD_SIZE 33064
+#endif
+
+#ifndef GL_POINT_DISTANCE_ATTENUATION
+#define GL_POINT_DISTANCE_ATTENUATION 33065
+#endif
+
+#ifndef GL_COLOR_SUM
+#define GL_COLOR_SUM 33880
+#endif
+
+#ifndef GL_CURRENT_SECONDARY_COLOR
+#define GL_CURRENT_SECONDARY_COLOR 33881
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY_SIZE
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 33882
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY_TYPE
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 33883
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY_STRIDE
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 33884
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY_POINTER
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 33885
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY
+#define GL_SECONDARY_COLOR_ARRAY 33886
+#endif
+
+#ifndef GL_BLEND_DST_RGB
+#define GL_BLEND_DST_RGB 0x80C8
+#endif
+
+#ifndef GL_BLEND_SRC_RGB
+#define GL_BLEND_SRC_RGB 0x80C9
+#endif
+
+#ifndef GL_BLEND_DST_ALPHA
+#define GL_BLEND_DST_ALPHA 0x80CA
+#endif
+
+#ifndef GL_BLEND_SRC_ALPHA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#endif
+
+#ifndef GL_INCR_WRAP
+#define GL_INCR_WRAP 34055
+#endif
+
+#ifndef GL_DECR_WRAP
+#define GL_DECR_WRAP 34056
+#endif
+
+#ifndef GL_TEXTURE_FILTER_CONTROL
+#define GL_TEXTURE_FILTER_CONTROL 34048
+#endif
+
+#ifndef GL_TEXTURE_LOD_BIAS
+#define GL_TEXTURE_LOD_BIAS 34049
+#endif
+
+#ifndef GL_MAX_TEXTURE_LOD_BIAS
+#define GL_MAX_TEXTURE_LOD_BIAS 34045
+#endif
+
+#ifndef GL_MIRRORED_REPEAT
+#define GL_MIRRORED_REPEAT 33648
+#endif
+
+
+/** @} */
+
+/**\name GL_version_1_4 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDF) (GLfloat coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDD) (GLdouble coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDFV) (GLfloat coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDDV) (GLdouble coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDPOINTER) (GLenum type, GLsizei stride, GLvoid* pointer);
+typedef GLvoid (csAPIENTRY* csGLMULTIDRAWARRAYS) (GLenum mode, GLint* first, GLsizei* count, GLsizei primcount);
+typedef GLvoid (csAPIENTRY* csGLMULTIDRAWELEMENTS) (GLenum mode, GLsizei* count, GLenum type, const GLvoid* indices, GLsizei primcount);
+typedef GLvoid (csAPIENTRY* csGLPOINTPARAMETERF) (GLenum pname, GLfloat param);
+typedef GLvoid (csAPIENTRY* csGLPOINTPARAMETERFV) (GLenum pname, GLfloat* params);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3B) (GLbyte components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3S) (GLshort components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3I) (GLint components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3F) (GLfloat components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3D) (GLdouble components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3UB) (GLubyte components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3US) (GLushort components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3UI) (GLuint components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3BV) (GLbyte components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3SV) (GLshort components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3IV) (GLint components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3FV) (GLfloat components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3DV) (GLdouble components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3UBV) (GLubyte components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3USV) (GLushort components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLOR3UIV) (GLuint components);
+typedef GLvoid (csAPIENTRY* csGLSECONDARYCOLORPOINTER) (GLint size, GLenum type, GLsizei stride, GLvoid* pointer);
+typedef GLvoid (csAPIENTRY* csGLBLENDFUNCSEPARATE) (GLenum sFactorRGB, GLenum dFactorRGB, GLenum sFactorAlpha, GLenum dFactorAlpha);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2D) (GLdouble x, GLdouble y);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2F) (GLfloat x, GLfloat y);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2I) (GLint x, GLint y);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2S) (GLshort x, GLshort y);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2DV) (const GLdouble* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2FV) (const GLfloat* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2IV) (const GLint* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS2SV) (const GLshort* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3D) (GLdouble x, GLdouble y, GLdouble z);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3F) (GLfloat x, GLfloat y, GLfloat z);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3I) (GLint x, GLint y, GLint z);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3S) (GLshort x, GLshort y, GLshort z);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3DV) (const GLdouble* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3FV) (const GLfloat* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3IV) (const GLint* p);
+typedef GLvoid (csAPIENTRY* csGLWINDOWPOS3SV) (const GLshort* p);
+
+/** @} */
+/**\name GL_version_1_5 constants
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+#ifndef GL_ARRAY_BUFFER
+#define GL_ARRAY_BUFFER 34962
+#endif
+
+#ifndef GL_ELEMENT_ARRAY_BUFFER
+#define GL_ELEMENT_ARRAY_BUFFER 34963
+#endif
+
+#ifndef GL_ARRAY_BUFFER_BINDING
+#define GL_ARRAY_BUFFER_BINDING 34964
+#endif
+
+#ifndef GL_ELEMENT_ARRAY_BUFFER_BINDING
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 34965
+#endif
+
+#ifndef GL_VERTEX_ARRAY_BUFFER_BINDING
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 34966
+#endif
+
+#ifndef GL_NORMAL_ARRAY_BUFFER_BINDING
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 34967
+#endif
+
+#ifndef GL_COLOR_ARRAY_BUFFER_BINDING
+#define GL_COLOR_ARRAY_BUFFER_BINDING 34968
+#endif
+
+#ifndef GL_INDEX_ARRAY_BUFFER_BINDING
+#define GL_INDEX_ARRAY_BUFFER_BINDING 34969
+#endif
+
+#ifndef GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 34970
+#endif
+
+#ifndef GL_EDGE_FLAG_ARRAY_BUFFER_BINDING
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 34971
+#endif
+
+#ifndef GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 34972
+#endif
+
+#ifndef GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 34973
+#endif
+
+#ifndef GL_WEIGHT_ARRAY_BUFFER_BINDING
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 34974
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 34975
+#endif
+
+#ifndef GL_STREAM_DRAW
+#define GL_STREAM_DRAW 35040
+#endif
+
+#ifndef GL_STREAM_READ
+#define GL_STREAM_READ 35041
+#endif
+
+#ifndef GL_STREAM_COPY
+#define GL_STREAM_COPY 35042
+#endif
+
+#ifndef GL_STATIC_DRAW
+#define GL_STATIC_DRAW 35044
+#endif
+
+#ifndef GL_STATIC_READ
+#define GL_STATIC_READ 35045
+#endif
+
+#ifndef GL_STATIC_COPY
+#define GL_STATIC_COPY 35046
+#endif
+
+#ifndef GL_DYNAMIC_DRAW
+#define GL_DYNAMIC_DRAW 35048
+#endif
+
+#ifndef GL_DYNAMIC_READ
+#define GL_DYNAMIC_READ 35049
+#endif
+
+#ifndef GL_DYNAMIC_COPY
+#define GL_DYNAMIC_COPY 35050
+#endif
+
+#ifndef GL_READ_ONLY
+#define GL_READ_ONLY 35000
+#endif
+
+#ifndef GL_WRITE_ONLY
+#define GL_WRITE_ONLY 35001
+#endif
+
+#ifndef GL_READ_WRITE
+#define GL_READ_WRITE 35002
+#endif
+
+#ifndef GL_BUFFER_SIZE
+#define GL_BUFFER_SIZE 34660
+#endif
+
+#ifndef GL_BUFFER_USAGE
+#define GL_BUFFER_USAGE 34661
+#endif
+
+#ifndef GL_BUFFER_ACCESS
+#define GL_BUFFER_ACCESS 35003
+#endif
+
+#ifndef GL_BUFFER_MAPPED
+#define GL_BUFFER_MAPPED 35004
+#endif
+
+#ifndef GL_BUFFER_MAP_POINTER
+#define GL_BUFFER_MAP_POINTER 35005
+#endif
+
+#ifndef GL_SAMPLES_PASSED
+#define GL_SAMPLES_PASSED 0x8914
+#endif
+
+#ifndef GL_QUERY_COUNTER_BITS
+#define GL_QUERY_COUNTER_BITS 0x8864
+#endif
+
+#ifndef GL_CURRENT_QUERY
+#define GL_CURRENT_QUERY 0x8865
+#endif
+
+#ifndef GL_QUERY_RESULT
+#define GL_QUERY_RESULT 0x8866
+#endif
+
+#ifndef GL_QUERY_RESULT_AVAILABLE
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#endif
+
+#ifndef GL_FOG_COORD_SOURCE
+#define GL_FOG_COORD_SOURCE GL_FOG_COORDINATE_SOURCE
+#endif
+
+#ifndef GL_FOG_COORD
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#endif
+
+#ifndef GL_CURRENT_FOG_COORD
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#endif
+
+#ifndef GL_FOG_COORD_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#endif
+
+#ifndef GL_FOG_COORD_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#endif
+
+#ifndef GL_FOG_COORD_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#endif
+
+#ifndef GL_FOG_COORD_ARRAY
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#endif
+
+#ifndef GL_FOG_COORD_ARRAY_BUFFER_BINDING
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB
+#endif
+
+#ifndef GL_SRC0_RGB
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#endif
+
+#ifndef GL_SRC1_RGB
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#endif
+
+#ifndef GL_SRC2_RGB
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#endif
+
+#ifndef GL_SRC0_ALPHA
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#endif
+
+#ifndef GL_SRC1_ALPHA
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#endif
+
+#ifndef GL_SRC2_ALPHA
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#endif
+
+
+/** @} */
+
+/**\name GL_version_1_5 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLBINDBUFFER) (GLenum target, GLuint buffer);
+typedef GLvoid (csAPIENTRY* csGLDELETEBUFFERS) (GLsizei n, const GLuint* buffers);
+typedef GLvoid (csAPIENTRY* csGLGENBUFFERS) (GLsizei n, GLuint* buffers);
+typedef GLvoid (csAPIENTRY* csGLBUFFERDATA) (GLenum target, GLsizei size, const GLvoid* data, GLenum usage);
+typedef GLvoid (csAPIENTRY* csGLBUFFERSUBDATA) (GLenum target, GLsizei offset, GLsizei size, const GLvoid* data);
+typedef GLvoid* (csAPIENTRY* csGLMAPBUFFER) (GLenum target, GLenum access);
+typedef GLboolean (csAPIENTRY* csGLUNMAPBUFFER) (GLenum target);
+typedef GLboolean (csAPIENTRY* csGLISBUFFER) (GLuint buffer);
+typedef GLvoid (csAPIENTRY* csGLGETBUFFERSUBDATA) (GLenum target, GLsizei offset, GLsizei size, GLvoid* data);
+typedef GLvoid (csAPIENTRY* csGLGETBUFFERPOINTERV) (GLenum target, GLenum pname, GLvoid** params);
+typedef GLvoid (csAPIENTRY* csGLGETBUFFERPARAMETERIV) (GLenum target, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGENQUERIES) (GLsizei n, GLuint* ids);
+typedef GLvoid (csAPIENTRY* csGLDELETEQUERIES) (GLsizei n, GLuint* ids);
+typedef GLboolean (csAPIENTRY* csGLISQUERY) (GLuint id);
+typedef GLvoid (csAPIENTRY* csGLBEGINQUERY) (GLenum target, GLuint id);
+typedef GLvoid (csAPIENTRY* csGLENDQUERY) (GLenum target);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYIV) (GLenum target, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYOBJECTIV) (GLuint id, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYOBJECTUIV) (GLuint id, GLenum pname, GLuint* params);
+
+/** @} */
+/**\name GL_version_2_0 constants
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+#ifndef GL_PROGRAM_OBJECT
+#define GL_PROGRAM_OBJECT 0x8B40
+#endif
+
+#ifndef GL_OBJECT_TYPE
+#define GL_OBJECT_TYPE 0x8B4E
+#endif
+
+#ifndef GL_OBJECT_SUBTYPE
+#define GL_OBJECT_SUBTYPE 0x8B4F
+#endif
+
+#ifndef GL_OBJECT_DELETE_STATUS
+#define GL_OBJECT_DELETE_STATUS 0x8B80
+#endif
+
+#ifndef GL_OBJECT_COMPILE_STATUS
+#define GL_OBJECT_COMPILE_STATUS 0x8B81
+#endif
+
+#ifndef GL_OBJECT_LINK_STATUS
+#define GL_OBJECT_LINK_STATUS 0x8B82
+#endif
+
+#ifndef GL_OBJECT_VALIDATE_STATUS
+#define GL_OBJECT_VALIDATE_STATUS 0x8B83
+#endif
+
+#ifndef GL_OBJECT_INFO_LOG_LENGTH
+#define GL_OBJECT_INFO_LOG_LENGTH 0x8B84
+#endif
+
+#ifndef GL_OBJECT_ATTACHED_OBJECTS
+#define GL_OBJECT_ATTACHED_OBJECTS 0x8B85
+#endif
+
+#ifndef GL_OBJECT_ACTIVE_UNIFORMS
+#define GL_OBJECT_ACTIVE_UNIFORMS 0x8B86
+#endif
+
+#ifndef GL_OBJECT_ACTIVE_UNIFORMS_MAX_LENGTH
+#define GL_OBJECT_ACTIVE_UNIFORMS_MAX_LENGTH 0x8B87
+#endif
+
+#ifndef GL_OBJECT_SHADER_SOURCE_LENGTH
+#define GL_OBJECT_SHADER_SOURCE_LENGTH 0x8B88
+#endif
+
+#ifndef GL_SHADER_OBJECT
+#define GL_SHADER_OBJECT 0x8B48
+#endif
+
+#ifndef GL_FLOAT_VEC2
+#define GL_FLOAT_VEC2 0x8B50
+#endif
+
+#ifndef GL_FLOAT_VEC3
+#define GL_FLOAT_VEC3 0x8B51
+#endif
+
+#ifndef GL_FLOAT_VEC4
+#define GL_FLOAT_VEC4 0x8B52
+#endif
+
+#ifndef GL_INT_VEC2
+#define GL_INT_VEC2 0x8B53
+#endif
+
+#ifndef GL_INT_VEC3
+#define GL_INT_VEC3 0x8B54
+#endif
+
+#ifndef GL_INT_VEC4
+#define GL_INT_VEC4 0x8B55
+#endif
+
+#ifndef GL_BOOL
+#define GL_BOOL 0x8B56
+#endif
+
+#ifndef GL_BOOL_VEC2
+#define GL_BOOL_VEC2 0x8B57
+#endif
+
+#ifndef GL_BOOL_VEC3
+#define GL_BOOL_VEC3 0x8B58
+#endif
+
+#ifndef GL_BOOL_VEC4
+#define GL_BOOL_VEC4 0x8B59
+#endif
+
+#ifndef GL_FLOAT_MAT2
+#define GL_FLOAT_MAT2 0x8B5A
+#endif
+
+#ifndef GL_FLOAT_MAT3
+#define GL_FLOAT_MAT3 0x8B5B
+#endif
+
+#ifndef GL_FLOAT_MAT4
+#define GL_FLOAT_MAT4 0x8B5C
+#endif
+
+#ifndef GL_FRAGMENT_SHADER
+#define GL_FRAGMENT_SHADER 0x8B30
+#endif
+
+#ifndef GL_MAX_FRAGMENT_UNIFORM_COMPONENTS
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#endif
+
+#ifndef GL_MAX_TEXTURE_COORDS
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#endif
+
+#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#endif
+
+#ifndef GL_OBJECT_TYPE
+#define GL_OBJECT_TYPE 0x8B4E
+#endif
+
+#ifndef GL_OBJECT_SUBTYPE
+#define GL_OBJECT_SUBTYPE 0x8B4F
+#endif
+
+#ifndef GL_SHADER_OBJECT
+#define GL_SHADER_OBJECT 0x8B48
+#endif
+
+#ifndef GL_VERTEX_SHADER
+#define GL_VERTEX_SHADER 0x8B31
+#endif
+
+#ifndef GL_MAX_VERTEX_UNIFORM_COMPONENTS
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#endif
+
+#ifndef GL_MAX_VARYING_FLOATS
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#endif
+
+#ifndef GL_MAX_VERTEX_ATTRIBS
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#endif
+
+#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#endif
+
+#ifndef GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x884C
+#endif
+
+#ifndef GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x884D
+#endif
+
+#ifndef GL_MAX_TEXTURE_COORDS
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#endif
+
+#ifndef GL_VERTEX_PROGRAM_POINT_SIZE
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#endif
+
+#ifndef GL_VERTEX_PROGRAM_TWO_SIDE
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#endif
+
+#ifndef GL_OBJECT_TYPE
+#define GL_OBJECT_TYPE 0x8B4E
+#endif
+
+#ifndef GL_OBJECT_SUBTYPE
+#define GL_OBJECT_SUBTYPE 0x8B4F
+#endif
+
+#ifndef GL_OBJECT_ACTIVE_ATTRIBUTES
+#define GL_OBJECT_ACTIVE_ATTRIBUTES 0x8B89
+#endif
+
+#ifndef GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#endif
+
+#ifndef GL_SHADER_OBJECT
+#define GL_SHADER_OBJECT 0x8B48
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_ENABLED
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_SIZE
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_STRIDE
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_TYPE
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_NORMALIZED
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#endif
+
+#ifndef GL_CURRENT_VERTEX_ATTRIB
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#endif
+
+#ifndef GL_VERTEX_ATTRIB_ARRAY_POINTER
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#endif
+
+#ifndef GL_FLOAT_VEC2
+#define GL_FLOAT_VEC2 0x8B50
+#endif
+
+#ifndef GL_FLOAT_VEC3
+#define GL_FLOAT_VEC3 0x8B51
+#endif
+
+#ifndef GL_FLOAT_VEC4
+#define GL_FLOAT_VEC4 0x8B52
+#endif
+
+#ifndef GL_FLOAT_MAT2
+#define GL_FLOAT_MAT2 0x8B5A
+#endif
+
+#ifndef GL_FLOAT_MAT3
+#define GL_FLOAT_MAT3 0x8B5B
+#endif
+
+#ifndef GL_FLOAT_MAT4
+#define GL_FLOAT_MAT4 0x8B5C
+#endif
+
+#ifndef GL_MAX_DRAW_BUFFERS
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#endif
+
+#ifndef GL_DRAW_BUFFER0
+#define GL_DRAW_BUFFER0 0x8825
+#endif
+
+#ifndef GL_DRAW_BUFFER1
+#define GL_DRAW_BUFFER1 0x8826
+#endif
+
+#ifndef GL_DRAW_BUFFER2
+#define GL_DRAW_BUFFER2 0x8827
+#endif
+
+#ifndef GL_DRAW_BUFFER3
+#define GL_DRAW_BUFFER3 0x8828
+#endif
+
+#ifndef GL_DRAW_BUFFER4
+#define GL_DRAW_BUFFER4 0x8829
+#endif
+
+#ifndef GL_DRAW_BUFFER5
+#define GL_DRAW_BUFFER5 0x882A
+#endif
+
+#ifndef GL_DRAW_BUFFER6
+#define GL_DRAW_BUFFER6 0x882B
+#endif
+
+#ifndef GL_DRAW_BUFFER7
+#define GL_DRAW_BUFFER7 0x882C
+#endif
+
+#ifndef GL_DRAW_BUFFER8
+#define GL_DRAW_BUFFER8 0x882D
+#endif
+
+#ifndef GL_DRAW_BUFFER9
+#define GL_DRAW_BUFFER9 0x882E
+#endif
+
+#ifndef GL_DRAW_BUFFER10
+#define GL_DRAW_BUFFER10 0x882F
+#endif
+
+#ifndef GL_DRAW_BUFFER11
+#define GL_DRAW_BUFFER11 0x8830
+#endif
+
+#ifndef GL_DRAW_BUFFER12
+#define GL_DRAW_BUFFER12 0x8831
+#endif
+
+#ifndef GL_DRAW_BUFFER13
+#define GL_DRAW_BUFFER13 0x8832
+#endif
+
+#ifndef GL_DRAW_BUFFER14
+#define GL_DRAW_BUFFER14 0x8833
+#endif
+
+#ifndef GL_DRAW_BUFFER15
+#define GL_DRAW_BUFFER15 0x8834
+#endif
+
+#ifndef GL_POINT_SPRITE
+#define GL_POINT_SPRITE 0x8861
+#endif
+
+#ifndef GL_COORD_REPLACE
+#define GL_COORD_REPLACE 0x8862
+#endif
+
+#ifndef GL_POINT_SPRITE_COORD_ORIGIN
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#endif
+
+#ifndef GL_LOWER_LEFT
+#define GL_LOWER_LEFT 0x8CA1
+#endif
+
+#ifndef GL_UPPER_LEFT
+#define GL_UPPER_LEFT 0x8CA2
+#endif
+
+#ifndef GL_BLEND_EQUATION_RGB
+#define GL_BLEND_EQUATION_RGB BLEND_EQUATION
+#endif
+
+#ifndef GL_BLEND_EQUATION_ALPHA
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#endif
+
+#ifndef GL_STENCIL_BACK_REF
+#define GL_STENCIL_BACK_REF 0x8CA3
+#endif
+
+#ifndef GL_STENCIL_BACK_VALUE_MASK
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#endif
+
+#ifndef GL_STENCIL_BACK_WRITEMASK
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+#endif
+
+
+/** @} */
+
+/**\name GL_version_2_0 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLDELETESHADER) (GLuint obj);
+typedef GLuint (csAPIENTRY* csGLGETHANDLE) (GLenum pname);
+typedef GLvoid (csAPIENTRY* csGLDETACHSHADER) (GLuint containerObj, GLuint attachedObj);
+typedef GLuint (csAPIENTRY* csGLCREATESHADER) (GLenum shaderType);
+typedef GLvoid (csAPIENTRY* csGLSHADERSOURCE) (GLuint shaderObj, GLsizei count, const GLchar** string, const GLint* length);
+typedef GLvoid (csAPIENTRY* csGLCOMPILESHADER) (GLuint shaderObj);
+typedef GLuint (csAPIENTRY* csGLCREATEPROGRAMOBJECT) ();
+typedef GLvoid (csAPIENTRY* csGLATTACHSHADER) (GLuint containerObj, GLuint Obj);
+typedef GLvoid (csAPIENTRY* csGLLINKPROGRAM) (GLuint programObj);
+typedef GLvoid (csAPIENTRY* csGLUSEPROGRAM) (GLuint programObj);
+typedef GLvoid (csAPIENTRY* csGLDELETEPROGRAM) (GLuint programObj);
+typedef GLvoid (csAPIENTRY* csGLVALIDATEPROGRAM) (GLuint programObj);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM1F) (GLint location, GLfloat v0);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM2F) (GLint location, GLfloat v0, GLfloat v1);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM3F) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM4F) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM1I) (GLint location, GLint v0);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM2I) (GLint location, GLint v0, GLint v1);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM3I) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM4I) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM1FV) (GLint location, GLsizei count, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM2FV) (GLint location, GLsizei count, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM3FV) (GLint location, GLsizei count, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM4FV) (GLint location, GLsizei count, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM1IV) (GLint location, GLsizei count, GLint* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM2IV) (GLint location, GLsizei count, GLint* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM3IV) (GLint location, GLsizei count, GLint* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORM4IV) (GLint location, GLsizei count, GLint* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX2FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX3FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX4FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLGETOBJECTPARAMETERFV) (GLuint obj, GLenum pname, GLfloat* params);
+typedef GLvoid (csAPIENTRY* csGLGETOBJECTPARAMETERIV) (GLuint obj, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETINFOLOG) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* infoLog);
+typedef GLvoid (csAPIENTRY* csGLGETATTACHEDOBJECTS) (GLuint containerObj, GLsizei maxCount, GLsizei* count, GLuint* obj);
+typedef GLint (csAPIENTRY* csGLGETUNIFORMLOCATION) (GLuint programObj, const GLchar* name);
+typedef GLvoid (csAPIENTRY* csGLGETACTIVEUNIFORM) (GLuint programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef GLint (csAPIENTRY* csGLGETUNIFORMFV) (GLuint programObj, GLint location, GLfloat* params);
+typedef GLint (csAPIENTRY* csGLGETUNIFORMIV) (GLuint programObj, GLint location, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETSHADERSOURCE) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1S) (GLuint index, GLshort x);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1F) (GLuint index, GLfloat x);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1D) (GLuint index, GLdouble x);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2S) (GLuint index, GLshort x, GLshort y);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2F) (GLuint index, GLfloat x, GLfloat y);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2D) (GLuint index, GLdouble x, GLdouble y);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3S) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3F) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3D) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4S) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4F) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4D) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NUB) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1SV) (GLuint index, const GLshort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1FV) (GLuint index, const GLfloat* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB1DV) (GLuint index, const GLdouble* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2SV) (GLuint index, const GLshort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2FV) (GLuint index, const GLfloat* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB2DV) (GLuint index, const GLdouble* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3SV) (GLuint index, const GLshort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3FV) (GLuint index, const GLfloat* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB3DV) (GLuint index, const GLdouble* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4BV) (GLuint index, const GLbyte* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4SV) (GLuint index, const GLshort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4IV) (GLuint index, const GLint* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4UBV) (GLuint index, const GLubyte* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4USV) (GLuint index, const GLushort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4UIV) (GLuint index, const GLuint* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4FV) (GLuint index, const GLfloat* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4DV) (GLuint index, const GLdouble* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NBV) (GLuint index, const GLbyte* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NSV) (GLuint index, const GLshort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NIV) (GLuint index, const GLint* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NUBV) (GLuint index, const GLubyte* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NUSV) (GLuint index, const GLushort* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIB4NUIV) (GLuint index, const GLuint* v);
+typedef GLvoid (csAPIENTRY* csGLVERTEXATTRIBPOINTER) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
+typedef GLvoid (csAPIENTRY* csGLENABLEVERTEXATTRIBARRAY) (GLuint index);
+typedef GLvoid (csAPIENTRY* csGLDISABLEVERTEXATTRIBARRAY) (GLuint index);
+typedef GLvoid (csAPIENTRY* csGLBINDATTRIBLOCATION) (GLuint programObj, GLuint index, const GLchar* name);
+typedef GLvoid (csAPIENTRY* csGLGETACTIVEATTRIB) (GLuint programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef GLint (csAPIENTRY* csGLGETATTRIBLOCATION) (GLuint programObj, const GLchar* name);
+typedef GLvoid (csAPIENTRY* csGLGETVERTEXATTRIBPOINTERV) (GLuint index, GLenum pname, GLvoid** pointer);
+typedef GLvoid (csAPIENTRY* csGLBLENDEQUATIONSEPARATE) (GLenum modeRGB, GLenum modeAlpha);
+typedef GLvoid (csAPIENTRY* csGLSTENCILFUNCSEPARATE) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef GLvoid (csAPIENTRY* csGLSTENCILOPSEPARATE) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+
+/** @} */
+/**\name GL_version_2_1 constants
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+#ifndef GL_PIXEL_PACK_BUFFER
+#define GL_PIXEL_PACK_BUFFER 0x88EB
+#endif
+
+#ifndef GL_PIXEL_UNPACK_BUFFER
+#define GL_PIXEL_UNPACK_BUFFER 0x88EC
+#endif
+
+#ifndef GL_PIXEL_PACK_BUFFER_BINDING
+#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED
+#endif
+
+#ifndef GL_PIXEL_UNPACK_BUFFER_BINDING
+#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF
+#endif
+
+#ifndef GL_SRGB
+#define GL_SRGB 0x8C40
+#endif
+
+#ifndef GL_SRGB8
+#define GL_SRGB8 0x8C41
+#endif
+
+#ifndef GL_SRGB_ALPHA
+#define GL_SRGB_ALPHA 0x8C42
+#endif
+
+#ifndef GL_SRGB8_ALPHA8
+#define GL_SRGB8_ALPHA8 0x8C43
+#endif
+
+#ifndef GL_SLUMINANCE_ALPHA
+#define GL_SLUMINANCE_ALPHA 0x8C44
+#endif
+
+#ifndef GL_SLUMINANCE8_ALPHA8
+#define GL_SLUMINANCE8_ALPHA8 0x8C45
+#endif
+
+#ifndef GL_SLUMINANCE
+#define GL_SLUMINANCE 0x8C46
+#endif
+
+#ifndef GL_SLUMINANCE8
+#define GL_SLUMINANCE8 0x8C47
+#endif
+
+#ifndef GL_COMPRESSED_SRGB
+#define GL_COMPRESSED_SRGB 0x8C48
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_ALPHA
+#define GL_COMPRESSED_SRGB_ALPHA 0x8C49
+#endif
+
+#ifndef GL_COMPRESSED_SLUMINANCE
+#define GL_COMPRESSED_SLUMINANCE 0x8C4A
+#endif
+
+#ifndef GL_COMPRESSED_SLUMINANCE_ALPHA
+#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B
+#endif
+
+
+/** @} */
+
+/**\name GL_version_2_1 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when the appropriate GL version was detected.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX2X3FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX3X2FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX2X4FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX4X2FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX3X4FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+typedef GLvoid (csAPIENTRY* csGLUNIFORMMATRIX4X3FV) (GLint location, GLsizei count, GLboolean transpose, GLfloat* value);
+
+/** @} */
/**\name GL_ARB_imaging constants
* For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/ARB/imaging.txt">http://www.opengl.org/registry/specs/ARB/imaging.txt</a>.
* @{ */
@@ -2817,10 +3788,10 @@
/**\name GL_EXT_fog_coord functions
* For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/EXT/fog_coord.txt">http://www.opengl.org/registry/specs/EXT/fog_coord.txt</a>.
* @{ */
-typedef GLvoid (csAPIENTRY* csGLFOGCOORDFEXFLOAT) (GLfloat coord);
-typedef GLvoid (csAPIENTRY* csGLFOGCOORDDEXDOUBLE) (GLdouble coord);
-typedef GLvoid (csAPIENTRY* csGLFOGCOORDFVEXFLOAT) (GLfloat coord);
-typedef GLvoid (csAPIENTRY* csGLFOGCOORDDVEXDOUBLE) (GLdouble coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDFEXT) (GLfloat coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDDEXT) (GLdouble coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDFVEXT) (GLfloat coord);
+typedef GLvoid (csAPIENTRY* csGLFOGCOORDDVEXT) (GLdouble coord);
typedef GLvoid (csAPIENTRY* csGLFOGCOORDPOINTEREXT) (GLenum type, GLsizei stride, GLvoid* pointer);
/** @} */
@@ -9766,8 +10737,221 @@
* @{ */
/** @} */
+/**\name GL_ARB_occlusion_query constants
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/ARB/occlusion_query.txt">http://www.opengl.org/registry/specs/ARB/occlusion_query.txt</a>.
+ * @{ */
+#ifndef GL_SAMPLES_PASSED_ARB
+#define GL_SAMPLES_PASSED_ARB 0x8914
+#endif
+#ifndef GL_QUERY_COUNTER_BITS_ARB
+#define GL_QUERY_COUNTER_BITS_ARB 0x8864
+#endif
+#ifndef GL_CURRENT_QUERY_ARB
+#define GL_CURRENT_QUERY_ARB 0x8865
+#endif
+
+#ifndef GL_QUERY_RESULT_ARB
+#define GL_QUERY_RESULT_ARB 0x8866
+#endif
+
+#ifndef GL_QUERY_RESULT_AVAILABLE_ARB
+#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867
+#endif
+
+
+/** @} */
+
+/**\name GL_ARB_occlusion_query functions
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/ARB/occlusion_query.txt">http://www.opengl.org/registry/specs/ARB/occlusion_query.txt</a>.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLGENQUERIESARB) (GLsizei n, GLuint* ids);
+typedef GLvoid (csAPIENTRY* csGLDELETEQUERIESARB) (GLsizei n, GLuint* ids);
+typedef GLboolean (csAPIENTRY* csGLISQUERYARB) (GLuint id);
+typedef GLvoid (csAPIENTRY* csGLBEGINQUERYARB) (GLenum target, GLuint id);
+typedef GLvoid (csAPIENTRY* csGLENDQUERYARB) (GLenum target);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYIVARB) (GLenum target, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYOBJECTIVARB) (GLuint id, GLenum pname, GLint* params);
+typedef GLvoid (csAPIENTRY* csGLGETQUERYOBJECTUIVARB) (GLuint id, GLenum pname, GLuint* params);
+
+/** @} */
+/**\name GL_ARB_draw_buffers constants
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/ARB/draw_buffers.txt">http://www.opengl.org/registry/specs/ARB/draw_buffers.txt</a>.
+ * @{ */
+#ifndef GL_MAX_DRAW_BUFFERS_ARB
+#define GL_MAX_DRAW_BUFFERS_ARB 0x8824
+#endif
+
+#ifndef GL_DRAW_BUFFER0_ARB
+#define GL_DRAW_BUFFER0_ARB 0x8825
+#endif
+
+#ifndef GL_DRAW_BUFFER1_ARB
+#define GL_DRAW_BUFFER1_ARB 0x8826
+#endif
+
+#ifndef GL_DRAW_BUFFER2_ARB
+#define GL_DRAW_BUFFER2_ARB 0x8827
+#endif
+
+#ifndef GL_DRAW_BUFFER3_ARB
+#define GL_DRAW_BUFFER3_ARB 0x8828
+#endif
+
+#ifndef GL_DRAW_BUFFER4_ARB
+#define GL_DRAW_BUFFER4_ARB 0x8829
+#endif
+
+#ifndef GL_DRAW_BUFFER5_ARB
+#define GL_DRAW_BUFFER5_ARB 0x882A
+#endif
+
+#ifndef GL_DRAW_BUFFER6_ARB
+#define GL_DRAW_BUFFER6_ARB 0x882B
+#endif
+
+#ifndef GL_DRAW_BUFFER7_ARB
+#define GL_DRAW_BUFFER7_ARB 0x882C
+#endif
+
+#ifndef GL_DRAW_BUFFER8_ARB
+#define GL_DRAW_BUFFER8_ARB 0x882D
+#endif
+
+#ifndef GL_DRAW_BUFFER9_ARB
+#define GL_DRAW_BUFFER9_ARB 0x882E
+#endif
+
+#ifndef GL_DRAW_BUFFER10_ARB
+#define GL_DRAW_BUFFER10_ARB 0x882F
+#endif
+
+#ifndef GL_DRAW_BUFFER11_ARB
+#define GL_DRAW_BUFFER11_ARB 0x8830
+#endif
+
+#ifndef GL_DRAW_BUFFER12_ARB
+#define GL_DRAW_BUFFER12_ARB 0x8831
+#endif
+
+#ifndef GL_DRAW_BUFFER13_ARB
+#define GL_DRAW_BUFFER13_ARB 0x8832
+#endif
+
+#ifndef GL_DRAW_BUFFER14_ARB
+#define GL_DRAW_BUFFER14_ARB 0x8833
+#endif
+
+#ifndef GL_DRAW_BUFFER15_ARB
+#define GL_DRAW_BUFFER15_ARB 0x8834
+#endif
+
+
+/** @} */
+
+/**\name GL_ARB_draw_buffers functions
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/ARB/draw_buffers.txt">http://www.opengl.org/registry/specs/ARB/draw_buffers.txt</a>.
+ * @{ */
+
+/** @} */
+/**\name GL_EXT_blend_equation_separate constants
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/EXT/blend_equation_separate.txt">http://www.opengl.org/registry/specs/EXT/blend_equation_separate.txt</a>.
+ * @{ */
+#ifndef GL_BLEND_EQUATION_RGB_EXT
+#define GL_BLEND_EQUATION_RGB_EXT BLEND_EQUATION
+#endif
+
+#ifndef GL_BLEND_EQUATION_ALPHA_EXT
+#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D
+#endif
+
+
+/** @} */
+
+/**\name GL_EXT_blend_equation_separate functions
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/EXT/blend_equation_separate.txt">http://www.opengl.org/registry/specs/EXT/blend_equation_separate.txt</a>.
+ * @{ */
+typedef GLvoid (csAPIENTRY* csGLBLENDEQUATIONSEPARATEEXT) (GLenum modeRGB, GLenum modeAlpha);
+
+/** @} */
+/**\name GL_EXT_texture_sRGB constants
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt">http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt</a>.
+ * @{ */
+#ifndef GL_SRGB_EXT
+#define GL_SRGB_EXT 0x8C40
+#endif
+
+#ifndef GL_SRGB8_EXT
+#define GL_SRGB8_EXT 0x8C41
+#endif
+
+#ifndef GL_SRGB_ALPHA_EXT
+#define GL_SRGB_ALPHA_EXT 0x8C42
+#endif
+
+#ifndef GL_SRGB8_ALPHA8_EXT
+#define GL_SRGB8_ALPHA8_EXT 0x8C43
+#endif
+
+#ifndef GL_SLUMINANCE_ALPHA_EXT
+#define GL_SLUMINANCE_ALPHA_EXT 0x8C44
+#endif
+
+#ifndef GL_SLUMINANCE8_ALPHA8_EXT
+#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45
+#endif
+
+#ifndef GL_SLUMINANCE_EXT
+#define GL_SLUMINANCE_EXT 0x8C46
+#endif
+
+#ifndef GL_SLUMINANCE8_EXT
+#define GL_SLUMINANCE8_EXT 0x8C47
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_EXT
+#define GL_COMPRESSED_SRGB_EXT 0x8C48
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_ALPHA_EXT
+#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49
+#endif
+
+#ifndef GL_COMPRESSED_SLUMINANCE_EXT
+#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A
+#endif
+
+#ifndef GL_COMPRESSED_SLUMINANCE_ALPHA_EXT
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_S3TC_DXT1_EXT
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#endif
+
+#ifndef GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+
+
+/** @} */
+
+/**\name GL_EXT_texture_sRGB functions
+ * For a description of what this ext does, see <a href="http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt">http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt</a>.
+ * @{ */
+
+/** @} */
+
+
// end of definitions
#ifdef CS_DEBUG
@@ -10071,6 +11255,800 @@
/** @} */
+ /**\name GL_version_1_4 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when teh appropriate GL version was detected.
+ * @{ */
+ #ifndef GLFOGCOORDF_DECL
+ #define GLFOGCOORDF_DECL
+ csGLFOGCOORDF glFogCoordf;
+ #endif
+
+ #ifndef GLFOGCOORDD_DECL
+ #define GLFOGCOORDD_DECL
+ csGLFOGCOORDD glFogCoordd;
+ #endif
+
+ #ifndef GLFOGCOORDFV_DECL
+ #define GLFOGCOORDFV_DECL
+ csGLFOGCOORDFV glFogCoordfv;
+ #endif
+
+ #ifndef GLFOGCOORDDV_DECL
+ #define GLFOGCOORDDV_DECL
+ csGLFOGCOORDDV glFogCoorddv;
+ #endif
+
+ #ifndef GLFOGCOORDPOINTER_DECL
+ #define GLFOGCOORDPOINTER_DECL
+ csGLFOGCOORDPOINTER glFogCoordPointer;
+ #endif
+
+ #ifndef GLMULTIDRAWARRAYS_DECL
+ #define GLMULTIDRAWARRAYS_DECL
+ csGLMULTIDRAWARRAYS glMultiDrawArrays;
+ #endif
+
+ #ifndef GLMULTIDRAWELEMENTS_DECL
+ #define GLMULTIDRAWELEMENTS_DECL
+ csGLMULTIDRAWELEMENTS glMultiDrawElements;
+ #endif
+
+ #ifndef GLPOINTPARAMETERF_DECL
+ #define GLPOINTPARAMETERF_DECL
+ csGLPOINTPARAMETERF glPointParameterf;
+ #endif
+
+ #ifndef GLPOINTPARAMETERFV_DECL
+ #define GLPOINTPARAMETERFV_DECL
+ csGLPOINTPARAMETERFV glPointParameterfv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3B_DECL
+ #define GLSECONDARYCOLOR3B_DECL
+ csGLSECONDARYCOLOR3B glSecondaryColor3b;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3S_DECL
+ #define GLSECONDARYCOLOR3S_DECL
+ csGLSECONDARYCOLOR3S glSecondaryColor3s;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3I_DECL
+ #define GLSECONDARYCOLOR3I_DECL
+ csGLSECONDARYCOLOR3I glSecondaryColor3i;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3F_DECL
+ #define GLSECONDARYCOLOR3F_DECL
+ csGLSECONDARYCOLOR3F glSecondaryColor3f;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3D_DECL
+ #define GLSECONDARYCOLOR3D_DECL
+ csGLSECONDARYCOLOR3D glSecondaryColor3d;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3UB_DECL
+ #define GLSECONDARYCOLOR3UB_DECL
+ csGLSECONDARYCOLOR3UB glSecondaryColor3ub;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3US_DECL
+ #define GLSECONDARYCOLOR3US_DECL
+ csGLSECONDARYCOLOR3US glSecondaryColor3us;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3UI_DECL
+ #define GLSECONDARYCOLOR3UI_DECL
+ csGLSECONDARYCOLOR3UI glSecondaryColor3ui;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3BV_DECL
+ #define GLSECONDARYCOLOR3BV_DECL
+ csGLSECONDARYCOLOR3BV glSecondaryColor3bv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3SV_DECL
+ #define GLSECONDARYCOLOR3SV_DECL
+ csGLSECONDARYCOLOR3SV glSecondaryColor3sv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3IV_DECL
+ #define GLSECONDARYCOLOR3IV_DECL
+ csGLSECONDARYCOLOR3IV glSecondaryColor3iv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3FV_DECL
+ #define GLSECONDARYCOLOR3FV_DECL
+ csGLSECONDARYCOLOR3FV glSecondaryColor3fv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3DV_DECL
+ #define GLSECONDARYCOLOR3DV_DECL
+ csGLSECONDARYCOLOR3DV glSecondaryColor3dv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3UBV_DECL
+ #define GLSECONDARYCOLOR3UBV_DECL
+ csGLSECONDARYCOLOR3UBV glSecondaryColor3ubv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3USV_DECL
+ #define GLSECONDARYCOLOR3USV_DECL
+ csGLSECONDARYCOLOR3USV glSecondaryColor3usv;
+ #endif
+
+ #ifndef GLSECONDARYCOLOR3UIV_DECL
+ #define GLSECONDARYCOLOR3UIV_DECL
+ csGLSECONDARYCOLOR3UIV glSecondaryColor3uiv;
+ #endif
+
+ #ifndef GLSECONDARYCOLORPOINTER_DECL
+ #define GLSECONDARYCOLORPOINTER_DECL
+ csGLSECONDARYCOLORPOINTER glSecondaryColorPointer;
+ #endif
+
+ #ifndef GLBLENDFUNCSEPARATE_DECL
+ #define GLBLENDFUNCSEPARATE_DECL
+ csGLBLENDFUNCSEPARATE glBlendFuncSeparate;
+ #endif
+
+ #ifndef GLWINDOWPOS2D_DECL
+ #define GLWINDOWPOS2D_DECL
+ csGLWINDOWPOS2D glWindowPos2d;
+ #endif
+
+ #ifndef GLWINDOWPOS2F_DECL
+ #define GLWINDOWPOS2F_DECL
+ csGLWINDOWPOS2F glWindowPos2f;
+ #endif
+
+ #ifndef GLWINDOWPOS2I_DECL
+ #define GLWINDOWPOS2I_DECL
+ csGLWINDOWPOS2I glWindowPos2i;
+ #endif
+
+ #ifndef GLWINDOWPOS2S_DECL
+ #define GLWINDOWPOS2S_DECL
+ csGLWINDOWPOS2S glWindowPos2s;
+ #endif
+
+ #ifndef GLWINDOWPOS2DV_DECL
+ #define GLWINDOWPOS2DV_DECL
+ csGLWINDOWPOS2DV glWindowPos2dv;
+ #endif
+
+ #ifndef GLWINDOWPOS2FV_DECL
+ #define GLWINDOWPOS2FV_DECL
+ csGLWINDOWPOS2FV glWindowPos2fv;
+ #endif
+
+ #ifndef GLWINDOWPOS2IV_DECL
+ #define GLWINDOWPOS2IV_DECL
+ csGLWINDOWPOS2IV glWindowPos2iv;
+ #endif
+
+ #ifndef GLWINDOWPOS2SV_DECL
+ #define GLWINDOWPOS2SV_DECL
+ csGLWINDOWPOS2SV glWindowPos2sv;
+ #endif
+
+ #ifndef GLWINDOWPOS3D_DECL
+ #define GLWINDOWPOS3D_DECL
+ csGLWINDOWPOS3D glWindowPos3d;
+ #endif
+
+ #ifndef GLWINDOWPOS3F_DECL
+ #define GLWINDOWPOS3F_DECL
+ csGLWINDOWPOS3F glWindowPos3f;
+ #endif
+
+ #ifndef GLWINDOWPOS3I_DECL
+ #define GLWINDOWPOS3I_DECL
+ csGLWINDOWPOS3I glWindowPos3i;
+ #endif
+
+ #ifndef GLWINDOWPOS3S_DECL
+ #define GLWINDOWPOS3S_DECL
+ csGLWINDOWPOS3S glWindowPos3s;
+ #endif
+
+ #ifndef GLWINDOWPOS3DV_DECL
+ #define GLWINDOWPOS3DV_DECL
+ csGLWINDOWPOS3DV glWindowPos3dv;
+ #endif
+
+ #ifndef GLWINDOWPOS3FV_DECL
+ #define GLWINDOWPOS3FV_DECL
+ csGLWINDOWPOS3FV glWindowPos3fv;
+ #endif
+
+ #ifndef GLWINDOWPOS3IV_DECL
+ #define GLWINDOWPOS3IV_DECL
+ csGLWINDOWPOS3IV glWindowPos3iv;
+ #endif
+
+ #ifndef GLWINDOWPOS3SV_DECL
+ #define GLWINDOWPOS3SV_DECL
+ csGLWINDOWPOS3SV glWindowPos3sv;
+ #endif
+
+
+ /** @} */
+ /**\name GL_version_1_5 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when teh appropriate GL version was detected.
+ * @{ */
+ #ifndef GLBINDBUFFER_DECL
+ #define GLBINDBUFFER_DECL
+ csGLBINDBUFFER glBindBuffer;
+ #endif
+
+ #ifndef GLDELETEBUFFERS_DECL
+ #define GLDELETEBUFFERS_DECL
+ csGLDELETEBUFFERS glDeleteBuffers;
+ #endif
+
+ #ifndef GLGENBUFFERS_DECL
+ #define GLGENBUFFERS_DECL
+ csGLGENBUFFERS glGenBuffers;
+ #endif
+
+ #ifndef GLBUFFERDATA_DECL
+ #define GLBUFFERDATA_DECL
+ csGLBUFFERDATA glBufferData;
+ #endif
+
+ #ifndef GLBUFFERSUBDATA_DECL
+ #define GLBUFFERSUBDATA_DECL
+ csGLBUFFERSUBDATA glBufferSubData;
+ #endif
+
+ #ifndef GLMAPBUFFER_DECL
+ #define GLMAPBUFFER_DECL
+ csGLMAPBUFFER glMapBuffer;
+ #endif
+
+ #ifndef GLUNMAPBUFFER_DECL
+ #define GLUNMAPBUFFER_DECL
+ csGLUNMAPBUFFER glUnmapBuffer;
+ #endif
+
+ #ifndef GLISBUFFER_DECL
+ #define GLISBUFFER_DECL
+ csGLISBUFFER glIsBuffer;
+ #endif
+
+ #ifndef GLGETBUFFERSUBDATA_DECL
+ #define GLGETBUFFERSUBDATA_DECL
+ csGLGETBUFFERSUBDATA glGetBufferSubData;
+ #endif
+
+ #ifndef GLGETBUFFERPOINTERV_DECL
+ #define GLGETBUFFERPOINTERV_DECL
+ csGLGETBUFFERPOINTERV glGetBufferPointerv;
+ #endif
+
+ #ifndef GLGETBUFFERPARAMETERIV_DECL
+ #define GLGETBUFFERPARAMETERIV_DECL
+ csGLGETBUFFERPARAMETERIV glGetBufferParameteriv;
+ #endif
+
+ #ifndef GLGENQUERIES_DECL
+ #define GLGENQUERIES_DECL
+ csGLGENQUERIES glGenQueries;
+ #endif
+
+ #ifndef GLDELETEQUERIES_DECL
+ #define GLDELETEQUERIES_DECL
+ csGLDELETEQUERIES glDeleteQueries;
+ #endif
+
+ #ifndef GLISQUERY_DECL
+ #define GLISQUERY_DECL
+ csGLISQUERY glIsQuery;
+ #endif
+
+ #ifndef GLBEGINQUERY_DECL
+ #define GLBEGINQUERY_DECL
+ csGLBEGINQUERY glBeginQuery;
+ #endif
+
+ #ifndef GLENDQUERY_DECL
+ #define GLENDQUERY_DECL
+ csGLENDQUERY glEndQuery;
+ #endif
+
+ #ifndef GLGETQUERYIV_DECL
+ #define GLGETQUERYIV_DECL
+ csGLGETQUERYIV glGetQueryiv;
+ #endif
+
+ #ifndef GLGETQUERYOBJECTIV_DECL
+ #define GLGETQUERYOBJECTIV_DECL
+ csGLGETQUERYOBJECTIV glGetQueryObjectiv;
+ #endif
+
+ #ifndef GLGETQUERYOBJECTUIV_DECL
+ #define GLGETQUERYOBJECTUIV_DECL
+ csGLGETQUERYOBJECTUIV glGetQueryObjectuiv;
+ #endif
+
+
+ /** @} */
+ /**\name GL_version_2_0 functions
+ * This is not a real OpenGL extension. The OpenGL canvases will 'initialize'
+ * this extension when teh appropriate GL version was detected.
+ * @{ */
+ #ifndef GLDELETESHADER_DECL
+ #define GLDELETESHADER_DECL
+ csGLDELETESHADER glDeleteShader;
+ #endif
+
+ #ifndef GLGETHANDLE_DECL
+ #define GLGETHANDLE_DECL
+ csGLGETHANDLE glGetHandle;
+ #endif
+
+ #ifndef GLDETACHSHADER_DECL
+ #define GLDETACHSHADER_DECL
+ csGLDETACHSHADER glDetachShader;
+ #endif
+
+ #ifndef GLCREATESHADER_DECL
+ #define GLCREATESHADER_DECL
+ csGLCREATESHADER glCreateShader;
+ #endif
+
+ #ifndef GLSHADERSOURCE_DECL
+ #define GLSHADERSOURCE_DECL
+ csGLSHADERSOURCE glShaderSource;
+ #endif
+
+ #ifndef GLCOMPILESHADER_DECL
+ #define GLCOMPILESHADER_DECL
+ csGLCOMPILESHADER glCompileShader;
+ #endif
+
+ #ifndef GLCREATEPROGRAMOBJECT_DECL
+ #define GLCREATEPROGRAMOBJECT_DECL
+ csGLCREATEPROGRAMOBJECT glCreateProgramObject;
+ #endif
+
+ #ifndef GLATTACHSHADER_DECL
+ #define GLATTACHSHADER_DECL
+ csGLATTACHSHADER glAttachShader;
+ #endif
+
+ #ifndef GLLINKPROGRAM_DECL
+ #define GLLINKPROGRAM_DECL
+ csGLLINKPROGRAM glLinkProgram;
+ #endif
+
+ #ifndef GLUSEPROGRAM_DECL
+ #define GLUSEPROGRAM_DECL
+ csGLUSEPROGRAM glUseProgram;
+ #endif
+
+ #ifndef GLDELETEPROGRAM_DECL
+ #define GLDELETEPROGRAM_DECL
+ csGLDELETEPROGRAM glDeleteProgram;
+ #endif
+
+ #ifndef GLVALIDATEPROGRAM_DECL
+ #define GLVALIDATEPROGRAM_DECL
+ csGLVALIDATEPROGRAM glValidateProgram;
+ #endif
+
+ #ifndef GLUNIFORM1F_DECL
+ #define GLUNIFORM1F_DECL
+ csGLUNIFORM1F glUniform1f;
+ #endif
+
+ #ifndef GLUNIFORM2F_DECL
+ #define GLUNIFORM2F_DECL
+ csGLUNIFORM2F glUniform2f;
+ #endif
+
+ #ifndef GLUNIFORM3F_DECL
+ #define GLUNIFORM3F_DECL
+ csGLUNIFORM3F glUniform3f;
+ #endif
+
+ #ifndef GLUNIFORM4F_DECL
+ #define GLUNIFORM4F_DECL
+ csGLUNIFORM4F glUniform4f;
+ #endif
+
+ #ifndef GLUNIFORM1I_DECL
+ #define GLUNIFORM1I_DECL
+ csGLUNIFORM1I glUniform1i;
+ #endif
+
+ #ifndef GLUNIFORM2I_DECL
+ #define GLUNIFORM2I_DECL
+ csGLUNIFORM2I glUniform2i;
+ #endif
+
+ #ifndef GLUNIFORM3I_DECL
+ #define GLUNIFORM3I_DECL
+ csGLUNIFORM3I glUniform3i;
+ #endif
+
+ #ifndef GLUNIFORM4I_DECL
+ #define GLUNIFORM4I_DECL
+ csGLUNIFORM4I glUniform4i;
+ #endif
+
+ #ifndef GLUNIFORM1FV_DECL
+ #define GLUNIFORM1FV_DECL
+ csGLUNIFORM1FV glUniform1fv;
+ #endif
+
+ #ifndef GLUNIFORM2FV_DECL
+ #define GLUNIFORM2FV_DECL
+ csGLUNIFORM2FV glUniform2fv;
+ #endif
+
+ #ifndef GLUNIFORM3FV_DECL
+ #define GLUNIFORM3FV_DECL
+ csGLUNIFORM3FV glUniform3fv;
+ #endif
+
+ #ifndef GLUNIFORM4FV_DECL
+ #define GLUNIFORM4FV_DECL
+ csGLUNIFORM4FV glUniform4fv;
+ #endif
+
+ #ifndef GLUNIFORM1IV_DECL
+ #define GLUNIFORM1IV_DECL
+ csGLUNIFORM1IV glUniform1iv;
+ #endif
+
+ #ifndef GLUNIFORM2IV_DECL
+ #define GLUNIFORM2IV_DECL
+ csGLUNIFORM2IV glUniform2iv;
+ #endif
+
+ #ifndef GLUNIFORM3IV_DECL
+ #define GLUNIFORM3IV_DECL
+ csGLUNIFORM3IV glUniform3iv;
+ #endif
+
+ #ifndef GLUNIFORM4IV_DECL
+ #define GLUNIFORM4IV_DECL
+ csGLUNIFORM4IV glUniform4iv;
+ #endif
+
+ #ifndef GLUNIFORMMATRIX2FV_DECL
+ #define GLUNIFORMMATRIX2FV_DECL
+ csGLUNIFORMMATRIX2FV glUniformMatrix2fv;
+ #endif
+
+ #ifndef GLUNIFORMMATRIX3FV_DECL
+ #define GLUNIFORMMATRIX3FV_DECL
+ csGLUNIFORMMATRIX3FV glUniformMatrix3fv;
+ #endif
+
+ #ifndef GLUNIFORMMATRIX4FV_DECL
+ #define GLUNIFORMMATRIX4FV_DECL
+ csGLUNIFORMMATRIX4FV glUniformMatrix4fv;
+ #endif
+
+ #ifndef GLGETOBJECTPARAMETERFV_DECL
+ #define GLGETOBJECTPARAMETERFV_DECL
+ csGLGETOBJECTPARAMETERFV glGetObjectParameterfv;
+ #endif
+
+ #ifndef GLGETOBJECTPARAMETERIV_DECL
+ #define GLGETOBJECTPARAMETERIV_DECL
+ csGLGETOBJECTPARAMETERIV glGetObjectParameteriv;
+ #endif
+
+ #ifndef GLGETINFOLOG_DECL
+ #define GLGETINFOLOG_DECL
+ csGLGETINFOLOG glGetInfoLog;
+ #endif
+
+ #ifndef GLGETATTACHEDOBJECTS_DECL
+ #define GLGETATTACHEDOBJECTS_DECL
+ csGLGETATTACHEDOBJECTS glGetAttachedObjects;
+ #endif
+
+ #ifndef GLGETUNIFORMLOCATION_DECL
+ #define GLGETUNIFORMLOCATION_DECL
+ csGLGETUNIFORMLOCATION glGetUniformLocation;
+ #endif
+
+ #ifndef GLGETACTIVEUNIFORM_DECL
+ #define GLGETACTIVEUNIFORM_DECL
+ csGLGETACTIVEUNIFORM glGetActiveUniform;
+ #endif
+
+ #ifndef GLGETUNIFORMFV_DECL
+ #define GLGETUNIFORMFV_DECL
+ csGLGETUNIFORMFV glGetUniformfv;
+ #endif
+
+ #ifndef GLGETUNIFORMIV_DECL
+ #define GLGETUNIFORMIV_DECL
+ csGLGETUNIFORMIV glGetUniformiv;
+ #endif
+
+ #ifndef GLGETSHADERSOURCE_DECL
+ #define GLGETSHADERSOURCE_DECL
+ csGLGETSHADERSOURCE...
[truncated message content] |
|
From: <re...@us...> - 2006-09-08 15:10:24
|
Revision: 25305
http://svn.sourceforge.net/crystal/?rev=25305&view=rev
Author: res2002
Date: 2006-09-08 08:10:11 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res fixed the glshader_fixed plugin to depend on GL 1.4 for texture
crossbar support and not 1.3.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_fixed.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 15:07:28 UTC (rev 25304)
+++ CS/trunk/docs/history.txt 2006-09-08 15:10:11 UTC (rev 25305)
@@ -11,6 +11,8 @@
- caedes updated cspace.i for the new particles.
- res added some more GL extensions and missing GL versions up to 2.1
to the extension manager.
+ - res fixed the glshader_fixed plugin to depend on GL 1.4 for texture
+ crossbar support and not 1.3.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_fixed.cpp
===================================================================
--- CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_fixed.cpp 2006-09-08 15:07:28 UTC (rev 25304)
+++ CS/trunk/plugins/video/render3d/shader/shaderplugins/glshader_fixed/glshader_fixed.cpp 2006-09-08 15:10:11 UTC (rev 25305)
@@ -148,10 +148,10 @@
texUnits = useTextureUnits;
}
- ext->InitGL_version_1_3();
- if (!ext->CS_GL_version_1_3)
+ ext->InitGL_version_1_4();
+ if (!ext->CS_GL_version_1_4)
ext->InitGL_ARB_texture_env_crossbar();
- enableCrossbar = ext->CS_GL_version_1_3
+ enableCrossbar = ext->CS_GL_version_1_4
|| ext->CS_GL_ARB_texture_env_crossbar;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 15:14:35
|
Revision: 25306
http://svn.sourceforge.net/crystal/?rev=25306&view=rev
Author: res2002
Date: 2006-09-08 08:14:20 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res put the FBO stencil support into preprocessor conditionals (and
also noted the current state of stencil attachment support).
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 15:10:11 UTC (rev 25305)
+++ CS/trunk/docs/history.txt 2006-09-08 15:14:20 UTC (rev 25306)
@@ -13,6 +13,8 @@
to the extension manager.
- res fixed the glshader_fixed plugin to depend on GL 1.4 for texture
crossbar support and not 1.3.
+ - res put the FBO stencil support into preprocessor conditionals (and
+ also noted the current state of stencil attachment support).
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp
===================================================================
--- CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp 2006-09-08 15:10:11 UTC (rev 25305)
+++ CS/trunk/plugins/video/render3d/opengl/gl_r2t_ext_fb_o.cpp 2006-09-08 15:14:20 UTC (rev 25306)
@@ -25,6 +25,14 @@
#include "gl_txtmgr.h"
#include "gl_r2t_ext_fb_o.h"
+/* Stencil attachment status:
+ * ATI Catalyst 6.8 (2006-09-08): reports "incomplete - dimensions"
+ * NV: supposedly does not support separate stencil attachment, but packed
+ * depth/stencil attachments (EXT_packed_depth_stencil or so)
+ * (ATI doesn't, hence you can't use stencil buffers+FBO there...)
+ */
+//#define FBO_WITH_STENCIL
+
csGLRender2TextureEXTfbo::~csGLRender2TextureEXTfbo()
{
FreeBuffers();
@@ -119,21 +127,28 @@
G3D->ext->glGenFramebuffersEXT (1, &framebuffer);
G3D->ext->glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, framebuffer);
+
G3D->ext->glGenRenderbuffersEXT (1, &depthRB);
- G3D->ext->glGenRenderbuffersEXT (1, &stencilRB);
-
G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, depthRB);
- // FIXME: Storage shouldn't really be hardcoded
+ /* FIXME: Generic format sufficient? Or better pick some sized
+ * format based on the current depth buffer depth or so?
+ * Might also need a loop or so to test different formats until
+ * the framebuffer validates. */
G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
- GL_DEPTH_COMPONENT24_ARB, txt_w, txt_h);
+ GL_DEPTH_COMPONENT, txt_w, txt_h);
- // FIXME: Stencil support
- // FIXME: Storage shouldn't really be hardcoded
- /*G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, stencilRB);
+#ifdef FBO_WITH_STENCIL
+ G3D->ext->glGenRenderbuffersEXT (1, &stencilRB);
+ G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, stencilRB);
+ /* FIXME: Generic format sufficient? Or better pick some sized
+ * format based on the current stencil buffer depth or so?
+ * Might also need a loop or so to test different formats until
+ * the framebuffer validates. */
G3D->ext->glRenderbufferStorageEXT (GL_RENDERBUFFER_EXT,
- GL_STENCIL_INDEX8_EXT, txt_w, txt_h);*/
+ GL_STENCIL_INDEX_EXT, txt_w, txt_h);
+#endif
- //G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, 0);
+ G3D->ext->glBindRenderbufferEXT (GL_RENDERBUFFER_EXT, 0);
fb_w = txt_w; fb_h = txt_h;
}
//glReadBuffer (GL_NONE);
@@ -146,11 +161,12 @@
// initialize depth renderbuffer
// FIXME: is that binding really needed?
- G3D->ext->glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, depthRB);
G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depthRB);
- //G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
- //GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, stencilRB);
+#ifdef FBO_WITH_STENCIL
+ G3D->ext->glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
+ GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, stencilRB);
+#endif
GLenum fbStatus = G3D->ext->glCheckFramebufferStatusEXT (
GL_FRAMEBUFFER_EXT);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 17:23:49
|
Revision: 25309
http://svn.sourceforge.net/crystal/?rev=25309&view=rev
Author: res2002
Date: 2006-09-08 10:23:31 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res fixed a couple of gcc 4.1 optimize warnings.
Modified Paths:
--------------
CS/trunk/apps/tools/genmeshify/converter.cpp
CS/trunk/apps/tools/lighter2/lightmapuv.h
CS/trunk/apps/tools/viewmesh/Jamfile
CS/trunk/docs/history.txt
Modified: CS/trunk/apps/tools/genmeshify/converter.cpp
===================================================================
--- CS/trunk/apps/tools/genmeshify/converter.cpp 2006-09-08 17:00:39 UTC (rev 25308)
+++ CS/trunk/apps/tools/genmeshify/converter.cpp 2006-09-08 17:23:31 UTC (rev 25309)
@@ -572,8 +572,7 @@
}
else
submeshName.Format ("%zu", submeshNum);
- iGeneralMeshSubMesh* submesh =
- to->AddSubMesh (indexBuffer, key.material, submeshName);
+ to->AddSubMesh (indexBuffer, key.material, submeshName);
submeshNum++;
}
csRef<csRenderBuffer> tclmBuffer = csRenderBuffer::CreateRenderBuffer (
Modified: CS/trunk/apps/tools/lighter2/lightmapuv.h
===================================================================
--- CS/trunk/apps/tools/lighter2/lightmapuv.h 2006-09-08 17:00:39 UTC (rev 25308)
+++ CS/trunk/apps/tools/lighter2/lightmapuv.h 2006-09-08 17:23:31 UTC (rev 25309)
@@ -30,6 +30,7 @@
class LightmapUVLayouter
{
public:
+ virtual ~LightmapUVLayouter() {}
virtual bool LayoutUVOnPrimitives (RadPrimitiveArray &prims,
RadObjectVertexData& vertexData,
LightmapPtrDelArray& lightmaps) = 0;
Modified: CS/trunk/apps/tools/viewmesh/Jamfile
===================================================================
--- CS/trunk/apps/tools/viewmesh/Jamfile 2006-09-08 17:00:39 UTC (rev 25308)
+++ CS/trunk/apps/tools/viewmesh/Jamfile 2006-09-08 17:23:31 UTC (rev 25309)
@@ -3,6 +3,7 @@
Description viewmesh : "mesh viewing utility" ;
Application viewmesh : [ Wildcard *.cpp *.h ] ;
LinkWith viewmesh : crystalspace ;
+CFlags viewmesh : $(COMPILER.C++FLAGS.STRICTALIASING.DISABLE) ;
MsvcCFlags viewmesh : "/D CS_HAVE_CAL3D" ;
if $(CAL3D.AVAILABLE) = yes
{
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 17:00:39 UTC (rev 25308)
+++ CS/trunk/docs/history.txt 2006-09-08 17:23:31 UTC (rev 25309)
@@ -15,6 +15,7 @@
crossbar support and not 1.3.
- res put the FBO stencil support into preprocessor conditionals (and
also noted the current state of stencil attachment support).
+ - res fixed a couple of gcc 4.1 optimize warnings.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 18:00:25
|
Revision: 25310
http://svn.sourceforge.net/crystal/?rev=25310&view=rev
Author: res2002
Date: 2006-09-08 11:00:15 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res fixed _cspace.so.dbg being tried to be split off before
_cspace.so is built when installing. Fixes trac #11.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/mk/jam/pythmod.jam
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 17:23:31 UTC (rev 25309)
+++ CS/trunk/docs/history.txt 2006-09-08 18:00:15 UTC (rev 25310)
@@ -16,6 +16,8 @@
- res put the FBO stencil support into preprocessor conditionals (and
also noted the current state of stencil attachment support).
- res fixed a couple of gcc 4.1 optimize warnings.
+ - res fixed _cspace.so.dbg being tried to be split off before
+ _cspace.so is built when installing. Fixes trac #11.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/mk/jam/pythmod.jam
===================================================================
--- CS/trunk/mk/jam/pythmod.jam 2006-09-08 17:23:31 UTC (rev 25309)
+++ CS/trunk/mk/jam/pythmod.jam 2006-09-08 18:00:15 UTC (rev 25310)
@@ -74,6 +74,7 @@
MakeLocate $(target) : $(LOCATE.TARGETS) ;
Depends $(target) : $(objects) ;
LinkPlugin $(target) : $(objects) ;
+ InstallPythMod $(target) : bindings python ;
if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
{
local debugfile = [ SplitDebugInfo $(target) ] ;
@@ -84,7 +85,6 @@
$(INSTALL_DATA) ] ;
}
}
- InstallPythMod $(target) : bindings python ;
Always $(<)clean ;
NotFile $(<)clean ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 18:09:56
|
Revision: 25311
http://svn.sourceforge.net/crystal/?rev=25311&view=rev
Author: res2002
Date: 2006-09-08 11:09:44 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res added debug info splitting for the CS JNI library.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/cscript/csjava/Jamfile
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 18:00:15 UTC (rev 25310)
+++ CS/trunk/docs/history.txt 2006-09-08 18:09:44 UTC (rev 25311)
@@ -18,6 +18,7 @@
- res fixed a couple of gcc 4.1 optimize warnings.
- res fixed _cspace.so.dbg being tried to be split off before
_cspace.so is built when installing. Fixes trac #11.
+ - res added debug info splitting for the CS JNI library.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/plugins/cscript/csjava/Jamfile
===================================================================
--- CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-08 18:00:15 UTC (rev 25310)
+++ CS/trunk/plugins/cscript/csjava/Jamfile 2006-09-08 18:09:44 UTC (rev 25311)
@@ -158,9 +158,19 @@
SystemInstallPlugin $(1) : $(2) ;
}
InstallJavamod $(javamod) : bindings java ;
+ local cleantarget ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = [ SplitDebugInfo $(javamod) ] ;
+ cleantarget += $(debugfile) ;
+ NoCare $(debugfile) ;
+ Depends install_plugin : [ DoInstall $(debugfile) :
+ $(appdatadir) bindings java :
+ $(INSTALL_DATA) ] ;
+ }
Always csjavaclean ;
NotFile csjavaclean ;
- Clean csjavaclean : $(javamod) $(javamodobj) ;
+ Clean csjavaclean : $(javamod) $(javamodobj) $(cleantarget) ;
Depends clean : csjavaclean ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <re...@us...> - 2006-09-08 19:02:00
|
Revision: 25313
http://svn.sourceforge.net/crystal/?rev=25313&view=rev
Author: res2002
Date: 2006-09-08 12:01:48 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
res changed ptpdlight to #include <limits.h> as per SFbug:1546141.
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/plugins/proctex/ptpdlight/ptpdlight.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 18:15:14 UTC (rev 25312)
+++ CS/trunk/docs/history.txt 2006-09-08 19:01:48 UTC (rev 25313)
@@ -19,6 +19,7 @@
- res fixed _cspace.so.dbg being tried to be split off before
_cspace.so is built when installing. Fixes trac #11.
- res added debug info splitting for the CS JNI library.
+ - res changed ptpdlight to #include <limits.h> as per SFbug:1546141.
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
Modified: CS/trunk/plugins/proctex/ptpdlight/ptpdlight.cpp
===================================================================
--- CS/trunk/plugins/proctex/ptpdlight/ptpdlight.cpp 2006-09-08 18:15:14 UTC (rev 25312)
+++ CS/trunk/plugins/proctex/ptpdlight/ptpdlight.cpp 2006-09-08 19:01:48 UTC (rev 25313)
@@ -18,6 +18,7 @@
*/
#include "cssysdef.h"
+#include <limits.h>
#include "ivideo/graph3d.h"
#include "ivideo/graph2d.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fun...@us...> - 2006-09-08 19:20:36
|
Revision: 25315
http://svn.sourceforge.net/crystal/?rev=25315&view=rev
Author: funkiedamouse
Date: 2006-09-08 12:20:27 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
- David Bronke fixed some warnings about unused variables and member
initialization order, and added const keyword to
csArray::Iterator::HasNext() and csArray::ConstIterator::HasNext().
Modified Paths:
--------------
CS/trunk/docs/history.txt
CS/trunk/include/csutil/array.h
CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp
CS/trunk/plugins/mesh/null/object/nullmesh.cpp
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt 2006-09-08 19:18:20 UTC (rev 25314)
+++ CS/trunk/docs/history.txt 2006-09-08 19:20:27 UTC (rev 25315)
@@ -20,6 +20,9 @@
_cspace.so is built when installing. Fixes trac #11.
- res added debug info splitting for the CS JNI library.
- res changed ptpdlight to #include <limits.h> as per SFbug:1546141.
+ - David Bronke fixed some warnings about unused variables and member
+ initialization order, and added const keyword to
+ csArray::Iterator::HasNext() and csArray::ConstIterator::HasNext().
6-Sep-2006
- Jorrit fixed a bug in csGraphics2DOpenGL::SetMouseCursor().
It would assert (in debug mode) or crash (in release mode) in
@@ -41,7 +44,7 @@
- Marten made partconv not crash.
- Marten converted nullmesh to new SCF syntax.
5-Sep-2006
- - res fixed the Java bindings to build again.
+ - res fixed the Java bindings to build again.
4-Sep-2006
- res changed the configure program version check to support checking
the same program with different version numbers.
Modified: CS/trunk/include/csutil/array.h
===================================================================
--- CS/trunk/include/csutil/array.h 2006-09-08 19:18:20 UTC (rev 25314)
+++ CS/trunk/include/csutil/array.h 2006-09-08 19:20:27 UTC (rev 25315)
@@ -1151,7 +1151,7 @@
{ currentelem = r.currentelem; array = r.array; return *this; }
/** Returns true if the next Next() call will return an element */
- bool HasNext()
+ bool HasNext() const
{ return currentelem < array.Length(); }
/** Returns the next element in the array. */
@@ -1185,7 +1185,7 @@
{ currentelem = r.currentelem; array = r.array; return *this; }
/** Returns true if the next Next() call will return an element */
- bool HasNext()
+ bool HasNext() const
{ return currentelem < array.Length(); }
/** Returns the next element in the array. */
Modified: CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp
===================================================================
--- CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp 2006-09-08 19:18:20 UTC (rev 25314)
+++ CS/trunk/libs/csplugincommon/opengl/glcommon2d.cpp 2006-09-08 19:20:27 UTC (rev 25315)
@@ -1079,8 +1079,6 @@
bool csGraphics2DGLCommon::csGLPixelFormatPicker::PickNextFormat ()
{
- bool formatPicked = false;
-
for (size_t i = 0; i < glpfvValueCount; ++i)
{
currentValues[pixelFormats[i].valueType] =
Modified: CS/trunk/plugins/mesh/null/object/nullmesh.cpp
===================================================================
--- CS/trunk/plugins/mesh/null/object/nullmesh.cpp 2006-09-08 19:18:20 UTC (rev 25314)
+++ CS/trunk/plugins/mesh/null/object/nullmesh.cpp 2006-09-08 19:20:27 UTC (rev 25315)
@@ -37,7 +37,7 @@
csNullmeshMeshObject::csNullmeshMeshObject (csNullmeshMeshFactory* factory,
iMeshObjectType* parent)
- : scfImplementationType(this), logparent (0), nullmesh_type (parent),
+ : scfImplementationType(this), nullmesh_type (parent), logparent (0),
vis_cb (0)
{
csNullmeshMeshObject::factory = factory;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cry...@us...> - 2006-09-09 00:28:54
|
Revision: 25316
http://svn.sourceforge.net/crystal/?rev=25316&view=rev
Author: crystal-manage
Date: 2006-09-08 17:28:33 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
master header files: Automated master header file repair.
Visual-C++ project files: Automated Visual-C++ project file repair.
Texinfo files: Automated Texinfo @node and @menu repair.
Swig Python files: Automated Swig Python file repair.
Swig Perl5 files: Automated Swig Perl5 file repair.
User's Manual: Automated Texinfo to HTML conversion.
Modified Paths:
--------------
CS/trunk/plugins/cscript/cspython/cs_pyth.cpp
CS/trunk/scripts/perl5/cspace.pm
CS/trunk/scripts/perl5/cswigpl5.inc
CS/trunk/scripts/python/cspace.py
Modified: CS/trunk/plugins/cscript/cspython/cs_pyth.cpp
===================================================================
--- CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-08 19:20:27 UTC (rev 25315)
+++ CS/trunk/plugins/cscript/cspython/cs_pyth.cpp 2006-09-09 00:28:33 UTC (rev 25316)
@@ -2476,928 +2476,920 @@
#define SWIGTYPE_p_csPtrTiObjectRegistryIterator_t swig_types[126]
#define SWIGTYPE_p_csPtrTiObjectWatcher_t swig_types[127]
#define SWIGTYPE_p_csPtrTiParameterESM_t swig_types[128]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEffectorForce_t swig_types[129]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEffectorLinColor_t swig_types[130]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEmitterBox_t swig_types[131]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEmitterCone_t swig_types[132]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEmitterCylinder_t swig_types[133]
-#define SWIGTYPE_p_csPtrTiParticleBuiltinEmitterSphere_t swig_types[134]
-#define SWIGTYPE_p_csPtrTiParticleEffector_t swig_types[135]
-#define SWIGTYPE_p_csPtrTiParticleEmitter_t swig_types[136]
-#define SWIGTYPE_p_csPtrTiPluginIterator_t swig_types[137]
-#define SWIGTYPE_p_csPtrTiPolygonHandle_t swig_types[138]
-#define SWIGTYPE_p_csPtrTiRendererLightmap_t swig_types[139]
-#define SWIGTYPE_p_csPtrTiRigidBody_t swig_types[140]
-#define SWIGTYPE_p_csPtrTiSectorIterator_t swig_types[141]
-#define SWIGTYPE_p_csPtrTiSequenceTrigger_t swig_types[142]
-#define SWIGTYPE_p_csPtrTiSequenceWrapper_t swig_types[143]
-#define SWIGTYPE_p_csPtrTiShaderPriorityList_t swig_types[144]
-#define SWIGTYPE_p_csPtrTiShader_t swig_types[145]
-#define SWIGTYPE_p_csPtrTiShadowBlockList_t swig_types[146]
-#define SWIGTYPE_p_csPtrTiSuperLightmap_t swig_types[147]
-#define SWIGTYPE_p_csPtrTiVisibilityObjectIterator_t swig_types[148]
-#define SWIGTYPE_p_csQuaternion swig_types[149]
-#define SWIGTYPE_p_csRGBcolor swig_types[150]
-#define SWIGTYPE_p_csRGBpixel swig_types[151]
-#define SWIGTYPE_p_csRandomGen swig_types[152]
-#define SWIGTYPE_p_csRect swig_types[153]
-#define SWIGTYPE_p_csRectRegion swig_types[154]
-#define SWIGTYPE_p_csRefArrayTcsShaderVariable_t swig_types[155]
-#define SWIGTYPE_p_csRefArrayTiAwsKey_t swig_types[156]
-#define SWIGTYPE_p_csRefArrayTiObject_t swig_types[157]
-#define SWIGTYPE_p_csRefArrayTiSceneNode_t swig_types[158]
-#define SWIGTYPE_p_csRefArrayTiShader_t swig_types[159]
-#define SWIGTYPE_p_csRefCount swig_types[160]
-#define SWIGTYPE_p_csRefTiBase_t swig_types[161]
-#define SWIGTYPE_p_csRefTiDocumentAttributeIterator_t swig_types[162]
-#define SWIGTYPE_p_csRefTiDocumentAttribute_t swig_types[163]
-#define SWIGTYPE_p_csRefTiDocumentNodeIterator_t swig_types[164]
-#define SWIGTYPE_p_csRefTiDocumentNode_t swig_types[165]
-#define SWIGTYPE_p_csRefTiDynamicsSystemCollider_t swig_types[166]
-#define SWIGTYPE_p_csRefTiEventAttributeIterator_t swig_types[167]
-#define SWIGTYPE_p_csRefTiEventHandlerRegistry_t swig_types[168]
-#define SWIGTYPE_p_csRefTiEventHandler_t swig_types[169]
-#define SWIGTYPE_p_csRefTiEventNameRegistry_t swig_types[170]
-#define SWIGTYPE_p_csRefTiEvent_t swig_types[171]
-#define SWIGTYPE_p_csRefTiGeneralFactoryState_t swig_types[172]
-#define SWIGTYPE_p_csRefTiImage_t swig_types[173]
-#define SWIGTYPE_p_csRefTiRenderBuffer_t swig_types[174]
-#define SWIGTYPE_p_csRefTiRigidBody_t swig_types[175]
-#define SWIGTYPE_p_csRefTiScriptObject_t swig_types[176]
-#define SWIGTYPE_p_csRefTiString_t swig_types[177]
-#define SWIGTYPE_p_csRenderBufferHolder swig_types[178]
-#define SWIGTYPE_p_csRenderBufferName swig_types[179]
-#define SWIGTYPE_p_csRenderMesh swig_types[180]
-#define SWIGTYPE_p_csRenderMeshList swig_types[181]
-#define SWIGTYPE_p_csRenderMeshModes swig_types[182]
-#define SWIGTYPE_p_csReporterHelper swig_types[183]
-#define SWIGTYPE_p_csReversibleTransform swig_types[184]
-#define SWIGTYPE_p_csScreenBoxResult swig_types[185]
-#define SWIGTYPE_p_csSectorHitBeamResult swig_types[186]
-#define SWIGTYPE_p_csSegment2 swig_types[187]
-#define SWIGTYPE_p_csSegment3 swig_types[188]
-#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[189]
-#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[190]
-#define SWIGTYPE_p_csShaderMetadata swig_types[191]
-#define SWIGTYPE_p_csShaderTagPresence swig_types[192]
-#define SWIGTYPE_p_csShaderVariable swig_types[193]
-#define SWIGTYPE_p_csSimplePixmap swig_types[194]
-#define SWIGTYPE_p_csSimpleRenderMesh swig_types[195]
-#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[196]
-#define SWIGTYPE_p_csSndSysSoundFormat swig_types[197]
-#define SWIGTYPE_p_csSourceParameters3D swig_types[198]
-#define SWIGTYPE_p_csSphere swig_types[199]
-#define SWIGTYPE_p_csSpline swig_types[200]
-#define SWIGTYPE_p_csSprite2DVertex swig_types[201]
-#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[202]
-#define SWIGTYPE_p_csSquaredDist swig_types[203]
-#define SWIGTYPE_p_csStrKey swig_types[204]
-#define SWIGTYPE_p_csString swig_types[205]
-#define SWIGTYPE_p_csStringArray swig_types[206]
-#define SWIGTYPE_p_csStringBase swig_types[207]
-#define SWIGTYPE_p_csStringFastT36_t swig_types[208]
-#define SWIGTYPE_p_csStringSet swig_types[209]
-#define SWIGTYPE_p_csTinyDocumentSystem swig_types[210]
-#define SWIGTYPE_p_csTraceBeamResult swig_types[211]
-#define SWIGTYPE_p_csTransform swig_types[212]
-#define SWIGTYPE_p_csTriangle swig_types[213]
-#define SWIGTYPE_p_csVector2 swig_types[214]
-#define SWIGTYPE_p_csVector3 swig_types[215]
-#define SWIGTYPE_p_csVector3Array swig_types[216]
-#define SWIGTYPE_p_csVector4 swig_types[217]
-#define SWIGTYPE_p_csVertexAttrib swig_types[218]
-#define SWIGTYPE_p_csVertexStatus swig_types[219]
-#define SWIGTYPE_p_csView swig_types[220]
-#define SWIGTYPE_p_csWrapPtr swig_types[221]
-#define SWIGTYPE_p_csXRotMatrix3 swig_types[222]
-#define SWIGTYPE_p_csXScaleMatrix3 swig_types[223]
-#define SWIGTYPE_p_csYRotMatrix3 swig_types[224]
-#define SWIGTYPE_p_csYScaleMatrix3 swig_types[225]
-#define SWIGTYPE_p_csZRotMatrix3 swig_types[226]
-#define SWIGTYPE_p_csZScaleMatrix3 swig_types[227]
-#define SWIGTYPE_p_double swig_types[228]
-#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[229]
-#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[230]
-#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[231]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[232]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[233]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[234]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[235]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[236]
-#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[237]
-#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[238]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[239]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[240]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[241]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[242]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[243]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[244]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[245]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[246]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[247]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swig_types[248]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsLayoutManager swig_types[249]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsPointKey swig_types[250]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsPrefManager swig_types[251]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsRGBKey swig_types[252]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsRectKey swig_types[253]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsSink swig_types[254]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsSinkManager swig_types[255]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsSlot swig_types[256]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsSource swig_types[257]
-#define SWIGTYPE_p_f_p_iBase__p_iAwsStringKey swig_types[258]
-#define SWIGTYPE_p_f_p_iBase__p_iBase swig_types[259]
-#define SWIGTYPE_p_f_p_iBase__p_iBinaryLoaderPlugin swig_types[260]
-#define SWIGTYPE_p_f_p_iBase__p_iBodyGroup swig_types[261]
-#define SWIGTYPE_p_f_p_iBase__p_iCacheManager swig_types[262]
-#define SWIGTYPE_p_f_p_iBase__p_iCamera swig_types[263]
-#define SWIGTYPE_p_f_p_iBase__p_iCameraPosition swig_types[264]
-#define SWIGTYPE_p_f_p_iBase__p_iCameraPositionList swig_types[265]
-#define SWIGTYPE_p_f_p_iBase__p_iCameraSectorListener swig_types[266]
-#define SWIGTYPE_p_f_p_iBase__p_iClipper2D swig_types[267]
-#define SWIGTYPE_p_f_p_iBase__p_iCollideSystem swig_types[268]
-#define SWIGTYPE_p_f_p_iBase__p_iCollider swig_types[269]
-#define SWIGTYPE_p_f_p_iBase__p_iColoredVertices swig_types[270]
-#define SWIGTYPE_p_f_p_iBase__p_iCommandLineParser swig_types[271]
-#define SWIGTYPE_p_f_p_iBase__p_iComponent swig_types[272]
-#define SWIGTYPE_p_f_p_iBase__p_iConfigFile swig_types[273]
-#define SWIGTYPE_p_f_p_iBase__p_iConfigIterator swig_types[274]
-#define SWIGTYPE_p_f_p_iBase__p_iConfigManager swig_types[275]
-#define SWIGTYPE_p_f_p_iBase__p_iConsoleOutput swig_types[276]
-#define SWIGTYPE_p_f_p_iBase__p_iConsoleWatcher swig_types[277]
-#define SWIGTYPE_p_f_p_iBase__p_iDataBuffer swig_types[278]
-#define SWIGTYPE_p_f_p_iBase__p_iDebugHelper swig_types[279]
-#define SWIGTYPE_p_f_p_iBase__p_iDocument swig_types[280]
-#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttribute swig_types[281]
-#define SWIGTYPE_p_f_p_iBase__p_iDocumentAttributeIterator swig_types[282]
-#define SWIGTYPE_p_f_p_iBase__p_iDocumentNode swig_types[283]
-#define SWIGTYPE_p_f_p_iBase__p_iDocumentNodeIterator swig_types[284]
-#define SWIGTYPE_p_f_p_iBase__p_iDocumentSystem swig_types[285]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamicSystem swig_types[286]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamics swig_types[287]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamicsColliderCollisionCallback swig_types[288]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamicsCollisionCallback swig_types[289]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamicsMoveCallback swig_types[290]
-#define SWIGTYPE_p_f_p_iBase__p_iDynamicsSystemCollider swig_types[291]
-#define SWIGTYPE_p_f_p_iBase__p_iEngine swig_types[292]
-#define SWIGTYPE_p_f_p_iBase__p_iEngineFrameCallback swig_types[293]
-#define SWIGTYPE_p_f_p_iBase__p_iEngineSectorCallback swig_types[294]
-#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceManager swig_types[295]
-#define SWIGTYPE_p_f_p_iBase__p_iEngineSequenceParameters swig_types[296]
-#define SWIGTYPE_p_f_p_iBase__p_iEvent swig_types[297]
-#define SWIGTYPE_p_f_p_iBase__p_iEventAttributeIterator swig_types[298]
-#define SWIGTYPE_p_f_p_iBase__p_iEventCord swig_types[299]
-#define SWIGTYPE_p_f_p_iBase__p_iEventHandler swig_types[300]
-#define SWIGTYPE_p_f_p_iBase__p_iEventNameRegistry swig_types[301]
-#define SWIGTYPE_p_f_p_iBase__p_iEventOutlet swig_types[302]
-#define SWIGTYPE_p_f_p_iBase__p_iEventPlug swig_types[303]
-#define SWIGTYPE_p_f_p_iBase__p_iEventQueue swig_types[304]
-#define SWIGTYPE_p_f_p_iBase__p_iFactory swig_types[305]
-#define SWIGTYPE_p_f_p_iBase__p_iFile swig_types[306]
-#define SWIGTYPE_p_f_p_iBase__p_iFont swig_types[307]
-#define SWIGTYPE_p_f_p_iBase__p_iFontDeleteNotify swig_types[308]
-#define SWIGTYPE_p_f_p_iBase__p_iFontServer swig_types[309]
-#define SWIGTYPE_p_f_p_iBase__p_iFrustumView swig_types[310]
-#define SWIGTYPE_p_f_p_iBase__p_iFrustumViewUserdata swig_types[311]
-#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControl swig_types[312]
-#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlFactory swig_types[313]
-#define SWIGTYPE_p_f_p_iBase__p_iGenMeshAnimationControlType swig_types[314]
-#define SWIGTYPE_p_f_p_iBase__p_iGeneralFactoryState swig_types[315]
-#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshCommonState swig_types[316]
-#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshState swig_types[317]
-#define SWIGTYPE_p_f_p_iBase__p_iGeneralMeshSubMesh swig_types[318]
-#define SWIGTYPE_p_f_p_iBase__p_iGraphics2D swig_types[319]
-#define SWIGTYPE_p_f_p_iBase__p_iGraphics3D swig_types[320]
-#define SWIGTYPE_p_f_p_iBase__p_iHalo swig_types[321]
-#define SWIGTYPE_p_f_p_iBase__p_iImage swig_types[322]
-#define SWIGTYPE_p_f_p_iBase__p_iImageIO swig_types[323]
-#define SWIGTYPE_p_f_p_iBase__p_iJoint swig_types[324]
-#define SWIGTYPE_p_f_p_iBase__p_iJoystickDriver swig_types[325]
-#define SWIGTYPE_p_f_p_iBase__p_iKeyComposer swig_types[326]
-#define SWIGTYPE_p_f_p_iBase__p_iKeyboardDriver swig_types[327]
-#define SWIGTYPE_p_f_p_iBase__p_iLight swig_types[328]
-#define SWIGTYPE_p_f_p_iBase__p_iLightCallback swig_types[329]
-#define SWIGTYPE_p_f_p_iBase__p_iLightIterator swig_types[330]
-#define SWIGTYPE_p_f_p_iBase__p_iLightList swig_types[331]
-#define SWIGTYPE_p_f_p_iBase__p_iLightVisibleCallback swig_types[332]
-#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessData swig_types[333]
-#define SWIGTYPE_p_f_p_iBase__p_iLightingProcessInfo swig_types[334]
-#define SWIGTYPE_p_f_p_iBase__p_iLoader swig_types[335]
-#define SWIGTYPE_p_f_p_iBase__p_iLoaderPlugin swig_types[336]
-#define SWIGTYPE_p_f_p_iBase__p_iLoaderStatus swig_types[337]
-#define SWIGTYPE_p_f_p_iBase__p_iMapNode swig_types[338]
-#define SWIGTYPE_p_f_p_iBase__p_iMaterial swig_types[339]
-#define SWIGTYPE_p_f_p_iBase__p_iMaterialEngine swig_types[340]
-#define SWIGTYPE_p_f_p_iBase__p_iMaterialList swig_types[341]
-#define SWIGTYPE_p_f_p_iBase__p_iMaterialWrapper swig_types[342]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshDrawCallback swig_types[343]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryList swig_types[344]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshFactoryWrapper swig_types[345]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshList swig_types[346]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshObject swig_types[347]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectDrawCallback swig_types[348]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectFactory swig_types[349]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshObjectType swig_types[350]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapper swig_types[351]
-#define SWIGTYPE_p_f_p_iBase__p_iMeshWrapperIterator swig_types[352]
-#define SWIGTYPE_p_f_p_iBase__p_iMissingLoaderData swig_types[353]
-#define SWIGTYPE_p_f_p_iBase__p_iMouseDriver swig_types[354]
-#define SWIGTYPE_p_f_p_iBase__p_iMovable swig_types[355]
-#define SWIGTYPE_p_f_p_iBase__p_iMovableListener swig_types[356]
-#define SWIGTYPE_p_f_p_iBase__p_iMovieRecorder swig_types[357]
-#define SWIGTYPE_p_f_p_iBase__p_iNativeWindow swig_types[358]
-#define SWIGTYPE_p_f_p_iBase__p_iNativeWindowManager swig_types[359]
-#define SWIGTYPE_p_f_p_iBase__p_iODEAMotorJoint swig_types[360]
-#define SWIGTYPE_p_f_p_iBase__p_iODEBallJoint swig_types[361]
-#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicState swig_types[362]
-#define SWIGTYPE_p_f_p_iBase__p_iODEDynamicSystemState swig_types[363]
-#define SWIGTYPE_p_f_p_iBase__p_iODEFrameUpdateCallback swig_types[364]
-#define SWIGTYPE_p_f_p_iBase__p_iODEGeneralJointState swig_types[365]
-#define SWIGTYPE_p_f_p_iBase__p_iODEHinge2Joint swig_types[366]
-#define SWIGTYPE_p_f_p_iBase__p_iODEHingeJoint swig_types[367]
-#define SWIGTYPE_p_f_p_iBase__p_iODEJointState swig_types[368]
-#define SWIGTYPE_p_f_p_iBase__p_iODESliderJoint swig_types[369]
-#define SWIGTYPE_p_f_p_iBase__p_iODEUniversalJoint swig_types[370]
-#define SWIGTYPE_p_f_p_iBase__p_iObject swig_types[371]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectIterator swig_types[372]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectModel swig_types[373]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectModelListener swig_types[374]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectNameChangeListener swig_types[375]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistry swig_types[376]
-#define SWIGTYPE_p_f_p_iBase__p_iObjectRegistryIterator swig_types[377]
-#define SWIGTYPE_p_f_p_iBase__p_iOffscreenCanvasCallback swig_types[378]
-#define SWIGTYPE_p_f_p_iBase__p_iParameterESM swig_types[379]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorFactory swig_types[380]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorForce swig_types[381]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEffectorLinColor swig_types[382]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBase swig_types[383]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterBox swig_types[384]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCone swig_types[385]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterCylinder swig_types[386]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterFactory swig_types[387]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleBuiltinEmitterSphere swig_types[388]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleEffector swig_types[389]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleEmitter swig_types[390]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleSystem swig_types[391]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemBase swig_types[392]
-#define SWIGTYPE_p_f_p_iBase__p_iParticleSystemFactory swig_types[393]
-#define SWIGTYPE_p_f_p_iBase__p_iPath swig_types[394]
-#define SWIGTYPE_p_f_p_iBase__p_iPluginIterator swig_types[395]
-#define SWIGTYPE_p_f_p_iBase__p_iPluginManager swig_types[396]
-#define SWIGTYPE_p_f_p_iBase__p_iPolygonHandle swig_types[397]
-#define SWIGTYPE_p_f_p_iBase__p_iPolygonMesh swig_types[398]
-#define SWIGTYPE_p_f_p_iBase__p_iPortal swig_types[399]
-#define SWIGTYPE_p_f_p_iBase__p_iPortalCallback swig_types[400]
-#define SWIGTYPE_p_f_p_iBase__p_iPortalContainer swig_types[401]
-#define SWIGTYPE_p_f_p_iBase__p_iRegion swig_types[402]
-#define SWIGTYPE_p_f_p_iBase__p_iRegionList swig_types[403]
-#define SWIGTYPE_p_f_p_iBase__p_iRendererLightmap swig_types[404]
-#define SWIGTYPE_p_f_p_iBase__p_iReporter swig_types[405]
-#define SWIGTYPE_p_f_p_iBase__p_iReporterIterator swig_types[406]
-#define SWIGTYPE_p_f_p_iBase__p_iReporterListener swig_types[407]
-#define SWIGTYPE_p_f_p_iBase__p_iRigidBody swig_types[408]
-#define SWIGTYPE_p_f_p_iBase__p_iSCF swig_types[409]
-#define SWIGTYPE_p_f_p_iBase__p_iSaver swig_types[410]
-#define SWIGTYPE_p_f_p_iBase__p_iSceneNode swig_types[411]
-#define SWIGTYPE_p_f_p_iBase__p_iScript swig_types[412]
-#define SWIGTYPE_p_f_p_iBase__p_iScriptObject swig_types[413]
-#define SWIGTYPE_p_f_p_iBase__p_iSector swig_types[414]
-#define SWIGTYPE_p_f_p_iBase__p_iSectorCallback swig_types[415]
-#define SWIGTYPE_p_f_p_iBase__p_iSectorIterator swig_types[416]
-#define SWIGTYPE_p_f_p_iBase__p_iSectorList swig_types[417]
-#define SWIGTYPE_p_f_p_iBase__p_iSectorMeshCallback swig_types[418]
-#define SWIGTYPE_p_f_p_iBase__p_iSequenceTimedOperation swig_types[419]
-#define SWIGTYPE_p_f_p_iBase__p_iSequenceTrigger swig_types[420]
-#define SWIGTYPE_p_f_p_iBase__p_iSequenceWrapper swig_types[421]
-#define SWIGTYPE_p_f_p_iBase__p_iShader swig_types[422]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderCompiler swig_types[423]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderManager swig_types[424]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderPriorityList swig_types[425]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderVarStack swig_types[426]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableAccessor swig_types[427]
-#define SWIGTYPE_p_f_p_iBase__p_iShaderVariableContext swig_types[428]
-#define SWIGTYPE_p_f_p_iBase__p_iSimpleFormerState swig_types[429]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysData swig_types[430]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysListener swig_types[431]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysLoader swig_types[432]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysManager swig_types[433]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysRenderer swig_types[434]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererCallback swig_types[435]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysRendererSoftware swig_types[436]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareDriver swig_types[437]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareFilter3D swig_types[438]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSoftwareOutputFilter swig_types[439]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSource swig_types[440]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware swig_types[441]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysSourceSoftware3D swig_types[442]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysStream swig_types[443]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysStreamCallback swig_types[444]
-#define SWIGTYPE_p_f_p_iBase__p_iSndSysWrapper swig_types[445]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite2DFactoryState swig_types[446]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite2DState swig_types[447]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimation swig_types[448]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite2DUVAnimationFrame swig_types[449]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite3DFactoryState swig_types[450]
-#define SWIGTYPE_p_f_p_iBase__p_iSprite3DState swig_types[451]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteAction swig_types[452]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DFactoryState swig_types[453]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DSocket swig_types[454]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteCal3DState swig_types[455]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteFrame swig_types[456]
-#define SWIGTYPE_p_f_p_iBase__p_iSpriteSocket swig_types[457]
-#define SWIGTYPE_p_f_p_iBase__p_iStandardReporterListener swig_types[458]
-#define SWIGTYPE_p_f_p_iBase__p_iString swig_types[459]
-#define SWIGTYPE_p_f_p_iBase__p_iStringArray swig_types[460]
-#define SWIGTYPE_p_f_p_iBase__p_iStringSet swig_types[461]
-#define SWIGTYPE_p_f_p_iBase__p_iSuperLightmap swig_types[462]
-#define SWIGTYPE_p_f_p_iBase__p_iTerraFormer swig_types[463]
-#define SWIGTYPE_p_f_p_iBase__p_iTerraSampler swig_types[464]
-#define SWIGTYPE_p_f_p_iBase__p_iTerrainFactoryState swig_types[465]
-#define SWIGTYPE_p_f_p_iBase__p_iTerrainObjectState swig_types[466]
-#define SWIGTYPE_p_f_p_iBase__p_iTextureCallback swig_types[467]
-#define SWIGTYPE_p_f_p_iBase__p_iTextureHandle swig_types[468]
-#define SWIGTYPE_p_f_p_iBase__p_iTextureList swig_types[469]
-#define SWIGTYPE_p_f_p_iBase__p_iTextureManager swig_types[470]
-#define SWIGTYPE_p_f_p_iBase__p_iTextureWrapper swig_types[471]
-#define SWIGTYPE_p_f_p_iBase__p_iThingEnvironment swig_types[472]
-#define SWIGTYPE_p_f_p_iBase__p_iThingFactoryState swig_types[473]
-#define SWIGTYPE_p_f_p_iBase__p_iThingState swig_types[474]
-#define SWIGTYPE_p_f_p_iBase__p_iVFS swig_types[475]
-#define SWIGTYPE_p_f_p_iBase__p_iView swig_types[476]
-#define SWIGTYPE_p_f_p_iBase__p_iVirtualClock swig_types[477]
-#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCuller swig_types[478]
-#define SWIGTYPE_p_f_p_iBase__p_iVisibilityCullerListener swig_types[479]
-#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObject swig_types[480]
-#define SWIGTYPE_p_f_p_iBase__p_iVisibilityObjectIterator swig_types[481]
-#define SWIGTYPE_p_f_p_iBase__p_scfImplementation1TcsPath_iPath_t swig_types[482]
-#define SWIGTYPE_p_f_p_iMeshWrapper_p_iFrustumView_bool__void swig_types[483]
-#define SWIGTYPE_p_f_unsigned_long_int_p_iAwsSource__void swig_types[484]
-#define SWIGTYPE_p_f_unsigned_long_p_void_p_iAwsSource__void swig_types[485]
-#define SWIGTYPE_p_float swig_types[486]
-#define SWIGTYPE_p_iAnimTimeUpdateHandler swig_types[487]
-#define SWIGTYPE_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[488]
-#define SWIGTYPE_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[489]
-#define SWIGTYPE_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[490]
-#define SWIGTYPE_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[491]
-#define SWIGTYPE_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[492]
-#define SWIGTYPE_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[493]
-#define SWIGTYPE_p_iAws swig_types[494]
-#define SWIGTYPE_p_iAwsCanvas swig_types[495]
-#define SWIGTYPE_p_iAwsComponent swig_types[496]
-#define SWIGTYPE_p_iAwsComponentFactory swig_types[497]
-#define SWIGTYPE_p_iAwsComponentNode swig_types[498]
-#define SWIGTYPE_p_iAwsConnectionKey swig_types[499]
-#define SWIGTYPE_p_iAwsConnectionNodeFactory swig_types[500]
-#define SWIGTYPE_p_iAwsFloatKey swig_types[501]
-#define SWIGTYPE_p_iAwsIntKey swig_types[502]
-#define SWIGTYPE_p_iAwsKey swig_types[503]
-#define SWIGTYPE_p_iAwsKeyContainer swig_types[504]
-#define SWIGTYPE_p_iAwsKeyFactory swig_types[505]
-#define SWIGTYPE_p_iAwsLayoutManager swig_types[506]
-#define SWIGTYPE_p_iAwsParmList swig_types[507]
-#define SWIGTYPE_p_iAwsPointKey swig_types[508]
-#define SWIGTYPE_p_iAwsPrefManager swig_types[509]
-#define SWIGTYPE_p_iAwsRGBKey swig_types[510]
-#define SWIGTYPE_p_iAwsRGBKey__RGB swig_types[511]
-#define SWIGTYPE_p_iAwsRectKey swig_types[512]
-#define SWIGTYPE_p_iAwsSink swig_types[513]
-#define SWIGTYPE_p_iAwsSinkManager swig_types[514]
-#define SWIGTYPE_p_iAwsSlot swig_types[515]
-#define SWIGTYPE_p_iAwsSource swig_types[516]
-#define SWIGTYPE_p_iAwsStringKey swig_types[517]
-#define SWIGTYPE_p_iBase swig_types[518]
-#define SWIGTYPE_p_iBaseHalo swig_types[519]
-#define SWIGTYPE_p_iBinaryLoaderPlugin swig_types[520]
-#define SWIGTYPE_p_iBodyGroup swig_types[521]
-#define SWIGTYPE_p_iCacheManager swig_types[522]
-#define SWIGTYPE_p_iCamera swig_types[523]
-#define SWIGTYPE_p_iCameraPosition swig_types[524]
-#define SWIGTYPE_p_iCameraPositionList swig_types[525]
-#define SWIGTYPE_p_iCameraSectorListener swig_types[526]
-#define SWIGTYPE_p_iClipper2D swig_types[527]
-#define SWIGTYPE_p_iCollection swig_types[528]
-#define SWIGTYPE_p_iCollectionList swig_types[529]
-#define SWIGTYPE_p_iCollideSystem swig_types[530]
-#define SWIGTYPE_p_iCollider swig_types[531]
-#define SWIGTYPE_p_iColoredVertices swig_types[532]
-#define SWIGTYPE_p_iCommandLineParser swig_types[533]
-#define SWIGTYPE_p_iComponent swig_types[534]
-#define SWIGTYPE_p_iConfigFile swig_types[535]
-#define SWIGTYPE_p_iConfigIterator swig_types[536]
-#define SWIGTYPE_p_iConfigManager swig_types[537]
-#define SWIGTYPE_p_iConsoleOutput swig_types[538]
-#define SWIGTYPE_p_iConsoleWatcher swig_types[539]
-#define SWIGTYPE_p_iCrossHalo swig_types[540]
-#define SWIGTYPE_p_iDataBuffer swig_types[541]
-#define SWIGTYPE_p_iDebugHelper swig_types[542]
-#define SWIGTYPE_p_iDocument swig_types[543]
-#define SWIGTYPE_p_iDocumentAttribute swig_types[544]
-#define SWIGTYPE_p_iDocumentAttributeIterator swig_types[545]
-#define SWIGTYPE_p_iDocumentNode swig_types[546]
-#define SWIGTYPE_p_iDocumentNodeIterator swig_types[547]
-#define SWIGTYPE_p_iDocumentSystem swig_types[548]
-#define SWIGTYPE_p_iDynamicSystem swig_types[549]
-#define SWIGTYPE_p_iDynamics swig_types[550]
-#define SWIGTYPE_p_iDynamicsColliderCollisionCallback swig_types[551]
-#define SWIGTYPE_p_iDynamicsCollisionCallback swig_types[552]
-#define SWIGTYPE_p_iDynamicsMoveCallback swig_types[553]
-#define SWIGTYPE_p_iDynamicsSystemCollider swig_types[554]
-#define SWIGTYPE_p_iEngine swig_types[555]
-#define SWIGTYPE_p_iEngineFrameCallback swig_types[556]
-#define SWIGTYPE_p_iEngineSectorCallback swig_types[557]
-#define SWIGTYPE_p_iEngineSequenceManager swig_types[558]
-#define SWIGTYPE_p_iEngineSequenceParameters swig_types[559]
-#define SWIGTYPE_p_iEvent swig_types[560]
-#define SWIGTYPE_p_iEventAttributeIterator swig_types[561]
-#define SWIGTYPE_p_iEventCord swig_types[562]
-#define SWIGTYPE_p_iEventHandler swig_types[563]
-#define SWIGTYPE_p_iEventNameRegistry swig_types[564]
-#define SWIGTYPE_p_iEventOutlet swig_types[565]
-#define SWIGTYPE_p_iEventPlug swig_types[566]
-#define SWIGTYPE_p_iEventQueue swig_types[567]
-#define SWIGTYPE_p_iFactory swig_types[568]
-#define SWIGTYPE_p_iFile swig_types[569]
-#define SWIGTYPE_p_iFlareHalo swig_types[570]
-#define SWIGTYPE_p_iFont swig_types[571]
-#define SWIGTYPE_p_iFontDeleteNotify swig_types[572]
-#define SWIGTYPE_p_iFontServer swig_types[573]
-#define SWIGTYPE_p_iFrustumView swig_types[574]
-#define SWIGTYPE_p_iFrustumViewUserdata swig_types[575]
-#define SWIGTYPE_p_iGenMeshAnimationControl swig_types[576]
-#define SWIGTYPE_p_iGenMeshAnimationControlFactory swig_types[577]
-#define SWIGTYPE_p_iGenMeshAnimationControlType swig_types[578]
-#define SWIGTYPE_p_iGeneralFactoryState swig_types[579]
-#define SWIGTYPE_p_iGeneralMeshCommonState swig_types[580]
-#define SWIGTYPE_p_iGeneralMeshState swig_types[581]
-#define SWIGTYPE_p_iGeneralMeshSubMesh swig_types[582]
-#define SWIGTYPE_p_iGraphics2D swig_types[583]
-#define SWIGTYPE_p_iGraphics3D swig_types[584]
-#define SWIGTYPE_p_iHalo swig_types[585]
-#define SWIGTYPE_p_iImage swig_types[586]
-#define SWIGTYPE_p_iImageIO swig_types[587]
-#define SWIGTYPE_p_iJoint swig_types[588]
-#define SWIGTYPE_p_iJoystickDriver swig_types[589]
-#define SWIGTYPE_p_iKeyComposer swig_types[590]
-#define SWIGTYPE_p_iKeyboardDriver swig_types[591]
-#define SWIGTYPE_p_iLODControl swig_types[592]
-#define SWIGTYPE_p_iLight swig_types[593]
-#define SWIGTYPE_p_iLightCallback swig_types[594]
-#define SWIGTYPE_p_iLightIterator swig_types[595]
-#define SWIGTYPE_p_iLightList swig_types[596]
-#define SWIGTYPE_p_iLightVisibleCallback swig_types[597]
-#define SWIGTYPE_p_iLightingInfo swig_types[598]
-#define SWIGTYPE_p_iLightingProcessData swig_types[599]
-#define SWIGTYPE_p_iLightingProcessInfo swig_types[600]
-#define SWIGTYPE_p_iLoader swig_types[601]
-#define SWIGTYPE_p_iLoaderContext swig_types[602]
-#define SWIGTYPE_p_iLoaderPlugin swig_types[603]
-#define SWIGTYPE_p_iLoaderStatus swig_types[604]
-#define SWIGTYPE_p_iMapNode swig_types[605]
-#define SWIGTYPE_p_iMaterial swig_types[606]
-#define SWIGTYPE_p_iMaterialEngine swig_types[607]
-#define SWIGTYPE_p_iMaterialList swig_types[608]
-#define SWIGTYPE_p_iMaterialWrapper swig_types[609]
-#define SWIGTYPE_p_iMeshDrawCallback swig_types[610]
-#define SWIGTYPE_p_iMeshFactoryList swig_types[611]
-#define SWIGTYPE_p_iMeshFactoryWrapper swig_types[612]
-#define SWIGTYPE_p_iMeshGenerator swig_types[613]
-#define SWIGTYPE_p_iMeshList swig_types[614]
-#define SWIGTYPE_p_iMeshObject swig_types[615]
-#define SWIGTYPE_p_iMeshObjectDrawCallback swig_types[616]
-#define SWIGTYPE_p_iMeshObjectFactory swig_types[617]
-#define SWIGTYPE_p_iMeshObjectType swig_types[618]
-#define SWIGTYPE_p_iMeshWrapper swig_types[619]
-#define SWIGTYPE_p_iMeshWrapperIterator swig_types[620]
-#define SWIGTYPE_p_iMissingLoaderData swig_types[621]
-#define SWIGTYPE_p_iMouseDriver swig_types[622]
-#define SWIGTYPE_p_iMovable swig_types[623]
-#define SWIGTYPE_p_iMovableListener swig_types[624]
-#define SWIGTYPE_p_iMovieRecorder swig_types[625]
-#define SWIGTYPE_p_iNativeWindow swig_types[626]
-#define SWIGTYPE_p_iNativeWindowManager swig_types[627]
-#define SWIGTYPE_p_iNovaHalo swig_types[628]
-#define SWIGTYPE_p_iODEAMotorJoint swig_types[629]
-#define SWIGTYPE_p_iODEBallJoint swig_types[630]
-#define SWIGTYPE_p_iODEDynamicState swig_types[631]
-#define SWIGTYPE_p_iODEDynamicSystemState swig_types[632]
-#define SWIGTYPE_p_iODEFrameUpdateCallback swig_types[633]
-#define SWIGTYPE_p_iODEGeneralJointState swig_types[634]
-#define SWIGTYPE_p_iODEHinge2Joint swig_types[635]
-#define SWIGTYPE_p_iODEHingeJoint swig_types[636]
-#define SWIGTYPE_p_iODEJointState swig_types[637]
-#define SWIGTYPE_p_iODESliderJoint swig_types[638]
-#define SWIGTYPE_p_iODEUniversalJoint swig_types[639]
-#define SWIGTYPE_p_iObject swig_types[640]
-#define SWIGTYPE_p_iObjectIterator swig_types[641]
-#define SWIGTYPE_p_iObjectModel swig_types[642]
-#define SWIGTYPE_p_iObjectModelListener swig_types[643]
-#define SWIGTYPE_p_iObjectNameChangeListener swig_types[644]
-#define SWIGTYPE_p_iObjectRegistry swig_types[645]
-#define SWIGTYPE_p_iObjectRegistryIterator swig_types[646]
-#define SWIGTYPE_p_iOffscreenCanvasCallback swig_types[647]
-#define SWIGTYPE_p_iParameterESM swig_types[648]
-#define SWIGTYPE_p_iParticleBuiltinEffectorFactory swig_types[649]
-#define SWIGTYPE_p_iParticleBuiltinEffectorForce swig_types[650]
-#define SWIGTYPE_p_iParticleBuiltinEffectorLinColor swig_types[651]
-#define SWIGTYPE_p_iParticleBuiltinEmitterBase swig_types[652]
-#define SWIGTYPE_p_iParticleBuiltinEmitterBox swig_types[653]
-#define SWIGTYPE_p_iParticleBuiltinEmitterCone swig_types[654]
-#define SWIGTYPE_p_iParticleBuiltinEmitterCylinder swig_types[655]
-#define SWIGTYPE_p_iParticleBuiltinEmitterFactory swig_types[656]
-#define SWIGTYPE_p_iParticleBuiltinEmitterSphere swig_types[657]
-#define SWIGTYPE_p_iParticleEffector swig_types[658]
-#define SWIGTYPE_p_iParticleEmitter swig_types[659]
-#define SWIGTYPE_p_iParticleSystem swig_types[660]
-#define SWIGTYPE_p_iParticleSystemBase swig_types[661]
-#define SWIGTYPE_p_iParticleSystemFactory swig_types[662]
-#define SWIGTYPE_p_iPath swig_types[663]
-#define SWIGTYPE_p_iPluginIterator swig_types[664]
-#define SWIGTYPE_p_iPluginManager swig_types[665]
-#define SWIGTYPE_p_iPolygonHandle swig_types[666]
-#define SWIGTYPE_p_iPolygonMesh swig_types[667]
-#define SWIGTYPE_p_iPortal swig_types[668]
-#define SWIGTYPE_p_iPortalCallback swig_types[669]
-#define SWIGTYPE_p_iPortalContainer swig_types[670]
-#define SWIGTYPE_p_iProgressMeter swig_types[671]
-#define SWIGTYPE_p_iRegion swig_types[672]
-#define SWIGTYPE_p_iRegionList swig_types[673]
-#define SWIGTYPE_p_iRenderBuffer swig_types[674]
-#define SWIGTYPE_p_iRenderLoop swig_types[675]
-#define SWIGTYPE_p_iRenderLoopManager swig_types[676]
-#define SWIGTYPE_p_iRenderView swig_types[677]
-#define SWIGTYPE_p_iRendererLightmap swig_types[678]
-#define SWIGTYPE_p_iReporter swig_types[679]
-#define SWIGTYPE_p_iReporterIterator swig_types[680]
-#define SWIGTYPE_p_iReporterListener swig_types[681]
-#define SWIGTYPE_p_iRigidBody swig_types[682]
-#define SWIGTYPE_p_iSCF swig_types[683]
-#define SWIGTYPE_p_iSaver swig_types[684]
-#define SWIGTYPE_p_iSceneNode swig_types[685]
-#define SWIGTYPE_p_iSceneNodeArray swig_types[686]
-#define SWIGTYPE_p_iScript swig_types[687]
-#define SWIGTYPE_p_iScriptObject swig_types[688]
-#define SWIGTYPE_p_iSector swig_types[689]
-#define SWIGTYPE_p_iSectorCallback swig_types[690]
-#define SWIGTYPE_p_iSectorIterator swig_types[691]
-#define SWIGTYPE_p_iSectorList swig_types[692]
-#define SWIGTYPE_p_iSectorMeshCallback swig_types[693]
-#define SWIGTYPE_p_iSequence swig_types[694]
-#define SWIGTYPE_p_iSequenceManager swig_types[695]
-#define SWIGTYPE_p_iSequenceTimedOperation swig_types[696]
-#define SWIGTYPE_p_iSequenceTrigger swig_types[697]
-#define SWIGTYPE_p_iSequenceWrapper swig_types[698]
-#define SWIGTYPE_p_iShader swig_types[699]
-#define SWIGTYPE_p_iShaderCompiler swig_types[700]
-#define SWIGTYPE_p_iShaderManager swig_types[701]
-#define SWIGTYPE_p_iShaderPriorityList swig_types[702]
-#define SWIGTYPE_p_iShaderVarStack swig_types[703]
-#define SWIGTYPE_p_iShaderVariableAccessor swig_types[704]
-#define SWIGTYPE_p_iShaderVariableContext swig_types[705]
-#define SWIGTYPE_p_iShadowBlockList swig_types[706]
-#define SWIGTYPE_p_iShadowCaster swig_types[707]
-#define SWIGTYPE_p_iShadowReceiver swig_types[708]
-#define SWIGTYPE_p_iSharedVariable swig_types[709]
-#define SWIGTYPE_p_iSharedVariableList swig_types[710]
-#define SWIGTYPE_p_iSimpleFormerState swig_types[711]
-#define SWIGTYPE_p_iSndSysData swig_types[712]
-#define SWIGTYPE_p_iSndSysListener swig_types[713]
-#define SWIGTYPE_p_iSndSysLoader swig_types[714]
-#define SWIGTYPE_p_iSndSysManager swig_types[715]
-#define SWIGTYPE_p_iSndSysRenderer swig_types[716]
-#define SWIGTYPE_p_iSndSysRendererCallback swig_types[717]
-#define SWIGTYPE_p_iSndSysRendererSoftware swig_types[718]
-#define SWIGTYPE_p_iSndSysSoftwareDriver swig_types[719]
-#define SWIGTYPE_p_iSndSysSoftwareFilter3D swig_types[720]
-#define SWIGTYPE_p_iSndSysSoftwareFilter3DProperties swig_types[721]
-#define SWIGTYPE_p_iSndSysSoftwareOutputFilter swig_types[722]
-#define SWIGTYPE_p_iSndSysSource swig_types[723]
-#define SWIGTYPE_p_iSndSysSourceSoftware swig_types[724]
-#define SWIGTYPE_p_iSndSysSourceSoftware3D swig_types[725]
-#define SWIGTYPE_p_iSndSysStream swig_types[726]
-#define SWIGTYPE_p_iSndSysStreamCallback swig_types[727]
-#define SWIGTYPE_p_iSndSysWrapper swig_types[728]
-#define SWIGTYPE_p_iSprite2DFactoryState swig_types[729]
-#define SWIGTYPE_p_iSprite2DState swig_types[730]
-#define SWIGTYPE_p_iSprite2DUVAnimation swig_types[731]
-#define SWIGTYPE_p_iSprite2DUVAnimationFrame swig_types[732]
-#define SWIGTYPE_p_iSprite3DFactoryState swig_types[733]
-#define SWIGTYPE_p_iSprite3DState swig_types[734]
-#define SWIGTYPE_p_iSpriteAction swig_types[735]
-#define SWIGTYPE_p_iSpriteCal3DFactoryState swig_types[736]
-#define SWIGTYPE_p_iSpriteCal3DSocket swig_types[737]
-#define SWIGTYPE_p_iSpriteCal3DState swig_types[738]
-#define SWIGTYPE_p_iSpriteFrame swig_types[739]
-#define SWIGTYPE_p_iSpriteSocket swig_types[740]
-#define SWIGTYPE_p_iStandardReporterListener swig_types[741]
-#define SWIGTYPE_p_iStreamSource swig_types[742]
-#define SWIGTYPE_p_iString swig_types[743]
-#define SWIGTYPE_p_iStringArray swig_types[744]
-#define SWIGTYPE_p_iStringSet swig_types[745]
-#define SWIGTYPE_p_iSuperLightmap swig_types[746]
-#define SWIGTYPE_p_iTerraFormer swig_types[747]
-#define SWIGTYPE_p_iTerraSampler swig_types[748]
-#define SWIGTYPE_p_iTerrainFactoryState swig_types[749]
-#define SWIGTYPE_p_iTerrainObjectState swig_types[750]
-#define SWIGTYPE_p_iTextureCallback swig_types[751]
-#define SWIGTYPE_p_iTextureHandle swig_types[752]
-#define SWIGTYPE_p_iTextureList swig_types[753]
-#define SWIGTYPE_p_iTextureManager swig_types[754]
-#define SWIGTYPE_p_iTextureWrapper swig_types[755]
-#define SWIGTYPE_p_iThingEnvironment swig_types[756]
-#define SWIGTYPE_p_iThingFactoryState swig_types[757]
-#define SWIGTYPE_p_iThingState swig_types[758]
-#define SWIGTYPE_p_iVFS swig_types[759]
-#define SWIGTYPE_p_iVerbosityManager swig_types[760]
-#define SWIGTYPE_p_iView swig_types[761]
-#define SWIGTYPE_p_iVirtualClock swig_types[762]
-#define SWIGTYPE_p_iVisibilityCuller swig_types[763]
-#define SWIGTYPE_p_iVisibilityCullerListener swig_types[764]
-#define SWIGTYPE_p_iVisibilityObject swig_types[765]
-#define SWIGTYPE_p_iVisibilityObjectIterator swig_types[766]
-#define SWIGTYPE_p_int swig_types[767]
-#define SWIGTYPE_p_int16_t swig_types[768]
-#define SWIGTYPE_p_int32_t swig_types[769]
-#define SWIGTYPE_p_int64_t swig_types[770]
-#define SWIGTYPE_p_int8_t swig_types[771]
-#define SWIGTYPE_p_int_least64_t swig_types[772]
-#define SWIGTYPE_p_p__csPyEventHandler swig_types[773]
-#define SWIGTYPE_p_p_char swig_types[774]
-#define SWIGTYPE_p_p_csImageIOFileFormatDescription swig_types[775]
-#define SWIGTYPE_p_p_csOrthoTransform swig_types[776]
-#define SWIGTYPE_p_p_csPath swig_types[777]
-#define SWIGTYPE_p_p_csRenderMesh swig_types[778]
-#define SWIGTYPE_p_p_csReversibleTransform swig_types[779]
-#define SWIGTYPE_p_p_csShaderVariable swig_types[780]
-#define SWIGTYPE_p_p_csVector3 swig_types[781]
-#define SWIGTYPE_p_p_iAnimTimeUpdateHandler swig_types[782]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[783]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[784]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[785]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[786]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[787]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[788]
-#define SWIGTYPE_p_p_iAws swig_types[789]
-#define SWIGTYPE_p_p_iAwsComponent swig_types[790]
-#define SWIGTYPE_p_p_iAwsComponentFactory swig_types[791]
-#define SWIGTYPE_p_p_iAwsComponentNode swig_types[792]
-#define SWIGTYPE_p_p_iAwsConnectionKey swig_types[793]
-#define SWIGTYPE_p_p_iAwsConnectionNodeFactory swig_types[794]
-#define SWIGTYPE_p_p_iAwsFloatKey swig_types[795]
-#define SWIGTYPE_p_p_iAwsIntKey swig_types[796]
-#define SWIGTYPE_p_p_iAwsKey swig_types[797]
-#define SWIGTYPE_p_p_iAwsKeyContainer swig_types[798]
-#define SWIGTYPE_p_p_iAwsKeyFactory swig_types[799]
-#define SWIGTYPE_p_p_iAwsLayoutManager swig_types[800]
-#define SWIGTYPE_p_p_iAwsPointKey swig_types[801]
-#define SWIGTYPE_p_p_iAwsPrefManager swig_types[802]
-#define SWIGTYPE_p_p_iAwsRGBKey swig_types[803]
-#define SWIGTYPE_p_p_iAwsRectKey swig_types[804]
-#define SWIGTYPE_p_p_iAwsSink swig_types[805]
-#define SWIGTYPE_p_p_iAwsSinkManager swig_types[806]
-#define SWIGTYPE_p_p_iAwsSlot swig_types[807]
-#define SWIGTYPE_p_p_iAwsSource swig_types[808]
-#define SWIGTYPE_p_p_iAwsStringKey swig_types[809]
-#define SWIGTYPE_p_p_iBase swig_types[810]
-#define SWIGTYPE_p_p_iBinaryLoaderPlugin swig_types[811]
-#define SWIGTYPE_p_p_iBodyGroup swig_types[812]
-#define SWIGTYPE_p_p_iCacheManager swig_types[813]
-#define SWIGTYPE_p_p_iCamera swig_types[814]
-#define SWIGTYPE_p_p_iCameraPosition swig_types[815]
-#define SWIGTYPE_p_p_iCameraPositionList swig_types[816]
-#define SWIGTYPE_p_p_iCameraSectorListener swig_types[817]
-#define SWIGTYPE_p_p_iClipper2D swig_types[818]
-#define SWIGTYPE_p_p_iCollideSystem swig_types[819]
-#define SWIGTYPE_p_p_iCollider swig_types[820]
-#define SWIGTYPE_p_p_iColoredVertices swig_types[821]
-#define SWIGTYPE_p_p_iCommandLineParser swig_types[822]
-#define SWIGTYPE_p_p_iComponent swig_types[823]
-#define SWIGTYPE_p_p_iConfigFile swig_types[824]
-#define SWIGTYPE_p_p_iConfigIterator swig_types[825]
-#define SWIGTYPE_p_p_iConfigManager swig_types[826]
-#define SWIGTYPE_p_p_iConsoleOutput swig_types[827]
-#define SWIGTYPE_p_p_iConsoleWatcher swig_types[828]
-#define SWIGTYPE_p_p_iDataBuffer swig_types[829]
-#define SWIGTYPE_p_p_iDebugHelper swig_types[830]
-#define SWIGTYPE_p_p_iDocument swig_types[831]
-#define SWIGTYPE_p_p_iDocumentAttribute swig_types[832]
-#define SWIGTYPE_p_p_iDocumentAttributeIterator swig_types[833]
-#define SWIGTYPE_p_p_iDocumentNode swig_types[834]
-#define SWIGTYPE_p_p_iDocumentNodeIterator swig_types[835]
-#define SWIGTYPE_p_p_iDocumentSystem swig_types[836]
-#define SWIGTYPE_p_p_iDynamicSystem swig_types[837]
-#define SWIGTYPE_p_p_iDynamics swig_types[838]
-#define SWIGTYPE_p_p_iDynamicsColliderCollisionCallback swig_types[839]
-#define SWIGTYPE_p_p_iDynamicsCollisionCallback swig_types[840]
-#define SWIGTYPE_p_p_iDynamicsMoveCallback swig_types[841]
-#define SWIGTYPE_p_p_iDynamicsSystemCollider swig_types[842]
-#define SWIGTYPE_p_p_iEngine swig_types[843]
-#define SWIGTYPE_p_p_iEngineFrameCallback swig_types[844]
-#define SWIGTYPE_p_p_iEngineSectorCallback swig_types[845]
-#define SWIGTYPE_p_p_iEngineSequenceManager swig_types[846]
-#define SWIGTYPE_p_p_iEngineSequenceParameters swig_types[847]
-#define SWIGTYPE_p_p_iEvent swig_types[848]
-#define SWIGTYPE_p_p_iEventAttributeIterator swig_types[849]
-#define SWIGTYPE_p_p_iEventCord swig_types[850]
-#define SWIGTYPE_p_p_iEventHandler swig_types[851]
-#define SWIGTYPE_p_p_iEventNameRegistry swig_types[852]
-#define SWIGTYPE_p_p_iEventOutlet swig_types[853]
-#define SWIGTYPE_p_p_iEventPlug swig_types[854]
-#define SWIGTYPE_p_p_iEventQueue swig_types[855]
-#define SWIGTYPE_p_p_iFactory swig_types[856]
-#define SWIGTYPE_p_p_iFile swig_types[857]
-#define SWIGTYPE_p_p_iFont swig_types[858]
-#define SWIGTYPE_p_p_iFontDeleteNotify swig_types[859]
-#define SWIGTYPE_p_p_iFontServer swig_types[860]
-#define SWIGTYPE_p_p_iFrustumView swig_types[861]
-#define SWIGTYPE_p_p_iFrustumViewUserdata swig_types[862]
-#define SWIGTYPE_p_p_iGenMeshAnimationControl swig_types[863]
-#define SWIGTYPE_p_p_iGenMeshAnimationControlFactory swig_types[864]
-#define SWIGTYPE_p_p_iGenMeshAnimationControlType swig_types[865]
-#define SWIGTYPE_p_p_iGeneralFactoryState swig_types[866]
-#define SWIGTYPE_p_p_iGeneralMeshCommonState swig_types[867]
-#define SWIGTYPE_p_p_iGeneralMeshState swig_types[868]
-#define SWIGTYPE_p_p_iGeneralMeshSubMesh swig_types[869]
-#define SWIGTYPE_p_p_iGraphics2D swig_types[870]
-#define SWIGTYPE_p_p_iGraphics3D swig_types[871]
-#define SWIGTYPE_p_p_iHalo swig_types[872]
-#define SWIGTYPE_p_p_iImage swig_types[873]
-#define SWIGTYPE_p_p_iImageIO swig_types[874]
-#define SWIGTYPE_p_p_iJoint swig_types[875]
-#define SWIGTYPE_p_p_iJoystickDriver swig_types[876]
-#define SWIGTYPE_p_p_iKeyComposer swig_types[877]
-#define SWIGTYPE_p_p_iKeyboardDriver swig_types[878]
-#define SWIGTYPE_p_p_iLight swig_types[879]
-#define SWIGTYPE_p_p_iLightCallback swig_types[880]
-#define SWIGTYPE_p_p_iLightIterator swig_types[881]
-#define SWIGTYPE_p_p_iLightList swig_types[882]
-#define SWIGTYPE_p_p_iLightVisibleCallback swig_types[883]
-#define SWIGTYPE_p_p_iLightingProcessData swig_types[884]
-#define SWIGTYPE_p_p_iLightingProcessInfo swig_types[885]
-#define SWIGTYPE_p_p_iLoader swig_types[886]
-#define SWIGTYPE_p_p_iLoaderPlugin swig_types[887]
-#define SWIGTYPE_p_p_iLoaderStatus swig_types[888]
-#define SWIGTYPE_p_p_iMapNode swig_types[889]
-#define SWIGTYPE_p_p_iMaterial swig_types[890]
-#define SWIGTYPE_p_p_iMaterialEngine swig_types[891]
-#define SWIGTYPE_p_p_iMaterialList swig_types[892]
-#define SWIGTYPE_p_p_iMaterialWrapper swig_types[893]
-#define SWIGTYPE_p_p_iMeshDrawCallback swig_types[894]
-#define SWIGTYPE_p_p_iMeshFactoryList swig_types[895]
-#define SWIGTYPE_p_p_iMeshFactoryWrapper swig_types[896]
-#define SWIGTYPE_p_p_iMeshList swig_types[897]
-#define SWIGTYPE_p_p_iMeshObject swig_types[898]
-#define SWIGTYPE_p_p_iMeshObjectDrawCallback swig_types[899]
-#define SWIGTYPE_p_p_iMeshObjectFactory swig_types[900]
-#define SWIGTYPE_p_p_iMeshObjectType swig_types[901]
-#define SWIGTYPE_p_p_iMeshWrapper swig_types[902]
-#define SWIGTYPE_p_p_iMeshWrapperIterator swig_types[903]
-#define SWIGTYPE_p_p_iMissingLoaderData swig_types[904]
-#define SWIGTYPE_p_p_iMouseDriver swig_types[905]
-#define SWIGTYPE_p_p_iMovable swig_types[906]
-#define SWIGTYPE_p_p_iMovableListener swig_types[907]
-#define SWIGTYPE_p_p_iMovieRecorder swig_types[908]
-#define SWIGTYPE_p_p_iNativeWindow swig_types[909]
-#define SWIGTYPE_p_p_iNativeWindowManager swig_types[910]
-#define SWIGTYPE_p_p_iODEAMotorJoint swig_types[911]
-#define SWIGTYPE_p_p_iODEBallJoint swig_types[912]
-#define SWIGTYPE_p_p_iODEDynamicState swig_types[913]
-#define SWIGTYPE_p_p_iODEDynamicSystemState swig_types[914]
-#define SWIGTYPE_p_p_iODEFrameUpdateCallback swig_types[915]
-#define SWIGTYPE_p_p_iODEGeneralJointState swig_types[916]
-#define SWIGTYPE_p_p_iODEHinge2Joint swig_types[917]
-#define SWIGTYPE_p_p_iODEHingeJoint swig_types[918]
-#define SWIGTYPE_p_p_iODEJointState swig_types[919]
-#define SWIGTYPE_p_p_iODESliderJoint swig_types[920]
-#define SWIGTYPE_p_p_iODEUniversalJoint swig_types[921]
-#define SWIGTYPE_p_p_iObject swig_types[922]
-#define SWIGTYPE_p_p_iObjectIterator swig_types[923]
-#define SWIGTYPE_p_p_iObjectModel swig_types[924]
-#define SWIGTYPE_p_p_iObjectModelListener swig_types[925]
-#define SWIGTYPE_p_p_iObjectNameChangeListener swig_types[926]
-#define SWIGTYPE_p_p_iObjectRegistry swig_types[927]
-#define SWIGTYPE_p_p_iObjectRegistryIterator swig_types[928]
-#define SWIGTYPE_p_p_iOffscreenCanvasCallback swig_types[929]
-#define SWIGTYPE_p_p_iParameterESM swig_types[930]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorFactory swig_types[931]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorForce swig_types[932]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinColor swig_types[933]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterBase swig_types[934]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterBox swig_types[935]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterCone swig_types[936]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterCylinder swig_types[937]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterFactory swig_types[938]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterSphere swig_types[939]
-#define SWIGTYPE_p_p_iParticleEffector swig_types[940]
-#define SWIGTYPE_p_p_iParticleEmitter swig_types[941]
-#define SWIGTYPE_p_p_iParticleSystem swig_types[942]
-#define SWIGTYPE_p_p_iParticleSystemBase swig_types[943]
-#define SWIGTYPE_p_p_iParticleSystemFactory swig_types[944]
-#define SWIGTYPE_p_p_iPath swig_types[945]
-#define SWIGTYPE_p_p_iPluginIterator swig_types[946]
-#define SWIGTYPE_p_p_iPluginManager swig_types[947]
-#define SWIGTYPE_p_p_iPolygonHandle swig_types[948]
-#define SWIGTYPE_p_p_iPolygonMesh swig_types[949]
-#define SWIGTYPE_p_p_iPortal swig_types[950]
-#define SWIGTYPE_p_p_iPortalCallback swig_types[951]
-#define SWIGTYPE_p_p_iPortalContainer swig_types[952]
-#define SWIGTYPE_p_p_iRegion swig_types[953]
-#define SWIGTYPE_p_p_iRegionList swig_types[954]
-#define SWIGTYPE_p_p_iRenderBuffer swig_types[955]
-#define SWIGTYPE_p_p_iRendererLightmap swig_types[956]
-#define SWIGTYPE_p_p_iReporter swig_types[957]
-#define SWIGTYPE_p_p_iReporterIterator swig_types[958]
-#define SWIGTYPE_p_p_iReporterListener swig_types[959]
-#define SWIGTYPE_p_p_iRigidBody swig_types[960]
-#define SWIGTYPE_p_p_iSCF swig_types[961]
-#define SWIGTYPE_p_p_iSaver swig_types[962]
-#define SWIGTYPE_p_p_iSceneNode swig_types[963]
-#define SWIGTYPE_p_p_iScript swig_types[964]
-#define SWIGTYPE_p_p_iScriptObject swig_types[965]
-#define SWIGTYPE_p_p_iSector swig_types[966]
-#define SWIGTYPE_p_p_iSectorCallback swig_types[967]
-#define SWIGTYPE_p_p_iSectorIterator swig_types[968]
-#define SWIGTYPE_p_p_iSectorList swig_types[969]
-#define SWIGTYPE_p_p_iSectorMeshCallback swig_types[970]
-#define SWIGTYPE_p_p_iSequenceTimedOperation swig_types[971]
-#define SWIGTYPE_p_p_iSequenceTrigger swig_types[972]
-#define SWIGTYPE_p_p_iSequenceWrapper swig_types[973]
-#define SWIGTYPE_p_p_iShader swig_types[974]
-#define SWIGTYPE_p_p_iShaderCompiler swig_types[975]
-#define SWIGTYPE_p_p_iShaderManager swig_types[976]
-#define SWIGTYPE_p_p_iShaderPriorityList swig_types[977]
-#define SWIGTYPE_p_p_iShaderVarStack swig_types[978]
-#define SWIGTYPE_p_p_iShaderVariableAccessor swig_types[979]
-#define SWIGTYPE_p_p_iShaderVariableContext swig_types[980]
-#define SWIGTYPE_p_p_iSimpleFormerState swig_types[981]
-#define SWIGTYPE_p_p_iSndSysData swig_types[982]
-#define SWIGTYPE_p_p_iSndSysListener swig_types[983]
-#define SWIGTYPE_p_p_iSndSysLoader swig_types[984]
-#define SWIGTYPE_p_p_iSndSysManager swig_types[985]
-#define SWIGTYPE_p_p_iSndSysRenderer swig_types[986]
-#define SWIGTYPE_p_p_iSndSysRendererCallback swig_types[987]
-#define SWIGTYPE_p_p_iSndSysRendererSoftware swig_types[988]
-#define SWIGTYPE_p_p_iSndSysSoftwareDriver swig_types[989]
-#define SWIGTYPE_p_p_iSndSysSoftwareFilter3D swig_types[990]
-#define SWIGTYPE_p_p_iSndSysSoftwareOutputFilter swig_types[991]
-#define SWIGTYPE_p_p_iSndSysSource swig_types[992]
-#define SWIGTYPE_p_p_iSndSysSourceSoftware swig_types[993]
-#define SWIGTYPE_p_p_iSndSysSourceSoftware3D swig_types[994]
-#define SWIGTYPE_p_p_iSndSysStream swig_types[995]
-#define SWIGTYPE_p_p_iSndSysStreamCallback swig_types[996]
-#define SWIGTYPE_p_p_iSndSysWrapper swig_types[997]
-#define SWIGTYPE_p_p_iSprite2DFactoryState swig_types[998]
-#define SWIGTYPE_p_p_iSprite2DState swig_types[999]
-#define SWIGTYPE_p_p_iSprite2DUVAnimation swig_types[1000]
-#define SWIGTYPE_p_p_iSprite2DUVAnimationFrame swig_types[1001]
-#define SWIGTYPE_p_p_iSprite3DFactoryState swig_types[1002]
-#define SWIGTYPE_p_p_iSprite3DState swig_types[1003]
-#define SWIGTYPE_p_p_iSpriteAction swig_types[1004]
-#define SWIGTYPE_p_p_iSpriteCal3DFactoryState swig_types[1005]
-#define SWIGTYPE_p_p_iSpriteCal3DSocket swig_types[1006]
-#define SWIGTYPE_p_p_iSpriteCal3DState swig_types[1007]
-#define SWIGTYPE_p_p_iSpriteFrame swig_types[1008]
-#define SWIGTYPE_p_p_iSpriteSocket swig_types[1009]
-#define SWIGTYPE_p_p_iStandardReporterListener swig_types[1010]
-#define SWIGTYPE_p_p_iString swig_types[1011]
-#define SWIGTYPE_p_p_iStringArray swig_types[1012]
-#define SWIGTYPE_p_p_iStringSet swig_types[1013]
-#define SWIGTYPE_p_p_iSuperLightmap swig_types[1014]
-#define SWIGTYPE_p_p_iTerraFormer swig_types[1015]
-#define SWIGTYPE_p_p_iTerraSampler swig_types[1016]
-#define SWIGTYPE_p_p_iTerrainFactoryState swig_types[1017]
-#define SWIGTYPE_p_p_iTerrainObjectState swig_types[1018]
-#define SWIGTYPE_p_p_iTextureCallback swig_types[1019]
-#define SWIGTYPE_p_p_iTextureHandle swig_types[1020]
-#define SWIGTYPE_p_p_iTextureList swig_types[1021]
-#define SWIGTYPE_p_p_iTextureManager swig_types[1022]
-#define SWIGTYPE_p_p_iTextureWrapper swig_types[1023]
-#define SWIGTYPE_p_p_iThingEnvironment swig_types[1024]
-#define SWIGTYPE_p_p_iThingFactoryState swig_types[1025]
-#define SWIGTYPE_p_p_iThingState swig_types[1026]
-#define SWIGTYPE_p_p_iVFS swig_types[1027]
-#define SWIGTYPE_p_p_iView swig_types[1028]
-#define SWIGTYPE_p_p_iVirtualClock swig_types[1029]
-#define SWIGTYPE_p_p_iVisibilityCuller swig_types[1030]
-#define SWIGTYPE_p_p_iVisibilityCullerListener swig_types[1031]
-#define SWIGTYPE_p_p_iVisibilityObject swig_types[1032]
-#define SWIGTYPE_p_p_iVisibilityObjectIterator swig_types[1033]
-#define SWIGTYPE_p_p_scfImplementation1TcsPath_iPath_t swig_types[1034]
-#define SWIGTYPE_p_p_void swig_types[1035]
-#define SWIGTYPE_p_scfImplementation1TcsPath_iPath_t swig_types[1036]
-#define SWIGTYPE_p_size_t swig_types[1037]
-#define SWIGTYPE_p_uint16_t swig_types[1038]
-#define SWIGTYPE_p_uint32_t swig_types[1039]
-#define SWIGTYPE_p_uint64_t swig_types[1040]
-#define SWIGTYPE_p_uint8_t swig_types[1041]
-#define SWIGTYPE_p_uint_least64_t swig_types[1042]
-#define SWIGTYPE_p_unsigned_char swig_types[1043]
-#define SWIGTYPE_p_unsigned_int swig_types[1044]
-#define SWIGTYPE_p_unsigned_long swig_types[1045]
-#define SWIGTYPE_p_utf32_char swig_types[1046]
-#define SWIGTYPE_p_void swig_types[1047]
-#define SWIGTYPE_p_wchar_t swig_types[1048]
-static swig_type_info *swig_types[1050];
-static swig_module_info swig_module = {swig_types, 1049, 0, 0, 0, 0};
+#define SWIGTYPE_p_csPtrTiPluginIterator_t swig_types[129]
+#define SWIGTYPE_p_csPtrTiPolygonHandle_t swig_types[130]
+#define SWIGTYPE_p_csPtrTiRendererLightmap_t swig_types[131]
+#define SWIGTYPE_p_csPtrTiRigidBody_t swig_types[132]
+#define SWIGTYPE_p_csPtrTiSectorIterator_t swig_types[133]
+#define SWIGTYPE_p_csPtrTiSequenceTrigger_t swig_types[134]
+#define SWIGTYPE_p_csPtrTiSequenceWrapper_t swig_types[135]
+#define SWIGTYPE_p_csPtrTiShaderPriorityList_t swig_types[136]
+#define SWIGTYPE_p_csPtrTiShader_t swig_types[137]
+#define SWIGTYPE_p_csPtrTiShadowBlockList_t swig_types[138]
+#define SWIGTYPE_p_csPtrTiSuperLightmap_t swig_types[139]
+#define SWIGTYPE_p_csPtrTiVisibilityObjectIterator_t swig_types[140]
+#define SWIGTYPE_p_csQuaternion swig_types[141]
+#define SWIGTYPE_p_csRGBcolor swig_types[142]
+#define SWIGTYPE_p_csRGBpixel swig_types[143]
+#define SWIGTYPE_p_csRandomGen swig_types[144]
+#define SWIGTYPE_p_csRect swig_types[145]
+#define SWIGTYPE_p_csRectRegion swig_types[146]
+#define SWIGTYPE_p_csRefArrayTcsShaderVariable_t swig_types[147]
+#define SWIGTYPE_p_csRefArrayTiAwsKey_t swig_types[148]
+#define SWIGTYPE_p_csRefArrayTiObject_t swig_types[149]
+#define SWIGTYPE_p_csRefArrayTiSceneNode_t swig_types[150]
+#define SWIGTYPE_p_csRefArrayTiShader_t swig_types[151]
+#define SWIGTYPE_p_csRefCount swig_types[152]
+#define SWIGTYPE_p_csRefTiBase_t swig_types[153]
+#define SWIGTYPE_p_csRefTiDocumentAttributeIterator_t swig_types[154]
+#define SWIGTYPE_p_csRefTiDocumentAttribute_t swig_types[155]
+#define SWIGTYPE_p_csRefTiDocumentNodeIterator_t swig_types[156]
+#define SWIGTYPE_p_csRefTiDocumentNode_t swig_types[157]
+#define SWIGTYPE_p_csRefTiDynamicsSystemCollider_t swig_types[158]
+#define SWIGTYPE_p_csRefTiEventAttributeIterator_t swig_types[159]
+#define SWIGTYPE_p_csRefTiEventHandlerRegistry_t swig_types[160]
+#define SWIGTYPE_p_csRefTiEventHandler_t swig_types[161]
+#define SWIGTYPE_p_csRefTiEventNameRegistry_t swig_types[162]
+#define SWIGTYPE_p_csRefTiEvent_t swig_types[163]
+#define SWIGTYPE_p_csRefTiGeneralFactoryState_t swig_types[164]
+#define SWIGTYPE_p_csRefTiImage_t swig_types[165]
+#define SWIGTYPE_p_csRefTiRenderBuffer_t swig_types[166]
+#define SWIGTYPE_p_csRefTiRigidBody_t swig_types[167]
+#define SWIGTYPE_p_csRefTiScriptObject_t swig_types[168]
+#define SWIGTYPE_p_csRefTiString_t swig_types[169]
+#define SWIGTYPE_p_csRenderBufferHolder swig_types[170]
+#define SWIGTYPE_p_csRenderBufferName swig_types[171]
+#define SWIGTYPE_p_csRenderMesh swig_types[172]
+#define SWIGTYPE_p_csRenderMeshList swig_types[173]
+#define SWIGTYPE_p_csRenderMeshModes swig_types[174]
+#define SWIGTYPE_p_csReporterHelper swig_types[175]
+#define SWIGTYPE_p_csReversibleTransform swig_types[176]
+#define SWIGTYPE_p_csScreenBoxResult swig_types[177]
+#define SWIGTYPE_p_csSectorHitBeamResult swig_types[178]
+#define SWIGTYPE_p_csSegment2 swig_types[179]
+#define SWIGTYPE_p_csSegment3 swig_types[180]
+#define SWIGTYPE_p_csSetTcsPtrKeyTiMeshWrapper_t_CS__Memory__AllocatorMalloc_t swig_types[181]
+#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[182]
+#define SWIGTYPE_p_csShaderMetadata swig_types[183]
+#define SWIGTYPE_p_csShaderTagPresence swig_types[184]
+#define SWIGTYPE_p_csShaderVariable swig_types[185]
+#define SWIGTYPE_p_csSimplePixmap swig_types[186]
+#define SWIGTYPE_p_csSimpleRenderMesh swig_types[187]
+#define SWIGTYPE_p_csSndSysRendererSoftware swig_types[188]
+#define SWIGTYPE_p_csSndSysSoundFormat swig_types[189]
+#define SWIGTYPE_p_csSourceParameters3D swig_types[190]
+#define SWIGTYPE_p_csSphere swig_types[191]
+#define SWIGTYPE_p_csSpline swig_types[192]
+#define SWIGTYPE_p_csSprite2DVertex swig_types[193]
+#define SWIGTYPE_p_csSpriteCal3DActiveAnim swig_types[194]
+#define SWIGTYPE_p_csSquaredDist swig_types[195]
+#define SWIGTYPE_p_csStrKey swig_types[196]
+#define SWIGTYPE_p_csString swig_types[197]
+#define SWIGTYPE_p_csStringArray swig_types[198]
+#define SWIGTYPE_p_csStringBase swig_types[199]
+#define SWIGTYPE_p_csStringFastT36_t swig_types[200]
+#define SWIGTYPE_p_csStringSet swig_types[201]
+#define SWIGTYPE_p_csTinyDocumentSystem swig_types[202]
+#define SWIGTYPE_p_csTraceBeamResult swig_types[203]
+#define SWIGTYPE_p_csTransform swig_types[204]
+#define SWIGTYPE_p_csTriangle swig_types[205]
+#define SWIGTYPE_p_csVector2 swig_types[206]
+#define SWIGTYPE_p_csVector3 swig_types[207]
+#define SWIGTYPE_p_csVector3Array swig_types[208]
+#define SWIGTYPE_p_csVector4 swig_types[209]
+#define SWIGTYPE_p_csVertexAttrib swig_types[210]
+#define SWIGTYPE_p_csVertexStatus swig_types[211]
+#define SWIGTYPE_p_csView swig_types[212]
+#define SWIGTYPE_p_csWrapPtr swig_types[213]
+#define SWIGTYPE_p_csXRotMatrix3 swig_types[214]
+#define SWIGTYPE_p_csXScaleMatrix3 swig_types[215]
+#define SWIGTYPE_p_csYRotMatrix3 swig_types[216]
+#define SWIGTYPE_p_csYScaleMatrix3 swig_types[217]
+#define SWIGTYPE_p_csZRotMatrix3 swig_types[218]
+#define SWIGTYPE_p_csZScaleMatrix3 swig_types[219]
+#define SWIGTYPE_p_double swig_types[220]
+#define SWIGTYPE_p_f_p_iBase__p__csPyEventHandler swig_types[221]
+#define SWIGTYPE_p_f_p_iBase__p_csPath swig_types[222]
+#define SWIGTYPE_p_f_p_iBase__p_iAnimTimeUpdateHandler swig_types[223]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsShaderVariable_p_t swig_types[224]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeAllTcsSprite2DVertex_t swig_types[225]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[226]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[227]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[228]
+#define SWIGTYPE_p_f_p_iBase__p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[229]
+#define SWIGTYPE_p_f_p_iBase__p_iAws swig_types[230]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsComponent swig_types[231]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentFactory swig_types[232]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsComponentNode swig_types[233]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionKey swig_types[234]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsConnectionNodeFactory swig_types[235]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsFloatKey swig_types[236]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsIntKey swig_types[237]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsKey swig_types[238]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyContainer swig_types[239]
+#define SWIGTYPE_p_f_p_iBase__p_iAwsKeyFactory swi...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X