csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/SimData/VisualStudio2003 PostBuilt.bat,1.1,NONE

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

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28613

Removed Files:
	PostBuilt.bat 
Log Message:
see CHANGES.current

--- PostBuilt.bat DELETED ---

[Csp-commits] APPLICATIONS/SimData/Include/SimData Exception.h,1.17,1.18

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

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24041

Modified Files:
	Exception.h 
Log Message:
see CHANGES.current

Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Exception.h	19 Oct 2003 23:53:56 -0000	1.17
--- Exception.h	3 Feb 2004 19:41:19 -0000	1.18
***************
*** 31,40 ****
  #include <string>
  
  #include <SimData/Export.h>
  #include <SimData/Namespace.h>
  
! 
  NAMESPACE_SIMDATA
  
  
  /** General exception base class with error reporting.
--- 31,47 ----
  #include <string>
  
+ 
  #include <SimData/Export.h>
  #include <SimData/Namespace.h>
  
! #ifndef NAMESPACE_SIMDATA
! namespace simdata {
! #else
  NAMESPACE_SIMDATA
+ #endif
  
+ #ifndef SIMDATA_EXPORT
+ #define SIMDATA_EXPORT
+ #endif
  
  /** General exception base class with error reporting.
***************
*** 121,127 ****
  SIMDATA_EXCEPTION(PythonException);
  
! 
  NAMESPACE_SIMDATA_END
! 
  
  #endif // __SIMDATA_EXCEPTION_H__
--- 128,136 ----
  SIMDATA_EXCEPTION(PythonException);
  
! #ifndef NAMESPACE_SIMDATA_END
! }
! #else
  NAMESPACE_SIMDATA_END
! #endif
  
  #endif // __SIMDATA_EXCEPTION_H__

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.4,1.5

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25217/Source

Modified Files:
	SConscript 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SConscript	1 Feb 2004 10:01:03 -0000	1.4
--- SConscript	1 Feb 2004 12:06:44 -0000	1.5
***************
*** 202,203 ****
--- 202,207 ----
  Default(package_targets)
  
+ # unittests
+ env.Depends('unittests', package_targets)
+ env.Alias('test', env.Command('unittests', '', './runtests.py'))
+ 

[Csp-commits] APPLICATIONS/SimData/Include/SimData Archive.i,1.2,1.3 BaseType.i,1.3,1.4 DataArchive.i,1.5,1.6 DataManager.i,1.2,1.3 Date.i,1.7,1.8 Enum.i,1.8,1.9 External.i,1.5,1.6 GeoPos.i,1.4,1.5 InterfaceRegistry.i,1.5,1.6 Key.i,1.3,1.4 LUT.i,1.6,1.7 Link.i,1.3,1.4 Log.i,1.5,1.6 Matrix3.i,1.4,1.5 Object.i,1.6,1.7 Path.i,1.5,1.6 Quat.i,1.2,1.3 Real.i,1.4,1.5 String.i,1.3,1.4 Vector3.i,1.4,1.5 cSimData.i,1.12,1.13 vector.i,1.6,1.7

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25217/Include/SimData

Modified Files:
	Archive.i BaseType.i DataArchive.i DataManager.i Date.i Enum.i 
	External.i GeoPos.i InterfaceRegistry.i Key.i LUT.i Link.i 
	Log.i Matrix3.i Object.i Path.i Quat.i Real.i String.i 
	Vector3.i cSimData.i vector.i 
Log Message:


Index: Archive.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Archive.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Archive.i	19 Oct 2003 23:53:56 -0000	1.2
--- Archive.i	1 Feb 2004 12:06:44 -0000	1.3
***************
*** 24,28 ****
  %}
  
- %include "std_string.i"
  %include "SimData/filemap.i"
  
--- 24,27 ----

Index: BaseType.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BaseType.i	23 Jul 2003 05:07:50 -0000	1.3
--- BaseType.i	1 Feb 2004 12:06:44 -0000	1.4
***************
*** 24,31 ****
  %}
  
- %include exception.i
- 
  %import "SimData/Exception.i"
- %include "std_string.i"
  
  %exception BaseType {
--- 24,28 ----

Index: DataArchive.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataArchive.i	14 Aug 2003 12:19:12 -0000	1.5
--- DataArchive.i	1 Feb 2004 12:06:44 -0000	1.6
***************
*** 26,30 ****
  
  
- %include "std_vector.i"
  %import "SimData/Exception.i"
  
--- 26,29 ----
***************
*** 36,40 ****
  }
  
- %include exception.i
  %exception SIMDATA(DataArchive) {
  	try {
--- 35,38 ----

Index: DataManager.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataManager.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataManager.i	23 Jul 2003 05:07:50 -0000	1.2
--- DataManager.i	1 Feb 2004 12:06:44 -0000	1.3
***************
*** 31,35 ****
  //typedef  int		     int32;
  
- %include exception.i
  %exception SIMDATA(DataManager) {
  	try {
--- 31,34 ----

Index: Date.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Date.i	21 Oct 2003 16:23:34 -0000	1.7
--- Date.i	1 Feb 2004 12:06:44 -0000	1.8
***************
*** 24,28 ****
  %}
  
- %include "std_string.i"
  
  NAMESPACE_SIMDATA
--- 24,27 ----
***************
*** 35,39 ****
  NAMESPACE_SIMDATA_END
  
- %include exception.i
  %exception {
  	try {
--- 34,37 ----

Index: Enum.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Enum.i	14 Aug 2003 12:19:12 -0000	1.8
--- Enum.i	1 Feb 2004 12:06:44 -0000	1.9
***************
*** 24,28 ****
  %}
  
- %include "std_string.i"
  %import "SimData/Ref.h"
  
--- 24,27 ----
***************
*** 55,60 ****
  	}
  	
- %include "exception.i"
- 
  %exception  {
  	TRY
--- 54,57 ----

Index: External.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/External.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** External.i	19 Oct 2003 23:53:56 -0000	1.5
--- External.i	1 Feb 2004 12:06:44 -0000	1.6
***************
*** 24,29 ****
  %}
  
- %include "std_string.i"
- 
  %rename(__repr__) SIMDATA(External)::asString() const;
  %rename(__eq__) SIMDATA(External)::operator==(SIMDATA(External) const &) const;
--- 24,27 ----

Index: GeoPos.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GeoPos.i	6 Aug 2003 06:36:24 -0000	1.4
--- GeoPos.i	1 Feb 2004 12:06:44 -0000	1.5
***************
*** 26,31 ****
  %}
  
- %include "std_string.i"
- 
  NAMESPACE_SIMDATA
  %rename(__repr__) GeoPos::asString() const;
--- 26,29 ----

Index: InterfaceRegistry.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InterfaceRegistry.i	19 Oct 2003 23:53:56 -0000	1.5
--- InterfaceRegistry.i	1 Feb 2004 12:06:44 -0000	1.6
***************
*** 28,32 ****
  %include "SimData/Namespace.h"
  %include "SimData/vector.i"
- %include "exception.i"
  
  NAMESPACE_SIMDATA
--- 28,31 ----

Index: Key.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Key.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Key.i	19 Oct 2003 23:53:56 -0000	1.3
--- Key.i	1 Feb 2004 12:06:44 -0000	1.4
***************
*** 24,29 ****
  %}
  
- %include "std_string.i"
- 
  %rename(__repr__) SIMDATA(Key)::asString() const;
  %rename(__eq__) SIMDATA(Key)::operator==(SIMDATA(Key) const &) const;
--- 24,27 ----

Index: LUT.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LUT.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LUT.i	19 Oct 2003 23:53:56 -0000	1.6
--- LUT.i	1 Feb 2004 12:06:44 -0000	1.7
***************
*** 26,34 ****
  #ifndef __NO_LUT__
  
- %include "std_vector.i"
  %include "SimData/Namespace.h"
  
- %include "std_vector.i"
- 
  #ifndef VFLOAT
  #define VFLOAT
--- 26,31 ----
***************
*** 104,109 ****
  	}
  	
- %include "exception.i"
- 
  %exception  {
  	TRY
--- 101,104 ----

Index: Link.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Link.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Link.i	6 Aug 2003 06:36:24 -0000	1.3
--- Link.i	1 Feb 2004 12:06:44 -0000	1.4
***************
*** 31,35 ****
  %ignore SIMDATA(PointerBase)::operator=(const PointerBase& r);
  
- %include "std_string.i"
  %include "SimData/Namespace.h"
  
--- 31,34 ----

Index: Log.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Log.i	6 Aug 2003 06:36:24 -0000	1.5
--- Log.i	1 Feb 2004 12:06:44 -0000	1.6
***************
*** 25,29 ****
  %}
  
- %include "std_string.i"
  %include "SimData/Namespace.h"
  
--- 25,28 ----

Index: Matrix3.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Matrix3.i	6 Aug 2003 06:36:24 -0000	1.4
--- Matrix3.i	1 Feb 2004 12:06:44 -0000	1.5
***************
*** 25,32 ****
  %}
  
- %include "std_string.i"
- %include "std_vector.i"
- 
- 
  %include "SimData/Namespace.h"
  
--- 25,28 ----

Index: Object.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Object.i	6 Aug 2003 06:36:24 -0000	1.6
--- Object.i	1 Feb 2004 12:06:44 -0000	1.7
***************
*** 24,28 ****
  %}
  
- %include "std_string.i"
  %include "SimData/Namespace.h"
  %include "SimData/Export.h"
--- 24,27 ----

Index: Path.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Path.i	6 Aug 2003 06:36:24 -0000	1.5
--- Path.i	1 Feb 2004 12:06:44 -0000	1.6
***************
*** 24,28 ****
  %}
  
- %include "std_string.i"
  %include "SimData/Namespace.h"
  
--- 24,27 ----

Index: Quat.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quat.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Quat.i	19 Oct 2003 23:53:56 -0000	1.2
--- Quat.i	1 Feb 2004 12:06:44 -0000	1.3
***************
*** 24,30 ****
  %}
  
- %include "std_string.i"
- %include "std_vector.i"
- 
  %include "SimData/Namespace.h"
  
--- 24,27 ----

Index: Real.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Real.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Real.i	10 Aug 2003 17:52:08 -0000	1.4
--- Real.i	1 Feb 2004 12:06:44 -0000	1.5
***************
*** 24,29 ****
  %}
  
- %include "std_string.i"
- 
  %include "SimData/Namespace.h"
  
--- 24,27 ----

Index: String.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/String.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** String.i	23 Jul 2003 05:07:50 -0000	1.3
--- String.i	1 Feb 2004 12:06:44 -0000	1.4
***************
*** 32,37 ****
  %}
  
- %include "std_string.i"
- 
  class swig_string_bug_workaround {
  public:
--- 32,35 ----

Index: Vector3.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Vector3.i	6 Aug 2003 06:36:25 -0000	1.4
--- Vector3.i	1 Feb 2004 12:06:44 -0000	1.5
***************
*** 25,30 ****
  %}
  
- %include "std_string.i"
- %include "std_vector.i"
  %include "SimData/vector.i"
  
--- 25,28 ----

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/cSimData.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cSimData.i	15 Aug 2003 06:59:16 -0000	1.12
--- cSimData.i	1 Feb 2004 12:06:44 -0000	1.13
***************
*** 34,37 ****
--- 34,38 ----
  %include "std_string.i"
  %include "std_vector.i"
+ %include "exception.i"
  
  %include "SimData/Namespace.h"

Index: vector.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/vector.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vector.i	19 Oct 2003 23:53:56 -0000	1.6
--- vector.i	1 Feb 2004 12:06:44 -0000	1.7
***************
*** 22,28 ****
  #define __SIMDATA_VECTOR_TEMPLATES__
  
- %include "std_string.i"
- %include "std_vector.i"
- 
  #define new_vector(a, b)	\
  	%template(simdata_vector_##a) std::vector< b >;
--- 22,25 ----

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.96,1.97 SConstruct,1.4,1.5

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25217

Modified Files:
	CHANGES.current SConstruct 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** CHANGES.current	1 Feb 2004 10:01:03 -0000	1.96
--- CHANGES.current	1 Feb 2004 12:06:43 -0000	1.97
***************
*** 7,10 ****
--- 7,15 ----
  
    * Fixed the source directory for building scons sdist.
+   
+   * Cleaned up swig std includes in the various interface
+     files.  Now all loaded up front in cSimData.i.
+ 
+   * Added 'test' target to scons to run the unittests.
  
  2003-01-30: onsight

Index: SConstruct
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SConstruct	1 Feb 2004 10:01:03 -0000	1.4
--- SConstruct	1 Feb 2004 12:06:43 -0000	1.5
***************
*** 115,116 ****
--- 115,117 ----
  package.bdist()
  
+ 

[Csp-commits] APPLICATIONS/SimData/debian changelog,NONE,1.1 control,NONE,1.1 docs,NONE,1.1 rules,NONE,1.1

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/debian

Added Files:
	changelog control docs rules 
Log Message:


--- NEW FILE: changelog ---
simdata (0.4.0-1) unstable; urgency=low

  * Initial Release.

 -- Mark Rose <mk...@us...>  Sat, 31 Jan 2004 17:59:51 -0800


--- NEW FILE: control ---
Source: simdata
Section: devel
Priority: optional
Maintainer: Mark Rose <mk...@us...>
Build-Depends: debhelper (>= 4.0.0), scons (>= 0.94), g++ (>=3.2.0), python2.3-dev, swig1.3 (>= 1.3.20)
Standards-Version: 3.6.0

Package: simdata-dev
Section: devel
Architecture: any
Depends: simdata
Suggests: simdata-doc
Description: Header and interface files for SimData
 SimData is a cross-platform, independent library for data management in
 simulations. The library is written in C++, and provides full binding to
 Python via SWIG.  This package provides high-quality data classes that are
 useful in simulation environments (including vectors, matrices, quaternions,
 dates, geospacial coordinates, and interpolated lookup tables) and allows
 static external data to be quickly and easily loaded into the simulation at
 runtime. 

Package: simdata
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Recommends: ${python:Depends}
Description: Data management library for simulations
 SimData is a cross-platform, independent library for data management in
 simulations. The library is written in C++, and provides full binding to
 Python via SWIG.  This package provides high-quality data classes that are
 useful in simulation environments (including vectors, matrices, quaternions,
 dates, geospacial coordinates, and interpolated lookup tables) and allows
 static external data to be quickly and easily loaded into the simulation at
 runtime. 

Package: simdata-doc
Section: doc
Architecture: all
Recommends: simdata, simdata-dev
Description: Documentation for SimData
 SimData is a cross-platform, independent library for data management in
 simulations. The library is written in C++, and provides full binding to
 Python via SWIG.  This package provides high-quality data classes that are
 useful in simulation environments (including vectors, matrices, quaternions,
 dates, geospacial coordinates, and interpolated lookup tables) and allows
 static external data to be quickly and easily loaded into the simulation at
 runtime. 

--- NEW FILE: docs ---
README
TODO
COPYING

--- NEW FILE: rules ---
#!/usr/bin/make -f
# -*- makefile -*-
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.

# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1

#CFLAGS = -Wall -g

#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
#	CFLAGS += -O0
#else
#	CFLAGS += -O2
#endif
#ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
#	INSTALL_PROGRAM += -s
#endif

# shared library versions, option 1
version=0.4.0
major=0
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
#version=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`

configure: configure-stamp
configure-stamp:
	dh_testdir
	# Add here commands to configure the package.
	touch configure-stamp

build: build-stamp
build-stamp: configure-stamp 
	dh_testdir
	# Add here commands to compile the package.
	scons
	touch build-stamp

clean:
	dh_testdir
	dh_testroot
	rm -f build-stamp configure-stamp
	# Add here commands to clean up after the build process.
	scons --clean
	scons --clean docs
	dh_clean 

install: build
	dh_testdir
	dh_testroot
	dh_clean -k 
	dh_installdirs
	# Add here commands to install the package into debian/tmp
	scons install_package \
	  PACKAGE_PREFIX=$(CURDIR)/debian/simdata/usr/lib/python2.3/site-packages \
	  INCLUDE_PREFIX=$(CURDIR)/debian/simdata/usr/include/python2.3
	scons install_headers \
	  PACKAGE_PREFIX=$(CURDIR)/debian/simdata-dev/usr/lib/python2.3/site-packages \
	  INCLUDE_PREFIX=$(CURDIR)/debian/simdata-dev/usr/include/python2.3

build-docs:
	dh_testdir
	dh_testroot
	dh_clean -k 
	dh_installdirs
	scons docs

# Build architecture-independent files here.
binary-indep: build-docs

# Build architecture-dependent files here.
binary-arch: build install
	dh_testdir
	dh_testroot
	dh_installchangelogs 
	dh_installdocs
	dh_installexamples
#	dh_install
#	dh_installmenu
#	dh_installdebconf	
#	dh_installlogrotate
#	dh_installemacsen
#	dh_installpam
#	dh_installmime
#	dh_installinit
#	dh_installcron
#	dh_installinfo
#	dh_installman
	dh_link
	dh_strip
	dh_compress
	dh_fixperms
#	dh_perl
	dh_python
#	dh_makeshlibs
	dh_installdeb
	dh_shlibdeps
	dh_gencontrol
	dh_md5sums
	dh_builddeb

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.3,1.4

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/Source

Modified Files:
	SConscript 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SConscript	1 Nov 2003 16:08:40 -0000	1.3
--- SConscript	1 Feb 2004 10:01:03 -0000	1.4
***************
*** 86,89 ****
--- 86,90 ----
  	BaseType.i
  	Conversions.i
+ 	cSimData.i
  	DataArchive.i
  	DataManager.i
***************
*** 162,170 ****
  	Makefile
  	SConstruct
! 	construct.py
  	setup.py
  	Source/SConscript
  	""")
  
  # swig wrappers
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
--- 163,180 ----
  	Makefile
  	SConstruct
! 	build_support.py
! 	build_config.py
  	setup.py
  	Source/SConscript
  	""")
  
+ doc_files = Prefix("#/Doc",
+ 	"""
+ 	Doxyfile
+ 	SConscript
+ 	footer.html
+ 	Makefile
+ 	""")
+ 
  # swig wrappers
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
***************
*** 184,190 ****
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(sources, 'source')
  package.add(libraries, 'binary')
! package.add(package_files + headers + sub_interfaces + extra_files, 'both')
  
  # default target(s)
--- 194,201 ----
  package = env['PACKAGE']
  package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(Prefix('#/Source', sources) + top_interfaces, 'source')
! package.add(top_interfaces, 'source')
  package.add(libraries, 'binary')
! package.add(package_files + headers + sub_interfaces + extra_files + doc_files, 'both')
  
  # default target(s)

[Csp-commits] APPLICATIONS/SimData/Doc SConscript,1.1,1.2

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/Doc

Modified Files:
	SConscript 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/SConscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SConscript	26 Jul 2003 18:15:22 -0000	1.1
--- SConscript	1 Feb 2004 10:01:03 -0000	1.2
***************
*** 20,27 ****
--- 20,30 ----
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
+ from build_support import Prefix
+ from glob import glob
  
  Import("env")
  
  doxyfile = "Doxyfile"
+ html = Prefix('#/Doc/', glob('html/*'))
  
  # this target is rebuild everytime it is explicitly
***************
*** 30,32 ****
--- 33,36 ----
  
  env.Alias('docs', env.Doxygen('docs', doxyfile))
+ env.Clean('docs', html)
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.95,1.96 SConstruct,1.3,1.4 build_config.py,1.1,1.2 build_support.py,1.1,1.2 construct.py,1.2,NONE

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079

Modified Files:
	CHANGES.current SConstruct build_config.py build_support.py 
Removed Files:
	construct.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** CHANGES.current	31 Jan 2004 06:24:07 -0000	1.95
--- CHANGES.current	1 Feb 2004 10:01:03 -0000	1.96
***************
*** 1,4 ****
--- 1,11 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-01-31: onsight
+   * Added debian packaging files (experimental).
+ 
+   * Added 'docs --clean' target to scons.
+ 
+   * Fixed the source directory for building scons sdist.
+ 
  2003-01-30: onsight
    * Starting with version 1.3.20 of SWIG, the python runtime

Index: SConstruct
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SConstruct	1 Nov 2003 16:08:40 -0000	1.3
--- SConstruct	1 Feb 2004 10:01:03 -0000	1.4
***************
*** 48,52 ****
  EnsureSConsVersion(0,9)
  EnsurePythonVersion(2,2)
- #EnsureSwigVersion('1.3.16 1.3.17 1.3.20') # only needed for shared lib
  
  if ARGUMENTS.get('PLATFORM', 0):
--- 48,51 ----
***************
*** 56,60 ****
  
  ConfigPython(env)
- ConfigPlatform(env)
  
  package = Package(env)
--- 55,58 ----
***************
*** 77,94 ****
  options.Add('ARCHIVE_FORMATS', 
                  help='File format(s) for distribution archives',
! 		default=None)
  options.Add('PACKAGE_PREFIX', 
                  help='Installation path for the SimData package', 
! 		default=env['PYTHON_LIB'])
  options.Add('INCLUDE_PREFIX', 
                  help='Installation path for the SimData headers and interfaces', 
! 		default=env['PYTHON_INC'])
  options.Update(env)
  Help(options.GenerateHelpText(env))
  
! # construct.addSwigSupport(env)
  
! conf = Configure(env)
! addConfigTests(conf)
  if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
  	print
--- 75,91 ----
  options.Add('ARCHIVE_FORMATS', 
                  help='File format(s) for distribution archives',
!                 default=None)
  options.Add('PACKAGE_PREFIX', 
                  help='Installation path for the SimData package', 
!                 default=env['PYTHON_LIB'])
  options.Add('INCLUDE_PREFIX', 
                  help='Installation path for the SimData headers and interfaces', 
!                 default=env['PYTHON_INC'])
  options.Update(env)
  Help(options.GenerateHelpText(env))
  
! # Configuration tests
  
! conf = CustomConfigure(env)
  if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
  	print
***************
*** 99,102 ****
--- 96,102 ----
   	print
   	Exit(1)
+ env = conf.Finish()
+ 
+ ConfigPlatform(env)
  
  # Export('env', 'construct', 'Package')

Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_config.py	1 Nov 2003 16:08:40 -0000	1.1
--- build_config.py	1 Feb 2004 10:01:03 -0000	1.2
***************
*** 1,3 ****
! from build_support import Config
  
  
--- 1,3 ----
! from build_support import Config, compareVersions
  
  
***************
*** 8,15 ****
  		self.CPPPATH = ['#/Include', self.PYTHON_INC]
  		self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
! 		self.SHLINKLIBS = ['dl', 'swigpy']
! 		self.SWIGFLAGS = ' -c -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = None
  
  class Config_msvc(Config):
--- 8,24 ----
  		self.CPPPATH = ['#/Include', self.PYTHON_INC]
  		self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
! 		self.SHLINKLIBS = ['dl']
  		self.CXXFILESUFFIX = '.cpp'
  		self.ARCHIVE_FORMATS = None
+ 		self.configSwig(env)
+ 	def configSwig(self, env):
+ 		version = env['SWIG_VERSION']
+ 		self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ 		if compareVersions(version, '1.3.20') >= 0:
+ 		  self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ 		else:
+ 		  self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ 		  self.SHLINKLIBS.append('swigpy')
+ 
  
  class Config_msvc(Config):

Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_support.py	1 Nov 2003 16:08:40 -0000	1.1
--- build_support.py	1 Feb 2004 10:01:03 -0000	1.2
***************
*** 30,33 ****
--- 30,34 ----
  import SCons.Errors
  
+ 
  Action = SCons.Action.Action
  Builder = SCons.Builder.Builder
***************
*** 123,126 ****
--- 124,132 ----
  	conf.AddTests(configure_tests)
  
+ def CustomConfigure(env):
+ 	conf = env.Configure()
+ 	addConfigTests(conf)
+ 	return conf
+ 
  
  ############################################################################
***************
*** 193,196 ****
--- 199,203 ----
  	if ok:
  		context.Result("yes (%s)" % swig_version)
+ 		context.env['SWIG_VERSION'] = swig_version
  	else:
  		context.Result("no")
***************
*** 481,488 ****
  		install_package = installPythonSources(env, package_target, package_files)
  		install_headers = installPythonSources(env, include_target, include_files)
  		env.Alias('install', install_package + install_headers)
  
  def Prefix(dir, names):
! 	return map(lambda x: os.path.normpath(os.path.join(dir, x)), names.split())
  
  
--- 488,499 ----
  		install_package = installPythonSources(env, package_target, package_files)
  		install_headers = installPythonSources(env, include_target, include_files)
+ 		env.Alias('install_package', install_package)
+ 		env.Alias('install_headers', install_headers)
  		env.Alias('install', install_package + install_headers)
  
  def Prefix(dir, names):
! 	if type(names) == type(''):
! 		names = names.split()
! 	return map(lambda x: os.path.normpath(os.path.join(dir, x)), names)
  
  

--- construct.py DELETED ---

[Csp-commits] APPLICATIONS/SimData/Include/SimData Export.h,1.10,1.11

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079/Include/SimData

Modified Files:
	Export.h 
Log Message:


Index: Export.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Export.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Export.h	19 Oct 2003 23:53:56 -0000	1.10
--- Export.h	1 Feb 2004 10:01:03 -0000	1.11
***************
*** 29,32 ****
--- 29,36 ----
  
  #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined( __BCPLUSPLUS__) || defined( __MWERKS__)
+ 	#  ifdef SWIG
+ 	#    undef  __declspec
+ 	#    define __declspec(x)
+ 	#  endif // SWIG
  	#  ifdef SIMDATA_EXPORTS
  	#    define SIMDATA_EXPORT   __declspec(dllexport)

[Csp-commits] APPLICATIONS/SimData/debian - New directory

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12538/debian

Log Message:
Directory /cvsroot/csp/APPLICATIONS/SimData/debian added to the repository

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.83,1.84 Makefile.in,1.7,1.8 acinclude.m4,1.9,1.10 configure.in,1.15,1.16

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20217

Modified Files:
	CHANGES.current Makefile.in acinclude.m4 configure.in 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** CHANGES.current	27 Jan 2004 20:57:11 -0000	1.83
--- CHANGES.current	31 Jan 2004 17:11:40 -0000	1.84
***************
*** 2,5 ****
--- 2,14 ----
  ===========================
     
+ 2004-01-31: onsight
+   * Patched acinclude.m4, configure.in, and Source/Makefile.in to
+     handle SWIG 1.3.20 and newer.  When used with a newer version
+     of SWIG, the '-c' flag is replace with '-noruntime', and the
+     swigpy library is not linked against.  You may need to rebuild
+     SimData (which has undergone a similar change).
+ 
+   * Now tests for and links against the osgFX library.
+ 
  2004-01-27: delta
    * Added a method to access viewport dimensions in VirtualScene.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	17 Aug 2003 18:39:51 -0000	1.7
--- Makefile.in	31 Jan 2004 17:11:41 -0000	1.8
***************
*** 5,11 ****
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL #-march=athon-tbird
! export GLDOPTS = -shared -lswigpy -ldl
! export GSWOPTS = -c -c++ -python -noexcept
  export CXX = g++
  export SWIG = swig 
--- 5,11 ----
  
  export GDEBUGF = -g -Wall
! export GCFLAGS = -fPIC -O2# -DSWIG_GLOBAL
! export GLDOPTS = -shared -ldl @SWIG_SWIGPY@
! export GSWOPTS = -c++ -python -noexcept @SWIG_NORUNTIME@
  export CXX = g++
  export SWIG = swig 
***************
*** 21,28 ****
  	@$(MAKE) InputMaps
  
- #default: 
- #	@for dir in $(SUBDIRS); do \
- #		$(MAKE) -C $${dir} $@ || exit 1; \
- #	done
  
  Makefile: Makefile.in configure.in acinclude.m4
--- 21,24 ----
***************
*** 30,33 ****
--- 26,30 ----
  	./configure
  
+ 
  InputMaps: aircraft.hid gamescreen.hid
  

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** acinclude.m4	20 Oct 2003 00:23:22 -0000	1.9
--- acinclude.m4	31 Jan 2004 17:11:41 -0000	1.10
***************
*** 250,251 ****
--- 250,305 ----
  ])
  
+ dnl check for swig
+ AC_DEFUN(CHECK_SWIG, [
+   min_version=$1
+   AC_MSG_CHECKING(for swig)
+   swig_version_output=`swig -version 2>&1`
+   major=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\1/'`
+   minor=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\2/'`
+   micro=`echo $swig_version_output | sed 's/.* \([[0-9]]\)\.\([[0-9]]\+\)\.\([[0-9]]\+\) .*/\3/'`
+   major_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 
+   minor_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+   micro_min=`echo $min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+   version_proper=`expr \
+     $major \> $major_min \| \
+     $major \= $major_min \& \
+     $minor \> $minor_min \| \
+     $major \= $major_min \& \
+     $minor \= $minor_min \& \
+     $micro \>= $micro_min `
+   new_style=`expr \
+     $major \> 1 \| \
+     $major \= 1 \& \
+     $minor \> 3 \| \
+     $major \= 1 \& \
+     $minor \= 3 \& \
+     $micro \>= 20 `
+   if test "$version_proper" = "1" ; then
+     AC_MSG_RESULT(yes)
+     AC_MSG_CHECKING(swig runtime)
+     if test "$new_style" = "1" ; then
+       AC_MSG_RESULT(new style)
+       SWIG_SWIGPY=''
+       SWIG_RUNTIME='-noruntime'
+       SWIG_NORUNTIME='-noruntime'
+     else
+       AC_MSG_RESULT(old style)
+       SWIG_SWIGPY='-lswigpy'
+       SWIG_RUNTIME=''
+       SWIG_NORUNTIME='-c'
+     fi
+     AC_SUBST(SWIG_SWIGPY)
+     AC_SUBST(SWIG_RUNTIME)
+     AC_SUBST(SWIG_NORUNTIME)
+   else
+     AC_MSG_RESULT(no)
+     AC_MSG_ERROR([
+       SWIG version >= $min_version must be installed.  SWIG is
+       avalable in prepackaged binary and source distributions from
+       http://www.swig.org.
+     ])
+   fi
+ ])
+   
+   
+ 

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.in	20 Oct 2003 06:52:12 -0000	1.15
--- configure.in	31 Jan 2004 17:11:41 -0000	1.16
***************
*** 32,35 ****
--- 32,37 ----
  AC_ST_BLKSIZE
  
+ CHECK_SWIG([1.3.16])
+ 
  _CSP_CHECK_PKG_CONFIG([])
  
***************
*** 59,62 ****
--- 61,71 ----
  CSP_OSG_CONFIG(osgText, 0.9.6, [OpenSceneGraph Text library])
  CSP_OSG_CONFIG(osgParticle, 0.9.6, [OpenSceneGraph Particle library])
+ dnl check for osgFX
+ dnl osgFX does not include a version() function, so we use AC_CHECK_LIB instead
+ dnl CSP_OSG_CONFIG(osgFX, 0.9.6, [OpenSceneGraph Effects library])
+ AC_HAVE_LIBRARY(osgFX, [], [AC_MSG_ERROR([
+ OpenSceneGraph osgFX library needs to be installed.  This library
+ is included with OpenSceneGraph 0.9.6 and newer, which can be
+ downloaded from http://www.openscenegraph.org])])
  
  dnl check for libSigC++ type-safe signal libraryy

[Csp-commits] APPLICATIONS/CSPSim/Source LogoScreen.cpp,1.16,1.17

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20217/Source

Modified Files:
	LogoScreen.cpp 
Log Message:


Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** LogoScreen.cpp	1 Jan 2004 23:25:29 -0000	1.16
--- LogoScreen.cpp	31 Jan 2004 17:11:41 -0000	1.17
***************
*** 54,64 ****
  class ImageUpdateCallback: public osg::NodeCallback {
  	typedef std::vector<osg::ref_ptr<osg::Image> > ImageList;
!     osg::ref_ptr<osg::Texture2D> m_Texture;
  	double m_Delay;
!     ImageList m_ImageList;
!     size_t m_CurrPos;
!     double m_PrevTime;
  public:
!     ImageUpdateCallback(osg::Texture2D *texture, double delay):
  	m_Texture(texture),
  	m_Delay(delay),
--- 54,64 ----
  class ImageUpdateCallback: public osg::NodeCallback {
  	typedef std::vector<osg::ref_ptr<osg::Image> > ImageList;
! 	osg::ref_ptr<osg::Texture2D> m_Texture;
  	double m_Delay;
! 	ImageList m_ImageList;
! 	size_t m_CurrPos;
! 	double m_PrevTime;
  public:
! 	ImageUpdateCallback(osg::Texture2D *texture, double delay):
  	m_Texture(texture),
  	m_Delay(delay),
***************
*** 98,102 ****
  		}
  	}
!     virtual void operator()(osg::Node*, osg::NodeVisitor *nv) {
  		if (nv->getFrameStamp()) {
  			double currTime = nv->getFrameStamp()->getReferenceTime();
--- 98,102 ----
  		}
  	}
! 	virtual void operator()(osg::Node*, osg::NodeVisitor *nv) {
  		if (nv->getFrameStamp()) {
  			double currTime = nv->getFrameStamp()->getReferenceTime();
***************
*** 109,113 ****
  			//}
  		}
!     }
  	void setValue() {
  		m_Texture->setImage(m_ImageList[m_CurrPos].get());
--- 109,113 ----
  			//}
  		}
! 	}
  	void setValue() {
  		m_Texture->setImage(m_ImageList[m_CurrPos].get());
***************
*** 126,157 ****
  
  	// create geometry
!     osg::Geometry* geom = new osg::Geometry;
  
  	// disable display list so our modified tex show up
!     geom->setUseDisplayList(false);
  
  	scale = 0.5f * 1.0f;
  	w = scale * m_width;
  	h = scale * m_height;
!     osg::Vec3Array* vertices = new osg::Vec3Array(4);
  	(*vertices)[0] = osg::Vec3(-w,h,0.0f);//top left
!     (*vertices)[1] = osg::Vec3(-w,-h,0.0f);//bottom left
!     (*vertices)[2] = osg::Vec3(w,-h,0.0f);//bottom right
!     (*vertices)[3] = osg::Vec3(w,h,0.0f);//top right
!     geom->setVertexArray(vertices);
      
!     osg::Vec2Array* texcoords = new osg::Vec2Array(4);
!     (*texcoords)[0].set(0.0f, 1.0f);
!     (*texcoords)[1].set(0.0f, 0.0f);
!     (*texcoords)[2].set(1.0f, 0.0f);
!     (*texcoords)[3].set(1.0f, 1.0f);
  	 
!     geom->setTexCoordArray(0,texcoords);
  
  	osg::Vec4Array* colors = new osg::Vec4Array(1);
!     (*colors)[0].set(1.0f,1.0f,1.0f,1.0f);
!     geom->setColorArray(colors);
!     geom->setColorBinding(osg::Geometry::BIND_OVERALL);
!     geom->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, 4));
  
  	m_Texture = new osg::Texture2D;
--- 126,157 ----
  
  	// create geometry
! 	osg::Geometry* geom = new osg::Geometry;
  
  	// disable display list so our modified tex show up
! 	geom->setUseDisplayList(false);
  
  	scale = 0.5f * 1.0f;
  	w = scale * m_width;
  	h = scale * m_height;
! 	osg::Vec3Array* vertices = new osg::Vec3Array(4);
  	(*vertices)[0] = osg::Vec3(-w,h,0.0f);//top left
! 	(*vertices)[1] = osg::Vec3(-w,-h,0.0f);//bottom left
! 	(*vertices)[2] = osg::Vec3(w,-h,0.0f);//bottom right
! 	(*vertices)[3] = osg::Vec3(w,h,0.0f);//top right
! 	geom->setVertexArray(vertices);
      
! 	osg::Vec2Array* texcoords = new osg::Vec2Array(4);
! 	(*texcoords)[0].set(0.0f, 1.0f);
! 	(*texcoords)[1].set(0.0f, 0.0f);
! 	(*texcoords)[2].set(1.0f, 0.0f);
! 	(*texcoords)[3].set(1.0f, 1.0f);
  	 
! 	geom->setTexCoordArray(0,texcoords);
  
  	osg::Vec4Array* colors = new osg::Vec4Array(1);
! 	(*colors)[0].set(1.0f,1.0f,1.0f,1.0f);
! 	geom->setColorArray(colors);
! 	geom->setColorBinding(osg::Geometry::BIND_OVERALL);
! 	geom->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, 4));
  
  	m_Texture = new osg::Texture2D;
***************
*** 162,166 ****
  	geom->setStateSet(stateset);
  
!     osg::Geode *geode = new osg::Geode;
  	geode->addDrawable(geom);
  	geode->setUpdateCallback(new ImageUpdateCallback(m_Texture.get(),0.5));
--- 162,166 ----
  	geom->setStateSet(stateset);
  
! 	osg::Geode *geode = new osg::Geode;
  	geode->addDrawable(geom);
  	geode->setUpdateCallback(new ImageUpdateCallback(m_Texture.get(),0.5));

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.94,1.95 Makefile,1.22,1.23 setup.py,1.32,1.33

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11990

Modified Files:
	CHANGES.current Makefile setup.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** CHANGES.current	1 Jan 2004 16:17:32 -0000	1.94
--- CHANGES.current	31 Jan 2004 06:24:07 -0000	1.95
***************
*** 1,4 ****
--- 1,32 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-01-30: onsight
+   * Starting with version 1.3.20 of SWIG, the python runtime
+     library support has changed.  The swigpy library is no
+     longer distributed with SWIG, and must be built locally
+     if needed.  SimData relies on having a single runtime
+     library library loaded, that is shared by all client
+     modules.  As a first attempt at solving this problem,
+     SimData will directly incorporate the python runtime
+     code.  This may or may not work under Windows, depending
+     on how the associated symbols are resolved when linking
+     modules that depend on SimData.
+ 
+   * Added 'swigopts' and 'ldopts' options to setup.py to dump
+     swig and linker options to stdout.  The Makefile now gets
+     these options from setup.py.  The options strings are now
+     dependent on the installed version of SWIG, to account for
+     the renaming of the '-c' command line option and optional
+     linking with an external python runtime library.  The
+     setup.py script also deals with this change in SWIG
+     behavior when building under distutils.
+ 
+ ==> NOTE: These changes have not been tested under Windows,
+     and no changes have been made to the VC project file
+     yet.  If you are using Windows and would like to help
+     improve support for new versions of SWIG, please post
+     a message to the developers forum at
+       http://csp.sourceforge.net/forum
+ 
  2003-12-30: delta
    * Added an environment variable to the project in lieu of 

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile	24 Oct 2003 15:45:43 -0000	1.22
--- Makefile	31 Jan 2004 06:24:07 -0000	1.23
***************
*** 2,10 ****
  
  export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
  
  export GDEBUGF = -g -W -Wall -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK
! export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
! export GLDOPTS = -shared -lswigpy -ldl
! export GSWOPTS = -c -c++ -python -noexcept
  export CXX = g++
  export SWIG = swig
--- 2,10 ----
  
  export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
+ export GSWOPTS = $(shell python setup.py swigopts)
+ export GLDOPTS = $(shell python setup.py ldopts)
  
  export GDEBUGF = -g -W -Wall -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK
! export GCFLAGS = -fPIC -O2
  export CXX = g++
  export SWIG = swig

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** setup.py	24 Oct 2003 06:44:13 -0000	1.32
--- setup.py	31 Jan 2004 06:24:07 -0000	1.33
***************
*** 26,31 ****
  
  
- 
- 
  import sys
  
--- 26,29 ----
***************
*** 47,55 ****
  from distutils.command.build_ext import build_ext
  from distutils import sysconfig, dir_util
! import os, os.path, string
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
  VERSION = "0.3.4"
  
  def copy_dir(src, dst, files, verbose=0):
  	from distutils.file_util import copy_file
--- 45,81 ----
  from distutils.command.build_ext import build_ext
  from distutils import sysconfig, dir_util
! import os, os.path, string, re
  
  # REMEMBER TO 'touch Version.cpp' OR REBUILD ALL
  VERSION = "0.3.4"
  
+ 
+ SWIG_VERSION = None
+ 
+ def getSwigVersion():
+   global SWIG_VERSION
+   if SWIG_VERSION is None:
+     (cout, cin, cerr) = os.popen3('swig -version')
+     versiontext = ' '.join(cerr.readlines())
+     match = re.search(r'\s(1)\.(\d)\.(\d+)\s', versiontext)
+     if match is None:
+       print >>sys.stderr, 'swig -version failed.  Check that SWIG is installed correctly.'
+       sys.exit(1)
+     SWIG_VERSION = map(int, match.groups())
+   return SWIG_VERSION
+ 
+ def checkSwigVersion():
+     major, minor, rev = getSwigVersion()
+     if major < 1 or minor < 3 or rev < 16:
+         print >>sys.stderr, 'SWIG version 1.3.16 or greater required; older versions are not supported.'
+         sys.exit(1)
+     if rev == 18 or rev == 19:
+         print >>sys.stderr, 'SWIG versions 1.3.18 and 1.3.19 are not supported, please upgrade to a newer version.'
+         sys.exit(1)
+ 
+ def isOldSwigRuntime():
+     major, minor, rev = getSwigVersion()
+     return major == 1 and minor == 3 and rev < 20
+ 
  def copy_dir(src, dst, files, verbose=0):
  	from distutils.file_util import copy_file
***************
*** 140,144 ****
  class build_swig_ext(build_ext):
      
!     swig_options = ''
  
      def build_extension(self, ext):
--- 166,170 ----
  class build_swig_ext(build_ext):
      
!     options = []
  
      def build_extension(self, ext):
***************
*** 183,187 ****
  
          swig = self.find_swig()
!         swig_cmd = [swig, "-python", "-c++"] + build_swig_ext.options.split()
          
          if 1 or self.inplace:
--- 209,213 ----
  
          swig = self.find_swig()
!         swig_cmd = [swig] + build_swig_ext.options
          
          if 1 or self.inplace:
***************
*** 347,356 ****
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
- build_swig_ext.options = "-IInclude -noexcept"
  includes = ["Include"]
  defines = [("SIMDATA_VERSION", '"%s"' % VERSION)]
! libraries = ["swigpy", "dl"]
  cflags = []
  
  
  if len(sys.argv)>=2:
--- 373,388 ----
  headers_fullpath = fullpath("Include/SimData/", "", headers)
  
  includes = ["Include"]
  defines = [("SIMDATA_VERSION", '"%s"' % VERSION)]
! libraries = ["dl"]
  cflags = []
  
+ checkSwigVersion()
+ swigopts = ["-python", "-c++", "-noexcept"]
+ if isOldSwigRuntime():
+     libraries.append('swigpy')
+ else:
+     swigopts.append("-runtime")
+ build_swig_ext.options = swigopts + ["-IInclude"]
  
  if len(sys.argv)>=2:
***************
*** 361,364 ****
--- 393,402 ----
          print sysconfig.get_python_inc()
          sys.exit(0)
+     if command == "ldopts":
+         print '-shared', ' '.join(map(lambda x: '-l%s' % x, libraries))
+ 	sys.exit(0)
+     if command == "swigopts":
+         print ' '.join(swigopts)
+ 	sys.exit(0)
  
  cSimData = Extension("SimData._cSimData", 

[Csp-commits] APPLICATIONS/CSPSim/Source GameScreen.cpp,1.30,1.31

[<de...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18691

Modified Files:
	GameScreen.cpp 
Log Message:
see CHANGES.current

Index: GameScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/GameScreen.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** GameScreen.cpp	27 Jan 2004 20:54:26 -0000	1.30
--- GameScreen.cpp	28 Jan 2004 13:31:54 -0000	1.31
***************
*** 26,29 ****
--- 26,32 ----
  #include "GameScreen.h"
  
+ #include <ctime>
+ #include <iomanip>
+ 
  #include <osg/Image>
  #include <osgDB/WriteFile>
***************
*** 137,140 ****
--- 140,156 ----
  	std::string m_Filename, m_Ext;
      bool m_SnapImageOnNextFrame;
+ 	std::string buildSuffix() {
+ 		time_t timer;
+ 		time(&timer);
+ 		tm* time_ptr = localtime(&timer);
+ 		std::ostringstream os;
+ 		os.fill( '0' );
+ 		os << std::setw(2) << time_ptr->tm_mon + 1 <<  std::setw(2) << time_ptr->tm_mday << std::setw(2) << time_ptr->tm_year - 100;
+ 		std::string day = os.str();
+ 		os.str("");
+ 		os << std::setw(2) << time_ptr->tm_hour << std::setw(2) << time_ptr->tm_min << std::setw(2) << time_ptr->tm_sec;
+ 		std::string hour = os.str();
+ 		return day + '-' + hour;
+ 	}
  public:
  	SnapImageDrawCallback(const std::string& filename = "CSPScreen",const std::string& ext = ".bmp"):
***************
*** 149,162 ****
  		return m_SnapImageOnNextFrame; 
  	}
- 	std::string buildSuffix() {
- 		char tmp_char[128];
- 		_strdate(tmp_char);
- 		std::string day = tmp_char;
- 		day.erase(std::remove(day.begin(),day.end(),'/'),day.end());
- 		_strtime(tmp_char);
- 		std::string hour = tmp_char;
- 		hour.erase(std::remove(hour.begin(),hour.end(),':'),hour.end());
- 		return day + '-' + hour;
- 	}
      virtual void operator()(const Producer::Camera& camera) {
  		if (m_SnapImageOnNextFrame) {
--- 165,168 ----
***************
*** 178,181 ****
--- 184,188 ----
  
  void GameScreen::on_PrintScreen() {
+ 	// for now, it is on previous frame ... but that should work.
  	SnapImageDrawCallback sn;
  	sn.setSnapImageOnNextFrame(true);
***************
*** 360,364 ****
  		simdata::Vector3 upVec = dynamic->getUpDirection();
  		simdata::Vector3 objectDir = dynamic->getDirection();
! 		double speed_level = dynamic->getSpeed()/50.0;
  		camPos = objectPos + 900.0* objectDir + ( 12.0 - (rand() % 5) ) * (objectDir^upVec) 
  			    + ( 6.0 + (rand () % 3) ) * upVec;
--- 367,371 ----
  		simdata::Vector3 upVec = dynamic->getUpDirection();
  		simdata::Vector3 objectDir = dynamic->getDirection();
! 		//double speed_level = dynamic->getSpeed()/50.0;
  		camPos = objectPos + 900.0* objectDir + ( 12.0 - (rand() % 5) ) * (objectDir^upVec) 
  			    + ( 6.0 + (rand () % 3) ) * upVec;

[Csp-commits] APPLICATIONS/CSPSim README,1.1,1.2

[<mk...@pr...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15225

Modified Files:
	README 
Log Message:


Index: README
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	2 Jul 2003 09:46:18 -0000	1.1
--- README	28 Jan 2004 10:46:04 -0000	1.2
***************
*** 8,10 ****
      http://csp.sourceforge.net/forum
  
- 
--- 8,9 ----

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/decimate_texture decimate_texture.vcproj,NONE,1.1

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

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

Added Files:
	decimate_texture.vcproj 
Log Message:
no message

--- NEW FILE: decimate_texture.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="decimate_texture"
	ProjectGUID="{FA6E1B0F-C792-4A80-A315-752ED678AB6A}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="0">
			<Tool
				Name="VCNMakeTool"
				Output="decimate_texture.exe"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="libjpeg.lib SDL.lib engine.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\decimate_texture.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_chunker heightfield_chunker.vcproj,NONE,1.1

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

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

Added Files:
	heightfield_chunker.vcproj 
Log Message:
no message

--- NEW FILE: heightfield_chunker.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="heightfield_chunker"
	ProjectGUID="{EA522843-0D21-416E-8A60-315280ADDB88}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\bt_array.cpp">
			</File>
			<File
				RelativePath="..\heightfield_chunker.cpp">
			</File>
			<File
				RelativePath="..\mmap_util.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
			<File
				RelativePath="..\mmap_util.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/heightfield_shader heightfield_shader.vcproj,NONE,1.1

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

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

Added Files:
	heightfield_shader.vcproj 
Log Message:
no message

--- NEW FILE: heightfield_shader.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="heightfield_shader"
	ProjectGUID="{4A346C89-EEA0-447A-9EC0-8C2844F59F69}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\bt_array.cpp">
			</File>
			<File
				RelativePath="..\heightfield_shader.cpp">
			</File>
			<File
				RelativePath="..\mmap_util.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/makebt makebt.vcproj,NONE,1.1

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

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

Added Files:
	makebt.vcproj 
Log Message:
no message

--- NEW FILE: makebt.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="makebt"
	ProjectGUID="{069A7C80-5996-49A7-B708-F6F31842DF81}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="0">
			<Tool
				Name="VCNMakeTool"
				Output="makebt.exe"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libpng.lib"
				AdditionalLibraryDirectories="../lib"
				IgnoreDefaultLibraryNames="libc.lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\makebt.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/maketqt maketqt.vcproj,NONE,1.1

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

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

Added Files:
	maketqt.vcproj 
Log Message:
no message

--- NEW FILE: maketqt.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="maketqt"
	ProjectGUID="{6A3B3F7E-350A-4752-94C8-7E9F84C48E43}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="0">
			<Tool
				Name="VCNMakeTool"
				Output="maketqt.exe"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\maketqt.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm merge-ppm.vcproj,NONE,1.1

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

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm
In directory sc8-pr-cvs1:/tmp/cvs-serv30874

Added Files:
	merge-ppm.vcproj 
Log Message:
no message

--- NEW FILE: merge-ppm.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="merge-ppm"
	ProjectGUID="{C97F95B3-1ADB-4B0F-864F-C8CEA3C3E711}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="0">
			<Tool
				Name="VCNMakeTool"
				Output="merge-ppm.exe"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\bt_array.cpp">
			</File>
			<File
				RelativePath="..\merge-ppm.cpp">
			</File>
			<File
				RelativePath="..\mmap_util.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/shader2 shader2.vcproj,NONE,1.1

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

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

Added Files:
	shader2.vcproj 
Log Message:
no message

--- NEW FILE: shader2.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="shader2"
	ProjectGUID="{E1A5C9B6-3944-4F00-9E0F-4369F43D2BF9}"
	Keyword="MakeFileProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="Debug"
			IntermediateDirectory="Debug"
			ConfigurationType="0">
			<Tool
				Name="VCNMakeTool"
				Output="shader2.exe"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="../bin"
			IntermediateDirectory="Release"
			ConfigurationType="1">
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories=".."
				PreprocessorDefinitions="WIN32"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="engine.lib SDL.lib libjpeg.lib SDL_image.lib"
				AdditionalLibraryDirectories="../lib"/>
			<Tool
				Name="VCMIDLTool"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\bt_array.cpp">
			</File>
			<File
				RelativePath="..\mmap_util.cpp">
			</File>
			<File
				RelativePath="..\shader2.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\readme.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

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

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

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

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/shader2 added to the repository

[Csp-commits] APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm - New directory

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

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm
In directory sc8-pr-cvs1:/tmp/cvs-serv30587/merge-ppm

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/Tools/ChunkTerrain/merge-ppm added to the repository