[simspark-cvs] simspark/spark simspark.sln, 1.1, 1.2 ChangeLog, 1.1, 1.2 Makefile.am, 1.1, 1.2 READ

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark

Modified Files:
	ChangeLog Makefile.am README acinclude.m4 configure.ac 
Added Files:
	simspark.sln 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

--- NEW FILE: simspark.sln ---
(This appears to be a binary file; contents omitted.)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	19 Dec 2005 20:09:16 -0000	1.1
--- ChangeLog	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 0 ****
--- 1,87 ----
+ 2007-03-15  Oliver Obst  <fr...@cs...>
+ 2007-03-15  Oliver Obst <fr...@us...>
+ 
+ 	* kerosin/kerosin-config.in: 
+ 	- workaround for Mac OS included
+ 	* zeitgeist/scriptserver/scriptserver.cpp:
+ 	- fixed problem with including config.h an Mac OS
+ 	
+ 	* plugin/inputsdl/keyboardsdl.cpp: fixed bug with eNone enum
+ 	
+ 
+ 2007-03-06 Oliver Obst <fr...@us...>
+ 
+ 	* zeitgeist/core.cpp: 
+ 	- fixed Core::BindClass to attach a core to ClassClass
+ 
+ 2007-02-28 Oliver Obst <fr...@us...>
+ 
+ 	* configure.ac: - added test directory
+ 	* kerosin/Makefile.am: 
+ 	- added openglwrapper.h and openglsystem.h to Makefile
+ 	* plugin/openglsyssdl/openglsystemsdl.cpp: 
+ 	- replaced GL.h inclusion by our openglwrapper
+ 	* plugin/rosimporter/rosimporter.cpp: 
+ 	- removed the GL/glu.h include
+ 	* utility/sfsexp/Makefile.am: 
+ 	- removed EXTRA_DIST for README
+ 	* plugin/rosimporter/Makefile.am: 
+ 	- added roselements.h to Makefile
+ 	* plugin/openglsyssdl/Makefile.am: 
+ 	- added openglsystemsdl.h file to Makefile
+ 	* Makefile.am: 
+ 	- added test and plugin subdir
+ 	* oxygen/Makefile.am: 
+ 	- added jointeffector.h and jointperceptor.h to Makefile 
+ 	- added transformcollider.h to Makefile
+ 	* utility/rcssnet/Makefile.am: 
+ 	- added handler.cpp to the Makefile
+ 	* utility/tinyxml/Makefile.am: 
+ 	- added header files, so they go into the distribution as well
+ 	* acinclude.m4: 
+ 	- fixed all graphic related checks to work with Mac OS X
+ 	
+ 	* kerosin/fontserver/font.cpp: 
+ 	* kerosin/fontserver/font.h: 
+ 	- moved including OpenGL stuff from font.cpp to font.h
+ 	- changed handle from uint to GLuint
+ 
+ 	* kerosin/openglserver/openglwrapper.h: 
+ 	- added apple MacOS specific stuff
+ 	* kerosin/textureserver/texture.cpp:
+ 	* kerosin/textureserver/texture.h: 
+ 	- moved inclusion of openglwrapper from .cpp to .h
+ 	- changed the texture handle from uint to GLuint
+ 
+ 2007-02-28 Oliver Obst <fr...@us...>
+ 
+ 	* oxygen/Makefile.am: added odewrapper.h
+ 	
+ 
+ 2007-02-27 Oliver Obst <fr...@us...>
+ 
+ 	* zeitgeist/scriptserver/scriptserver.cpp: 
+ 	- included config.h to get the PACKAGE_NAME
+ 
+ 2007-02-13 Oliver Obst <fr...@us...>
+ 
+ 	* configure.ac: 
+ 	- fixed contact email address 
+ 	- added check for header files needed to compile
+ 	
+ 	* acinclude.m4: 
+ 	- included checks for the OpenGL stuff on a Mac 
+ 	- removed the checks that were needed to build the glextreg stuff
+ 
+ 	* utility/Makefile.am: 
+ 	removed the glextgen from parent directory Makefile
+ 
+ 	* utility/rcssnet/socket.hpp: 
+ 	HAVE_SOCKET indicates already the presence of the socket function (and may be defined even without
+ 	having a type SOCKET). I changed the conditional compile HAVE_SOCKET to HAVE_SOCKETTYPE.
+ 	
+ 	* zeitgeist/core.cpp: 
+ 	fixes to compile on a Mac 
+ 	- execinfo.h should be checked for in configure 
+ 	- the CatchSignal Method seems pretty linux-specific, so I changed the conditional compile to just that
+ 

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** acinclude.m4	8 Mar 2006 17:07:54 -0000	1.4
--- acinclude.m4	15 Mar 2007 07:26:25 -0000	1.5
***************
*** 26,30 ****
  			[RUBY_CPPFLAGS=''],
  			[unset ac_cv_header_ruby_h
! 		         ruby_tmp=$CPPFLAGS
                           ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"`
                           AC_MSG_NOTICE(trying again in $ruby_includedir)
--- 26,30 ----
  			[RUBY_CPPFLAGS=''],
  			[unset ac_cv_header_ruby_h
! 		         ruby_tmp_cppflags=$CPPFLAGS
                           ruby_includedir=`$RUBY -rrbconfig -e "print Config::CONFIG[['archdir']]"`
                           AC_MSG_NOTICE(trying again in $ruby_includedir)
***************
*** 34,38 ****
                                           [AC_MSG_ERROR(check your ruby installation)]
                           )
!                          CPPFLAGS=$ruby_tmp
                          ]
          )
