[simspark-cvs] simspark/spark/plugin/openglsyssdl Makefile.am, 1.1, 1.2 openglsystemsdl.cpp, 1.1, 1.2

[Oliver O. <fr...@us...>]

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

Modified Files:
	Makefile.am openglsystemsdl.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/openglsyssdl/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	13 Dec 2005 21:48:48 -0000	1.1
--- Makefile.am	15 Mar 2007 07:26:28 -0000	1.2
***************
*** 6,9 ****
--- 6,10 ----
  	export.cpp \
          openglsystemsdl.cpp \
+         openglsystemsdl.h \
          openglsystemsdl_c.cpp
  

Index: openglsystemsdl.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/openglsyssdl/openglsystemsdl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** openglsystemsdl.cpp	13 Dec 2005 21:48:48 -0000	1.1
--- openglsystemsdl.cpp	15 Mar 2007 07:26:28 -0000	1.2
***************
*** 24,28 ****
  #include <zeitgeist/logserver/logserver.h>
  #include <zeitgeist/scriptserver/scriptserver.h>
! #include <GL/gl.h>
  #include <SDL/SDL.h>
  
--- 24,28 ----
  #include <zeitgeist/logserver/logserver.h>
  #include <zeitgeist/scriptserver/scriptserver.h>
! #include <kerosin/openglserver/openglwrapper.h>
  #include <SDL/SDL.h>