csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62 model.xml,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data/XML/vehicles/tanks/t62

Added Files:
	model.xml 
Log Message:
cspsim initial

--- NEW FILE: model.xml ---
<?xml version="1.0" standalone="no"?>

<Object class="ObjectModel" static="1">
	<External name="model_path">Models/t62.osg</External>
	<Vector name="axis_0">1 0 0</Vector>
	<Vector name="axis_1">0 1 0</Vector>
	<Matrix name="rotation">1 0 0 0 1 0 0 0 1</Matrix>
	<Real name="scale">0.01</Real>
</Object>

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k fm.xml,NONE,1.1 fm.xml.gz.bak,NONE,1.1 model.xml,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data/XML/vehicles/aircraft/m2k

Added Files:
	fm.xml fm.xml.gz.bak model.xml 
Log Message:
cspsim initial

--- NEW FILE: fm.xml ---
<?xml version="1.0" standalone="no"?>

<!-- 

	Mirage 2000 aerodynamics model

	many parameters are estimates. 
	
-->

<Object class="AeroDynamics">

	<!-- Wing geometry -->
	<Real name="wing_span">9.13</Real>
	<Real name="wing_chord">4.5</Real>
	<Real name="wing_area">41.0</Real>

	<!-- Control surfaces min/max angles -->
	<Real name="de_max">25.0</Real>
	<Real name="de_min">-16.0</Real>
	<Real name="da_max">+17.5</Real>
	<Real name="da_min">-17.5</Real>
	<Real name="dr_max">+20.0</Real>
	<Real name="dr_min">-20.0</Real>

	<!-- A=0.9 10^4 kg m^2       A -F -E -->
	<!-- C=6.0 10^4 kg m^2  I = -F  B -D -->
	<!-- B=5.4 10^4 Kg m^2      -E -D  C -->
	<!-- E=1.8 10^3 kg m^2 -->

	<!-- Mass/Inertial properties -->
	<!-- max mass -->
	<!-- <Real name="Mass">17500.0</Real> -->
	<!-- interceptor mass with a central tank
	<Real name="mass">12000.0</Real> -->
	<!-- interceptor mass -->
	<!-- <Real name="Mass">7500.0</Real> -->

	<!--
	<Matrix name="inertia">
		20354.0        0.0    6785.0
		    0.0   135691.0       0.0
	         6785.0        0.0  135691.0
	</Matrix> -->

	<Real name="g_min">-3.0</Real>
	<Real name="g_max">9.0</Real>

	<!--
	<Real name="thrust_max">9700.0</Real> -->

	<!-- Drag Parameters cx0 = 2 *">0.074 / ( rc^0.2 ) ; Cx=Cx0+KiCz^2 Ki(trainee induite) 1/pi*AR -->
	<Real name="cd0">0.02</Real>
	<Real name="cd_a">0.3</Real>
	<Real name="cd_de">0.02</Real>

	<!-- Lift Parameters -->
	<Real name="stall_aoa">31.0</Real>
	<Real name="cl0">0.14</Real>
	<Real name="cl_a">4.2</Real>
	<Real name="cl_adot">1.29</Real>
	<Real name="cl_q">1.5</Real>
	<Real name="cl_de">0.4</Real>

	<!-- Pitch Moment Parameters -->
	<Real name="cm0">-0.02</Real>
	<Real name="cm_a">-0.02</Real>
	<Real name="cm_adot">-1.73</Real>
	<Real name="cm_q">-3.6</Real>
	<Real name="cm_de">0.3</Real>

	<!-- Side Force Parameters -->
	<Real name="cy_beta">-0.29</Real>
	<Real name="cy_p">0.11</Real>
	<Real name="cy_r">0.0</Real>
	<Real name="cy_da">0.0</Real>
	<Real name="cy_dr">-0.01</Real>

	<!-- Roll moment parameters -->
	<Real name="ci_beta">-0.1</Real>
	<Real name="ci_p">-0.3</Real>
	<Real name="ci_r">0.3</Real>
	<Real name="ci_da">0.2</Real>
	<Real name="ci_dr">-0.03</Real>

	<!-- Yaw Moment Parameters -->
	<Real name="cn_beta">0.3</Real>
	<Real name="cn_p">0.03</Real>
	<Real name="cn_r">-0.04</Real>
	<Real name="cn_da">0.03</Real>
	<Real name="cn_dr">0.08</Real>

</Object>


--- NEW FILE: fm.xml.gz.bak ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: model.xml ---
<?xml version="1.0" standalone="no"?>

<Object class="ObjectModel" static="1">
	<External name="model_path">Models/m2k2g.3ds</External>
	<Vector name="axis_0">1 0 0</Vector>
	<Vector name="axis_1">0 1 0</Vector>
	<Matrix name="rotation">1 0 0 0 1 0 0 0 1</Matrix>
	<Real name="scale">1.0</Real>