--- 34,38 ----
                                           [AC_MSG_ERROR(check your ruby installation)]
                           )
!                          CPPFLAGS=$ruby_tmp_cppflags
                          ]
          )
***************
*** 50,54 ****

  	AC_MSG_CHECKING([for libruby])
! 	rcss_tmp="$LDFLAGS"
  	LDFLAGS="$LDFLAGS $RUBY_LDFLAGS"
   	AC_LINK_IFELSE([int main() { return 0; }],
--- 50,54 ----

  	AC_MSG_CHECKING([for libruby])
! 	rcss_tmp_ldflags="$LDFLAGS"
  	LDFLAGS="$LDFLAGS $RUBY_LDFLAGS"
   	AC_LINK_IFELSE([int main() { return 0; }],
***************
*** 57,61 ****
  		        AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own,
  	make sure to configure ruby with '--enable-shared' to create the library.])])
! 	LDFLAGS="$rcss_tmp"

  	# Substitute Makefile Vars.
--- 57,61 ----
  		        AC_MSG_ERROR([libruby cannot be found. If you compile ruby on your own,
  	make sure to configure ruby with '--enable-shared' to create the library.])])
! 	LDFLAGS="$rcss_tmp_ldflags"

  	# Substitute Makefile Vars.
***************
*** 144,170 ****
  #-----------------------------------------------------------------------------
  AC_DEFUN([RCSS_CHECK_GL], [
! 	RCSS_KEROSIN_IF_ELSE([
! 	# check for OpenGL location and used extensions
!     		AC_CHECK_HEADERS([GL/gl.h GL/glut.h],,
!                                 RCSS_BUILD_KEROSIN_ERROR([not all required OpenGL headers could not be found. Please specify the location  of the OpenGL header directory using the CPPFLAGS environment variable]))
! 		RCSS_KEROSIN_IF_ELSE([
! 			AC_CHECK_HEADERS([GL/glx.h], AC_SUBST([GLTARGET], [x]),
!                         		 AC_CHECK_HEADERS([GL/wglext.h],
!                                    	 AC_SUBST([GLTARGET], [win32]),
!                                          RCSS_BUILD_KEROSIN_ERROR([could not find 
!  X nor MS Windows GL extensions]),
!  				          [#include <GL/gl.h>]),
!                           [#include <GL/gl.h>])
! 
! 	# subst'ing the directory where the prepocessor finds gl.h
!         GLDIR=`echo "#include <GL/gl.h>" | /lib/cpp -M | awk '{ print @S|@2 }'`
!         GLDIR=`dirname "$GLDIR"`
!         AC_SUBST([GLDIR], [$GLDIR])
! 
  	# checking if linking against libGL succeeds 
- 	RCSS_KEROSIN_IF_ELSE([
  		AC_MSG_CHECKING([if linking against libGL succeeds])
! 		rcss_tmp="$LDFLAGS"
  		LDFLAGS="$LDFLAGS -lGL"
   		AC_LINK_IFELSE([#include <GL/gl.h>
  				int main() { glColor3f(0,0,0); }],
--- 144,181 ----
  #-----------------------------------------------------------------------------
  AC_DEFUN([RCSS_CHECK_GL], [
!     AC_CHECK_HEADERS([OpenGL/gl.h GLUT/glut.h], [rcss_iamamac=yes], [rcss_iamamac=no])
!     AC_MSG_CHECKING([if I am a Mac])
!     if test "$rcss_iamamac" = "yes"; then
!        AC_MSG_RESULT([yes])
!        RCSS_KEROSIN_IF_ELSE([
  	# checking if linking against libGL succeeds 
  		AC_MSG_CHECKING([if linking against libGL succeeds])
! 		rcss_tmp_ldflags="$LDFLAGS"
! 		LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL"
! 		GL_LIBADD=""
!  		AC_LINK_IFELSE([#include <OpenGL/gl.h>
! 				int main() { glColor3f(0,0,0); }],
! 				[AC_MSG_RESULT([yes])],
! 				[AC_MSG_RESULT([no])
! 				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])])
! 		LDFLAGS="$rcss_tmp_ldflags"
! 		AC_MSG_CHECKING([if linking against libglut succeeds])
! 		LDFLAGS="$LDFLAGS -framework GLUT -framework OpenGL"
!  		AC_LINK_IFELSE([#include <GLUT/glut.h>
! 				int main() { glutMainLoop(); }],
! 				[AC_MSG_RESULT([yes])],
! 				[AC_MSG_RESULT([no])
! 				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found])
! 				 ])
! 		LDFLAGS="$rcss_tmp_ldflags"
!        ])
!     else	
!        AC_MSG_RESULT([sorry])
!        # checking if linking against libGL succeeds 
!        RCSS_KEROSIN_IF_ELSE([
! 		AC_MSG_CHECKING([if linking against libGL succeeds])
! 		rcss_tmp_ldflags="$LDFLAGS"
  		LDFLAGS="$LDFLAGS -lGL"
+ 		GL_LIBADD="-lGL"
   		AC_LINK_IFELSE([#include <GL/gl.h>
  				int main() { glColor3f(0,0,0); }],
***************
*** 172,176 ****
  				[AC_MSG_RESULT([no])
  				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])])
! 		LDFLAGS="$rcss_tmp"
  		AC_MSG_CHECKING([if linking against libglut succeeds])
  		LDFLAGS="$LDFLAGS -lGL -lGLU -lglut"
--- 183,187 ----
  				[AC_MSG_RESULT([no])
  				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libGL can be found])])
! 		LDFLAGS="$rcss_tmp_ldflags"
  		AC_MSG_CHECKING([if linking against libglut succeeds])
  		LDFLAGS="$LDFLAGS -lGL -lGLU -lglut"
***************
*** 181,188 ****
  				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found])
  				 ])
! 		LDFLAGS="$rcss_tmp"
! 		])
!     ])
!   ])
  ]) # RCSS_CHECK_GL

--- 192,199 ----
  				 RCSS_BUILD_KEROSIN_ERROR([to build libkerosin, set LDFLAGS so that libglut or can be found])
  				 ])
! 		LDFLAGS="$rcss_tmp_ldflags"
!         ])
!     fi
!     AC_SUBST(GL_LIBADD)
  ]) # RCSS_CHECK_GL

***************
*** 209,218 ****
  	                       AC_MSG_WARN([To enable image support, please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)])])
                                ])
! 	if test "$rcss_tmp" = "no"; then
! 		IL_LIBADD=""
! 	else
! 		IL_LIBADD="-lIL"
  		RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS"
!                         	      LDFLAGS="$LDFLAGS -lIL"
                                	      AC_LINK_IFELSE([#include <IL/il.h>
  #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */
--- 220,233 ----
  	                       AC_MSG_WARN([To enable image support, please set CPPFLAGS appropriately or you can specify the location of the DevIL installation using the DEVIL environment variable (e.g. ./configure DEVIL=$HOME/DevIL)])])
                                ])
! 	IL_LIBADD=""
! 	if test "$rcss_tmp" != "no"; then
! 	   	if test "$rcss_iamamac" = "yes"; then
! 	                rcss_ld="-framework IL"
! 	    	else
! 			IL_LIBADD="-lIL"
! 			rcss_ld="-lIL"
! 		fi
  		RCSS_KEROSIN_IF_ELSE([rcss_tmp="$LDFLAGS"
!                         	      LDFLAGS="$LDFLAGS $rcss_ld"
                                	      AC_LINK_IFELSE([#include <IL/il.h>
  #include <stdarg.h> /* _vsnprintf may be undefined (and it is needed by libIL) */
***************
*** 245,272 ****
  Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)]))
                                ])
  	RCSS_KEROSIN_IF_ELSE([
!                               rcss_tmp="$LDFLAGS"
!                               LDFLAGS="$LDFLAGS -lSDL"
                                AC_LINK_IFELSE([#include <SDL/SDL.h>
!                                               int main() { return SDL_Init(0); }],,
          		      RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. 
  Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)]))