</Object>

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/tanks t62.xml,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data/XML/vehicles/tanks

Added Files:
	t62.xml 
Log Message:
cspsim initial

--- NEW FILE: t62.xml ---
<?xml version="1.0" standalone="no"?>

<Object class="TankObject">
	<Int name="army">5</Int>
	<Path name="model">t62.model</Path>
	<Real name="mass">41500</Real>
	<Matrix name="inertia">
		172000.0       0.0       0.0
		     0.0   63080.0       0.0
		     0.0       0.0  195000.0
	</Matrix>
</Object>

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft m2k.xml,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data/XML/vehicles/aircraft

Added Files:
	m2k.xml 
Log Message:
cspsim initial

--- NEW FILE: m2k.xml ---
<?xml version="1.0" standalone="no"?>

<!-- 

	Mirage 2000

-->

<Object class="AircraftObject">

	<Path name="model">m2k.model</Path>
	<Path name="flight_model">m2k.fm</Path>
	<Bool name="complex_physics">true</Bool>

	<Real name="aileron_min">-25.0</Real>
	<Real name="aileron_max">25.0</Real>
	<Real name="elevator_min">-25.0</Real>
	<Real name="elevator_max">25.0</Real>
	<Real name="rudder_min">-25.0</Real>
	<Real name="rudder_max">25.0</Real>

	<Int name="army">0</Int>
	
	<!-- Mass/Inertial properties -->
	<Real name="mass">7500.0</Real>
	<Matrix name="inertia">
	       135691.0        0.0       0.0
		    0.0    20354.0    6785.0
	            0.0     6785.0  135691.0
	</Matrix>

</Object>

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/terrain balkan.xml,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/terrain
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data/XML/terrain

Added Files:
	balkan.xml 
Log Message:
cspsim initial

--- NEW FILE: balkan.xml ---
<?xml version="1.0" standalone="no"?>

<Object class="TerrainObject">
	<Int name="use_dynamic_textures">0</Int>
	<Int name="use_texture_compression">1</Int>
	<Int name="preload_textures">1</Int>
	<Int name="use_texture_factory">0</Int>
	<Int name="max_triangles">60000</Int>
	<Int name="lattice">1</Int>
	<Int name="lattice_width">16</Int>
	<Int name="lattice_height">16</Int>
	<External name="detail_texture_file">Stone4.bmp</External>
	<String name="lattice_basename">balkanMap</String>
	<String name="lattice_elevation_extension">bmp</String>
	<String name="lattice_texture_extension">bmp</String>
	<External name="texture_file"></External>
	<External name="elevation_file"></External>
	<Real name="vertex_spacing">250</Real>
	<Real name="vertex_height">0.38</Real>
	<Real name="detail_threshold">8</Real>
</Object>

[Csp-commits] APPLICATIONS/CSPSim Makefile.am,NONE,1.1.2.1 README.linux,NONE,1.1.2.1 acinclude.m4,NONE,1.1.2.1 aclocal.m4,NONE,1.1.2.1 config.h.in,NONE,1.1.2.1 configure.in,NONE,1.1.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv13807

Added Files:
      Tag: simdata
	Makefile.am README.linux acinclude.m4 aclocal.m4 config.h.in 
	configure.in 
Log Message:
cspsim initial

--- NEW FILE: Makefile.am ---
# WARNING:
#   I have almost no prior experience with GNU autoconf/automake and this
#   is very much a work in progress.  The original Makefile for Linux can
#   be found in Source/Makefile.orig.  If you have trouble with building
#   CSPFlightSim with this configure script or autmake files, and know
#   how to fix them, please do so and commit the changes to CVS.  Thanks!
#
#   -OS

# Edit these lines to match your system configuration
export OSG_PREFIX=/usr/local
export DEMETER_PREFIX=@abs_srcdir@/../../THIRDPARTYLIBS/demeter
export SIMDATA_PREFIX=@abs_srcdir@/../SimData

AUTOMAKE_OPTIONS = foreign
XTRA_DIST = 
SUBDIRS = Source


--- NEW FILE: README.linux ---
CSPSim, Linux README
January-2003
=======================================================================

To bulid on Linux, you currently need (at least) the following:

	gcc 2.95 or newer
	autoconf / automake

and
 
	SimData (latest version from CSP cvs)

and these (or newer) third partly libraries:

	OSG 0.9.2 (including GLUT, Text, Util, and Particle)
	SDL 1.2.5
	SDL_Console
	SDL_Image
	GDAL 1.1.7


Each of these libraries may have additional external dependencies.
See their associated documentation for details.

=======================================================================

To actually run CSPSim, you'll also need terrain and data files.  These 
can be found at 

	http://sourceforge.net/projects/csp

The exact installation path of the data files is still in some flux.  
This file will be updated as soon as the paths (and procedures) are 
standardized.

=======================================================================

To build, do the following:

$ aclocal; autoconf; automake --add-missing
$ ./configure
$ make
$ ln -s Source/CSPFlightSim .

The build system is undergoing considerable changes right
now (automake/autoconf support is brand-new), so expect some
problems.  If you overcome any problems related to the build
scripts, please post the changes to the CSP developers forum
or just commit the revisions to CVS.  Thanks!

=======================================================================

If you need help, check the CSP wiki or post a message to the
develepers forum:

	http://csp.sourceforge.net/wiki/CurrentBuildDependencies
	http://csp.sourceforge.net/forum


Good luck!


--- NEW FILE: acinclude.m4 ---
dnl WARNING:
dnl   I have almost no prior experience with GNU autoconf/automake and this
dnl   is very much a work in progress.  The original Makefile for Linux can
dnl   be found in Source/Makefile.orig.  If you have trouble with building
dnl   CSPFlightSim with this configure script or autmake files, and know
dnl   how to fix them, please do so and commit the changes to CVS.  Thanks!
dnl
dnl   -OS


m4_pushdef([UP], m4_translit([$1], [a-z], [A-Z]))dnl
m4_pushdef([DOWN], m4_translit([$1], [A-Z], [a-z]))dnl
m4_pushdef([LDOWN], ac_path_lib_[]DOWN)dnl
m4_pushdef([CACHE], ac_cv_path_lib_[]DOWN)dnl
m4_pushdef([ERRORLOG], error.[]DOWN[]test)dnl

AC_DEFUN(CSP_SDL_ERROR, [
  AC_MSG_ERROR([
  Simple DirectMedia Layer version >= $lib_min_version must be installed.
  SDL can be downloaded from http://www.libsdl.org/  If you already have
  a sufficiently new version of SDL installed, this error probably means
  that the wrong copy of the sdl-config shell script is being found.
  ])
])

AC_DEFUN(CSP_LIB_ERROR, [
  AC_MSG_ERROR([
  $1 version >= $2 must be installed.
  This library can be downloaded from $3.  
  If you already have a sufficiently new version of this library installed, 
  this error probably means that the wrong copy of the $4 shell 
  script is being found.
  ])
])
      

dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
  lib_min_version=$3
  lib=yes
  AC_PATH_PROG($1[]_CONFIG, $2-config, no)
  AC_MSG_CHECKING(for $1 >= $lib_min_version)
  no_lib=""
  if test "$$1[]_CONFIG" = "no"; then
    no_lib=yes
  else
    lib_version=`$$1[]_CONFIG --version` 
    lib_major=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
    lib_minor=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    lib_micro=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    lib_major_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
    lib_minor_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    lib_micro_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    lib_version_proper=`expr \
      $lib_major \> $lib_major_min \| \
      $lib_major \= $lib_major_min \& \
      $lib_minor \> $lib_minor_min \| \
      $lib_major \= $lib_major_min \& \
      $lib_minor \= $lib_minor_min \& \
      $lib_micro \>= $lib_micro_min `
    if test "$lib_version_proper" = "1" ; then
      AC_MSG_RESULT(yes)
      $1[]_FLAGS=`$$1[]_CONFIG --cflags`
      $1[]_LIBS=`$$1[]_CONFIG --libs`
    else
      AC_MSG_RESULT(no)
      no_lib=yes
    fi
   fi
   if test "$no_lib" = "yes"; then
	CSP_LIB_ERROR($4,$3,$5,$1[]_CONFIG)
   fi
   AC_SUBST($1[]_FLAGS)
   AC_SUBST($1[]_LIBS)
   LIBS="$$1[]_LIBS $LIBS"
])


AC_DEFUN(CSP_OSG_CONFIG, [
  AC_MSG_CHECKING(for $1 >= $2)
  LIBS="-l$1  $LIBS"
  AC_TRY_RUN([
/* Override any gcc2 internal prototype to avoid an error.  */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
   builtin and then its argument prototype would still apply.  */
const char *$1GetVersion ();
int main() {
	const char *v = $1GetVersion();
	const char *need = "$2";
	int major, minor, micro;
	int need_major, need_minor, need_micro;
	int n;
	n = sscanf(need, "%d.%d.%d", &need_major, &need_minor, &need_micro);
	if (n<3) exit(1);
	n = sscanf(v, "%d.%d.%d", &major, &minor, &micro);
	if (n<3) exit(1);
	if (major < need_major) exit(1);
	if (major > need_major) exit(0);
	if (minor < need_minor) exit(1);
	if (minor > need_minor) exit(0);
	if (micro < need_micro) exit(1);
	exit(0);
	return 0;
}
    ], 
    [AC_MSG_RESULT(yes)], 
    [AC_MSG_RESULT(no)
     AC_MSG_ERROR([
	$3 version >= $1 needs to be installed.  OSG can be
	downloaded from http://www.openscenegraph.org/
	])
    ], 
    [])
])