!                               LDFLAGS="$rcss_tmp"
                                ])
- 
- 
  ]) # RCSS_CHECK_SDL

  # RCSS_CHECK_SLANG
  #-----------------------------------------------------------------------------
  AC_DEFUN([RCSS_CHECK_SLANG], [
  	RCSS_KEROSIN_IF_ELSE([
!                               rcss_tmp="$LDFLAGS"
                                LDFLAGS="$LDFLAGS -lslang"
                                AC_LINK_IFELSE([int main() { return 0; }],,
          		      RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. 
  Please set LDFLAGS appropriately.]))
!                               LDFLAGS="$rcss_tmp"
  	])
  ]) # RCSS_CHECK_SLANG

--- 260,312 ----
  Please set CPPFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)]))
                                ])
+         RCSS_CREATE_LIBSDLMAIN
+ 	
+ 	if test "$rcss_iamamac" = "yes"; then
+ 	    rcss_cpp_add="-I/Library/Frameworks/SDL.framework/Headers"
+ 	    rcss_ld_add="-framework SDL -framework Cocoa $srcdir/macosX/libSDLmain.a"
+ 	    SDL_LIBADD=""
+ 	else
+ 	    rcss_cpp_add=""
+ 	    rcss_ld_add="-lSDL"
+ 	    SDL_LIBADD="-lSDL"
+ 	fi
+ 	AC_SUBST(SDL_LIBADD)
  	RCSS_KEROSIN_IF_ELSE([
!                               rcss_tmp_ldflags="$LDFLAGS"
! 			      rcss_tmp_cppflags="$CPPFLAGS"
! 			      CPPFLAGS="$CPPFLAGS $rcss_cpp_add"
!                               LDFLAGS="$LDFLAGS $rcss_ld_add"
                                AC_LINK_IFELSE([#include <SDL/SDL.h>
!                                               extern "C" int main(int argc, char **argv) { return SDL_Init(0); }],,
          		      RCSS_BUILD_KEROSIN_ERROR([The SDL library (libSDL.a or libSDL.so) cannot be found. 
  Please set LDFLAGS appropriately or you can specify the location of the SDL installation using the SDL environment variable (e.g. ./configure SDL=$HOME/SDL)]))
!                               LDFLAGS="$rcss_tmp_ldflags"
!                               CPPFLAGS="$rcss_tmp_cppflags"
                                ])
  ]) # RCSS_CHECK_SDL

+ # RCSS_CREATE_LIBSDLMAIN
+ #-----------------------------------------------------------------------------
+ AC_DEFUN([RCSS_CREATE_LIBSDLMAIN], [
+     if test "$rcss_iamamac" = "yes"; then
+         AC_MSG_NOTICE([Creating libsdlmain.a...])
+         $CC -I/Library/Frameworks/SDL.framework/Headers -o $srcdir/macosX/SDLMain.o -c $srcdir/macosX/SDLMain.m
+         $AR -rcs $srcdir/macosX/libSDLmain.a $srcdir/macosX/SDLMain.o
+     fi
+ ]) # RCSS_CREATE_LIBSDLMAIN
+ 
  # RCSS_CHECK_SLANG
  #-----------------------------------------------------------------------------
  AC_DEFUN([RCSS_CHECK_SLANG], [
+     if test "$rcss_iamamac" = "no"; then
  	RCSS_KEROSIN_IF_ELSE([
!                               rcss_tmp_ldflags="$LDFLAGS"
                                LDFLAGS="$LDFLAGS -lslang"
                                AC_LINK_IFELSE([int main() { return 0; }],,
          		      RCSS_BUILD_KEROSIN_ERROR([The S-Lang library (libslang.a or libslang.so) cannot be found. 
  Please set LDFLAGS appropriately.]))
!                               LDFLAGS="$rcss_tmp_ldflags"
  	])
+     fi
  ]) # RCSS_CHECK_SLANG