--- NEW FILE: aclocal.m4 ---
dnl aclocal.m4 generated automatically by aclocal 1.4

dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.

dnl WARNING:
dnl   I have almost no prior experience with GNU autoconf/automake and this
dnl   is very much a work in progress.  The original Makefile for Linux can
dnl   be found in Source/Makefile.orig.  If you have trouble with building
dnl   CSPFlightSim with this configure script or autmake files, and know
dnl   how to fix them, please do so and commit the changes to CVS.  Thanks!
dnl
dnl   -OS


m4_pushdef([UP], m4_translit([$1], [a-z], [A-Z]))dnl
m4_pushdef([DOWN], m4_translit([$1], [A-Z], [a-z]))dnl
m4_pushdef([LDOWN], ac_path_lib_[]DOWN)dnl
m4_pushdef([CACHE], ac_cv_path_lib_[]DOWN)dnl
m4_pushdef([ERRORLOG], error.[]DOWN[]test)dnl

AC_DEFUN(CSP_SDL_ERROR, [
  AC_MSG_ERROR([
  Simple DirectMedia Layer version >= $lib_min_version must be installed.
  SDL can be downloaded from http://www.libsdl.org/  If you already have
  a sufficiently new version of SDL installed, this error probably means
  that the wrong copy of the sdl-config shell script is being found.
  ])
])

AC_DEFUN(CSP_LIB_ERROR, [
  AC_MSG_ERROR([
  $1 version >= $2 must be installed.
  This library can be downloaded from $3.  
  If you already have a sufficiently new version of this library installed, 
  this error probably means that the wrong copy of the $4 shell 
  script is being found.
  ])
])
      

dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
  lib_min_version=$3
  lib=yes
  AC_PATH_PROG($1[]_CONFIG, $2-config, no)
  AC_MSG_CHECKING(for $1 >= $lib_min_version)
  no_lib=""
  if test "$$1[]_CONFIG" = "no"; then
    no_lib=yes
  else
    lib_version=`$$1[]_CONFIG --version` 
    lib_major=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
    lib_minor=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    lib_micro=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    lib_major_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
    lib_minor_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    lib_micro_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    lib_version_proper=`expr \
      $lib_major \> $lib_major_min \| \
      $lib_major \= $lib_major_min \& \
      $lib_minor \> $lib_minor_min \| \
      $lib_major \= $lib_major_min \& \
      $lib_minor \= $lib_minor_min \& \
      $lib_micro \>= $lib_micro_min `
    if test "$lib_version_proper" = "1" ; then
      AC_MSG_RESULT(yes)
      $1[]_FLAGS=`$$1[]_CONFIG --cflags`
      $1[]_LIBS=`$$1[]_CONFIG --libs`
    else
      AC_MSG_RESULT(no)
      no_lib=yes
    fi
   fi
   if test "$no_lib" = "yes"; then
	CSP_LIB_ERROR($4,$3,$5,$1[]_CONFIG)
   fi
   AC_SUBST($1[]_FLAGS)
   AC_SUBST($1[]_LIBS)
   LIBS="$$1[]_LIBS $LIBS"
])


AC_DEFUN(CSP_OSG_CONFIG, [
  AC_MSG_CHECKING(for $1 >= $2)
  LIBS="-l$1  $LIBS"
  AC_TRY_RUN([
/* Override any gcc2 internal prototype to avoid an error.  */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
   builtin and then its argument prototype would still apply.  */
const char *$1GetVersion ();
int main() {
	const char *v = $1GetVersion();
	const char *need = "$2";
	int major, minor, micro;
	int need_major, need_minor, need_micro;
	int n;
	n = sscanf(need, "%d.%d.%d", &need_major, &need_minor, &need_micro);
	if (n<3) exit(1);
	n = sscanf(v, "%d.%d.%d", &major, &minor, &micro);
	if (n<3) exit(1);
	if (major < need_major) exit(1);
	if (major > need_major) exit(0);
	if (minor < need_minor) exit(1);
	if (minor > need_minor) exit(0);
	if (micro < need_micro) exit(1);
	exit(0);
	return 0;
}
    ], 
    [AC_MSG_RESULT(yes)], 
    [AC_MSG_RESULT(no)
     AC_MSG_ERROR([
	$3 version >= $1 needs to be installed.  OSG can be
	downloaded from http://www.openscenegraph.org/
	])
    ], 
    [])
])