***************
*** 443,446 ****
  ])# RCSS_BOOST_REGEX

- 
- 
--- 483,484 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.ac	8 Mar 2006 17:13:42 -0000	1.5
--- configure.ac	15 Mar 2007 07:26:25 -0000	1.6
***************
*** 1,4 ****
  # Process this file with autoconf to produce a configure script.
! AC_INIT([simspark], 0.1, [sse...@li...])
  AC_CONFIG_SRCDIR([salt/salt.h])
  AC_CONFIG_HEADER([config.h])
--- 1,4 ----
  # Process this file with autoconf to produce a configure script.
! AC_INIT([simspark], 0.1, [sim...@li...])
  AC_CONFIG_SRCDIR([salt/salt.h])
  AC_CONFIG_HEADER([config.h])
***************
*** 48,54 ****
  AC_HEADER_STDC
  AC_CHECK_HEADERS([poll.h])
! AC_CHECK_HEADERS([arpa/nameser.h])
! AC_CHECK_HEADERS([resolv.h netdb.h])
  AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h])

  AC_CHECK_HEADER([boost/version.hpp],,
--- 48,55 ----
  AC_HEADER_STDC
  AC_CHECK_HEADERS([poll.h])
! AC_CHECK_HEADERS([arpa/nameser.h arpa/inet.h])
! AC_CHECK_HEADERS([resolv.h netdb.h sys/socket.h netinet/in.h Winsock2.h])
  AC_CHECK_HEADERS([float.h limits.h memory.h stdlib.h string.h])
+ AC_CHECK_HEADERS([execinfo.h])

  AC_CHECK_HEADER([boost/version.hpp],,
***************
*** 128,133 ****
  AC_CONFIG_FILES([Makefile \
  		 utility/Makefile \
- 		 utility/glextgen/Makefile \
- 		 utility/glextgen/glextgen.rb \
  		 utility/libobj/Makefile \
  		 utility/sfsexp/Makefile \
--- 129,132 ----
***************
*** 144,147 ****
--- 143,148 ----
  		 spark/Makefile \
  		 spark/spark-config \
+ 		 test/Makefile \
+ 		 test/coretest/Makefile \
  		 plugin/Makefile \
  		 plugin/filesystemstd/Makefile \
***************
*** 153,158 ****
  		 plugin/rosimporter/Makefile \
  		 plugin/sparkmonitor/Makefile \
! 		 plugin/sparkagent/Makefile \
! 	         test/coretest/Makefile ],
  	        [test -f salt/salt-config && chmod a+x salt/salt-config && \
  		 test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \
--- 154,158 ----
  		 plugin/rosimporter/Makefile \
  		 plugin/sparkmonitor/Makefile \
! 		 plugin/sparkagent/Makefile ],
  	        [test -f salt/salt-config && chmod a+x salt/salt-config && \
  		 test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	19 Dec 2005 20:09:16 -0000	1.1
--- Makefile.am	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 1,4 ****
  ### utility subdir has to be made first
! SUBDIRS = utility salt zeitgeist oxygen kerosin spark

  pkginclude_HEADERS = \
--- 1,4 ----
  ### utility subdir has to be made first
! SUBDIRS = utility salt zeitgeist oxygen kerosin spark plugin test

  pkginclude_HEADERS = \
***************
*** 6,9 ****
--- 6,12 ----

  CLEANFILES = 
+ DISTCLEANFILES = $(top_srcdir)/macosX/SDLMain.o $(top_srcdir)/macosX/libSDLmain.a
+ EXTRA_DIST = macosX/SDLMain.h macosX/SDLMain.m \
+ 	     win32/config.h win32/simspark.iss win32/spark.ico

  EXTRA_SRC_DISTS =

Index: README
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	19 Dec 2005 20:09:16 -0000	1.1
--- README	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ Simspark README

[simspark-cvs] simspark/spark simspark.sln, 1.1, 1.2 ChangeLog, 1.1, 1.2 Makefile.am, 1.1, 1.2 READ

[simspark-cvs] simspark/spark simspark.sln, 1.1, 1.2 ChangeLog, 1.1, 1.2 Makefile.am, 1.1, 1.2 README, 1.1, 1.2 acinclude.m4, 1.4, 1.5 configure.ac, 1.5, 1.6