# Do all the work for Automake.  This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.

# serial 1

dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define])

AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
AC_SUBST(VERSION)
dnl test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
ifelse([$3],,
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
AC_REQUIRE([AM_SANITY_CHECK])
AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])])

#
# Check to make sure that the build environment is sane.
#

AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments.  Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
   if test "[$]*" = "X"; then
      # -L didn't work.
      set X `ls -t $srcdir/configure conftestfile`
   fi
   if test "[$]*" != "X $srcdir/configure conftestfile" \
      && test "[$]*" != "X conftestfile $srcdir/configure"; then

      # If neither matched, then we have a broken ls.  This can happen
      # if, for instance, CONFIG_SHELL is bash and it inherits a
      # broken ls alias from the environment.  This has actually
      # happened.  Such a system could not be considered "sane".
      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
alias in your environment])
   fi

   test "[$]2" = conftestfile
   )
then
   # Ok.
   :
else
   AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
rm -f conftest*
AC_MSG_RESULT(yes)])

dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf.  Sigh.
if ($2 --version) < /dev/null > /dev/null 2>&1; then
   $1=$2
   AC_MSG_RESULT(found)
else
   $1="$3/missing $2"
   AC_MSG_RESULT(missing)
fi
AC_SUBST($1)])

# Like AC_CONFIG_HEADER, but automatically create stamp file.

AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.
dnl This file resides in the same directory as the config header
dnl that is generated.  We must strip everything past the first ":",
dnl and everything past the last "/".
AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
<<am_indx=1
for am_file in <<$1>>; do
  case " <<$>>CONFIG_HEADERS " in
  *" <<$>>am_file "*<<)>>
    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
    ;;
  esac
  am_indx=`expr "<<$>>am_indx" + 1`
done<<>>dnl>>)
changequote([,]))])


--- NEW FILE: config.h.in ---
/* config.h.in.  Generated from configure.in by autoheader.  */

/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
   systems. This function is required for `alloca.c' support on those systems.
   */
#undef CRAY_STACKSEG_END

/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA

/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA

/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
   */
#undef HAVE_ALLOCA_H

/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `SDL_console' library (-lSDL_console). */
#undef HAVE_LIBSDL_CONSOLE

/* Define to 1 if you have the `SDL_image' library (-lSDL_image). */
#undef HAVE_LIBSDL_IMAGE

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H

/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE

/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
   `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
#undef HAVE_ST_BLKSIZE

/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H

/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Name of package */
#undef PACKAGE

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* If using the C implementation of alloca, define if you know the
   direction of stack growth for your system; otherwise it will be
   automatically deduced at run-time.
        STACK_DIRECTION > 0 => grows toward higher addresses
        STACK_DIRECTION < 0 => grows toward lower addresses
        STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Version number of package */
#undef VERSION

--- NEW FILE: configure.in ---
dnl WARNING:
dnl   I have almost no prior experience with GNU autoconf/automake and this
dnl   is very much a work in progress.  The original Makefile for Linux can
dnl   be found in Source/Makefile.orig.  If you have trouble with building
dnl   CSPFlightSim with this configure script or autmake files, and know
dnl   how to fix them, please do so and commit the changes to CVS.  Thanks!
dnl
dnl   -OS

dnl Process this file with autoconf to produce a configure script.
AC_INIT(Source/CSPSim.cpp)
AM_INIT_AUTOMAKE(CSPSim, 0.1.0)
AM_CONFIG_HEADER(config.h)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB

dnl Checks for libraries.

dnl Checks for header files.
AC_STDC_HEADERS
AC_HAVE_HEADERS(string.h fcntl.h sys/file.h sys/param.h)

dnl Checks for library functions.
AC_FUNC_ALLOCA

dnl Check for st_blksize in struct stat
AC_ST_BLKSIZE

dnl check for Simple Direct Media Library
CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [Simple Direct Media Library], [http://www.libsdl.org/])

dnl check for SDL Image Library
AC_CHECK_LIB(SDL_image, IMG_Load, [], [AC_MSG_ERROR([
SDL_image does not appear to be installed.  You can download
this library from http://www.libsdl.org/projects/SDL_image
If SDL_image is already installed, please specify a library 
path when running configure: --sdl_image_path=xxx])], [])

dnl check for SDL Console Library
AC_CHECK_LIB(SDL_console, CON_DrawConsole, [], [AC_MSG_ERROR([
SDL_console does not appear to be installed.  You can download
this library from http://sdlconsole.tuxfamily.org
If SDL_console is already installed, please specify a library 
path when running configure: --sdl_image_path=xxx])], [])

dnl check for Geospatial Data Abstraction Library 
CSP_LIB_CONFIG([GDAL], [gdal], [1.1.7], [Geospatial Data Abstraction Library], [http://remotesensing.org/gdal/])

dnl check for OpenSceneGraph
CSP_OSG_CONFIG(osg, 0.9.2, [OpenSceneGraph])
CSP_OSG_CONFIG(osgGLUT, 0.9.2, [OpenSceneGraph GLUT library])
CSP_OSG_CONFIG(osgUtil, 0.9.2, [OpenSceneGraph Util library])
CSP_OSG_CONFIG(osgText, 0.9.2, [OpenSceneGraph Util library])
CSP_OSG_CONFIG(osgParticle, 0.9.2, [OpenSceneGraph Particle library])

#AC_CHECK_LIB(osgGLUT, osgGLUTGetVersion, ,
#     [AC_MSG_ERROR(OpenSceneGraph GLUT library not found. See http://www.openscenegraph.org)],)
#AC_CHECK_LIB(osgUtil, osgUtilGetVersion, ,
#     [AC_MSG_ERROR(OpenSceneGraph Util library not found. See http://www.openscenegraph.org)],)
#AC_CHECK_LIB(osgText, osgTextGetVersion, ,
#     [AC_MSG_ERROR(OpenSceneGraph Text library not found. See http://www.openscenegraph.org)],)
#AC_CHECK_LIB(osgParticle, osgParticleGetVersion, ,
#     [AC_MSG_ERROR(OpenSceneGraph Particle library not found. See http://www.openscenegraph.org)],)


AC_OUTPUT([Makefile Source/Makefile], [])
	      

[Csp-commits] APPLICATIONS/CSPSim/Data CSPSim.ini,NONE,1.1.2.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv13807/Data

Added Files:
      Tag: simdata
	CSPSim.ini 
Log Message:
cspsim initial

--- NEW FILE: CSPSim.ini ---
; CSP configuration settings

[Debug]
LoggingLevel = 3

[Screen]
Height = 1024
Width = 1280
FullScreen = 0

[Paths]
ModelPath = ../Data
InputMapPath = ../Tools/HID

[View]
Wireframe = false
ViewDistance = 35000
Fog = true
FogStart = 20000
FogEnd = 35000

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62 - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62
In directory sc8-pr-cvs1:/tmp/cvs-serv13249/XML/vehicles/tanks/t62

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks/t62 added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv13040/XML/vehicles/aircraft/m2k

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/tanks - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks
In directory sc8-pr-cvs1:/tmp/cvs-serv12874/XML/vehicles/tanks

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/tanks added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft
In directory sc8-pr-cvs1:/tmp/cvs-serv12874/XML/vehicles/aircraft

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles
In directory sc8-pr-cvs1:/tmp/cvs-serv12634/XML/vehicles

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/terrain - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/terrain
In directory sc8-pr-cvs1:/tmp/cvs-serv12634/XML/terrain

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/terrain added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Data/XML - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML
In directory sc8-pr-cvs1:/tmp/cvs-serv10427/Data/XML

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Tools/HID - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID
In directory sc8-pr-cvs1:/tmp/cvs-serv9932/Tools/HID

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/HID added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Tools - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools
In directory sc8-pr-cvs1:/tmp/cvs-serv9726/Tools

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Source - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv9726/Source

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Source added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Include - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv9726/Include

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Include added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Data - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv9726/Data

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Data added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim - New directory

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv8770/CSPSim

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/SimData/Include/SimData HashUtility.h,1.1.2.7,1.1.2.8 InterfaceRegistry.h,1.1.2.3,1.1.2.4 ns-simdata.h,1.1.2.1,1.1.2.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv753/Include/SimData

Modified Files:
      Tag: simdata
	HashUtility.h InterfaceRegistry.h ns-simdata.h 
Log Message:
fix for hasht_hash


Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/HashUtility.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** HashUtility.h	23 Jan 2003 18:52:12 -0000	1.1.2.7
--- HashUtility.h	23 Jan 2003 19:46:55 -0000	1.1.2.8
***************
*** 60,63 ****
--- 60,69 ----
  NAMESPACE_SIMDATA
  
+ struct HashT;
+ 
+ extern u4 newhash4_cstring(const char*);
+ extern HashT newhasht_cstring(const char*);
+ //extern u8 newhash8_cstring(const char*);
+ 
  //typedef  u8       hasht;
  struct HashT {
***************
*** 75,78 ****
--- 81,87 ----
  		a = x.a; b = x.b;
  	}
+ 	HashT(std::string const &x) {
+ 		*this = newhasht_cstring(x.c_str());
+ 	}
  	bool operator ==(guint32 x) const {
  		return (b == 0 && a == x);
***************
*** 87,95 ****
  		return (b != x.b || a != x.a);
  	}
! 	void operator =(guint32 x) {
  		a = x; b = 0;
  	}
! 	void operator =(HashT const &x) {
  		a = x.a; b = x.b;
  	}
  	std::string str() const;
--- 96,110 ----
  		return (b != x.b || a != x.a);
  	}
! 	HashT & operator =(std::string &x) {
! 		*this = newhasht_cstring(x.c_str());
! 		return *this;
! 	}
! 	HashT & operator =(guint32 x) {
  		a = x; b = 0;
+ 		return *this;
  	}
! 	HashT & operator =(HashT const &x) {
  		a = x.a; b = x.b;
+ 		return *this;
  	}
  	std::string str() const;
***************
*** 99,107 ****
  
  
- extern u4 newhash4_cstring(const char*);
- extern hasht newhasht_cstring(const char*);
- //extern u8 newhash8_cstring(const char*);
- 
- 
  struct eqstr {
  	bool operator()(const char* s1, const char* s2) const {
--- 114,117 ----
***************
*** 130,135 ****
  
  struct hasht_hash {
! 	bool operator()(hasht i1) const {
! 		return (i1.a != 0);
  	}
  };
--- 140,145 ----
  
  struct hasht_hash {
! 	guint32 operator()(hasht i1) const {
! 		return i1.a;
  	}
  };
***************
*** 149,157 ****
  */
  
- typedef HASH_MAP<hasht, int, hasht_hash, hasht_eq> hasht_map;
  
  class Object;
  class ObjectProxyBase;
  
  typedef HASH_MAP<hasht, Object*, hasht_hash, hasht_eq> cache_map;
  typedef HASH_MAP<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;
--- 159,172 ----
  */
  
  
  class Object;
  class ObjectProxyBase;
  
+ template <class T>
+ struct HASHT_MAP {
+ 	typedef HASH_MAP<hasht, T, hasht_hash, hasht_eq> Type;
+ };
+ 
+ typedef HASH_MAP<hasht, int, hasht_hash, hasht_eq> hasht_map;
  typedef HASH_MAP<hasht, Object*, hasht_hash, hasht_eq> cache_map;
  typedef HASH_MAP<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/InterfaceRegistry.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** InterfaceRegistry.h	23 Jan 2003 18:51:00 -0000	1.1.2.3
--- InterfaceRegistry.h	23 Jan 2003 19:46:55 -0000	1.1.2.4
***************
*** 156,161 ****
  	std::vector<InterfaceProxy *> const &getInterfaces() const;
  	
- //SWIG_PROTECTED:
- public:
  	void addInterface(const char *name, hasht id, InterfaceProxy *proxy) throw(InterfaceError);
  
--- 156,159 ----

Index: ns-simdata.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/ns-simdata.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ns-simdata.h	19 Jan 2003 20:28:30 -0000	1.1.2.1
--- ns-simdata.h	23 Jan 2003 19:46:55 -0000	1.1.2.2
***************
*** 48,63 ****
  #endif
  
- // Use SWIG_PROTECTED and SWIG_PRIVATE for protected and private 
- // members that should be exported to the Python proxy class (as 
- // public members) by SWIG.  Ordinarily, SWIG only wraps public 
- // members.
- #if defined(SWIG) || defined(SWIGPYTHON)
-   #define SWIG_PROTECTED public
-   #define SWIG_PRIVATE public
- #else
-   #define SWIG_PROTECTED protected
-   #define SWIG_PRIVATE private
- #endif
- 
  #endif //__NS_SIMDATA_H__
  
--- 48,51 ----

[Csp-commits] APPLICATIONS/SimData/SimDataMSVC SimDataMSVC.dsp,1.1.2.1,1.1.2.2

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimDataMSVC
In directory sc8-pr-cvs1:/tmp/cvs-serv7969

Modified Files:
      Tag: simdata
	SimDataMSVC.dsp 
Log Message:
no message

Index: SimDataMSVC.dsp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimDataMSVC/Attic/SimDataMSVC.dsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimDataMSVC.dsp	20 Jan 2003 18:30:20 -0000	1.1.2.1
--- SimDataMSVC.dsp	23 Jan 2003 18:52:51 -0000	1.1.2.2
***************
*** 41,47 ****
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 41,49 ----
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
+ # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../Include" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /D "__WIN32__" /FD /c
! # SUBTRACT CPP /X /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 53,57 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
  
  !ELSEIF  "$(CFG)" == "SimDataMSVC - Win32 Debug"
--- 55,60 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/_cSimData.dll" /libpath:"C:/Python22/libs"
! # SUBTRACT LINK32 /nodefaultlib
  
  !ELSEIF  "$(CFG)" == "SimDataMSVC - Win32 Debug"
***************
*** 66,72 ****
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /YX /FD /GZ  /c
! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /FD /GZ  /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 69,76 ----
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
+ # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /YX /FD /GZ /c
! # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../Include" /I "C:/python22/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMDATAMSVC_EXPORTS" /FD /GZ /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 79,83 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
  
  !ENDIF 
--- 83,87 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"C:/python22/libs"
  
  !ENDIF 
***************
*** 307,310 ****
--- 311,334 ----
  # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  # End Group
+ # Begin Source File
+ 
+ SOURCE=..\Source\cSimData.i
+ 
+ !IF  "$(CFG)" == "SimDataMSVC - Win32 Release"
+ 
+ # Begin Custom Build - swig
+ InputPath=..\Source\cSimData.i
+ InputName=cSimData
+ 
+ "..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ 	C:\progra~1\SWIG-1.3.17\swig -c++ -c -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp $(InputPath)
+ 
+ # End Custom Build
+ 
+ !ELSEIF  "$(CFG)" == "SimDataMSVC - Win32 Debug"
+ 
+ !ENDIF 
+ 
+ # End Source File
  # End Target
  # End Project

[Csp-commits] APPLICATIONS/SimData/Source TypeAdapter.cpp,1.1.2.3,1.1.2.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7860

Modified Files:
      Tag: simdata
	TypeAdapter.cpp 
Log Message:
no message

Index: TypeAdapter.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/TypeAdapter.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** TypeAdapter.cpp	20 Jan 2003 18:22:56 -0000	1.1.2.3
--- TypeAdapter.cpp	23 Jan 2003 18:52:34 -0000	1.1.2.4
***************
*** 46,54 ****
  }
  
! void TypeAdapter::set(int &x) const { IntCheck(); x = (int) var.i; }
  void TypeAdapter::set(bool &x) const { IntCheck(); x = (var.i != 0); }
! void TypeAdapter::set(float &x) const { DoubleCheck(); x = (float) var.d; }
! void TypeAdapter::set(double &x) const { DoubleCheck(); x = (double) var.d; }
! void TypeAdapter::set(unsigned int &x) const { IntCheck(); x = (unsigned int) var.i; }
  void TypeAdapter::set(std::string &x) const { StringCheck(); x = s; }
  void TypeAdapter::set(SimDate &x) const { setBase(x); }
--- 46,54 ----
  }
  
! void TypeAdapter::set(int &x) const { IntCheck(); x = static_cast<int>(var.i); }
  void TypeAdapter::set(bool &x) const { IntCheck(); x = (var.i != 0); }
! void TypeAdapter::set(float &x) const { DoubleCheck(); x = static_cast<float>(var.d); }
! void TypeAdapter::set(double &x) const { DoubleCheck(); x = static_cast<double>(var.d); }
! void TypeAdapter::set(unsigned int &x) const { IntCheck(); x = static_cast<unsigned int>(var.i); }
  void TypeAdapter::set(std::string &x) const { StringCheck(); x = s; }
  void TypeAdapter::set(SimDate &x) const { setBase(x); }

[Csp-commits] APPLICATIONS/SimData/Include/SimData HashUtility.h,1.1.2.6,1.1.2.7

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7707

Modified Files:
      Tag: simdata
	HashUtility.h 
Log Message:
no message

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/HashUtility.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** HashUtility.h	21 Jan 2003 19:04:11 -0000	1.1.2.6
--- HashUtility.h	23 Jan 2003 18:52:12 -0000	1.1.2.7
***************
*** 131,135 ****
  struct hasht_hash {
  	bool operator()(hasht i1) const {
! 		return i1.a;
  	}
  };
--- 131,135 ----
  struct hasht_hash {
  	bool operator()(hasht i1) const {
! 		return (i1.a != 0);
  	}
  };

[Csp-commits] APPLICATIONS/SimData/Include/SimData GlibCsp.h,1.1.2.4,1.1.2.5

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7325

Modified Files:
      Tag: simdata
	GlibCsp.h 
Log Message:
no message

Index: GlibCsp.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/GlibCsp.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** GlibCsp.h	20 Jan 2003 04:36:58 -0000	1.1.2.4
--- GlibCsp.h	23 Jan 2003 18:51:20 -0000	1.1.2.5
***************
*** 56,60 ****
  #define G_HAVE_GINT64 1
  
! #ifdef WIN32
  typedef __int64 gint64;
  typedef unsigned __int64 guint64;
--- 56,60 ----
  #define G_HAVE_GINT64 1
  
! #ifdef _WIN32
  typedef __int64 gint64;
  typedef unsigned __int64 guint64;
***************
*** 64,68 ****
  #endif
  
! #ifdef WIN32
    #define NATIVE_WIN32
  #endif
--- 64,68 ----
  #endif
  
! #ifdef _WIN32
    #define NATIVE_WIN32
  #endif