[simspark-cvs] simspark/spark/kerosin kerosin.vcproj, 1.1, 1.2 Makefile.am, 1.6, 1.7 kerosin-config.in, 1.2, 1.3 kerosin.cpp, 1.1, 1.2 kerosin.h, 1.1, 1.2

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

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

Modified Files:
	Makefile.am kerosin-config.in kerosin.cpp kerosin.h 
Added Files:
	kerosin.vcproj 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: kerosin-config.in
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kerosin-config.in	25 Dec 2005 14:55:51 -0000	1.2
--- kerosin-config.in	15 Mar 2007 07:26:25 -0000	1.3
***************
*** 103,106 ****
--- 103,109 ----
    convlib="libkerosin.la"
   fi
+  if test `uname` = "Darwin"; then
+    convlib="$convlib -framework OpenGL -framework IL -framework SDL "
+  fi
   echo @libdir@/simspark/$convlib
  fi

Index: kerosin.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kerosin.cpp	5 Dec 2005 21:38:22 -0000	1.1
--- kerosin.cpp	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 28,32 ****
--- 28,37 ----
  Kerosin::Kerosin(zeitgeist::Zeitgeist &zg)
  {
+ #ifndef WIN32
      zg.GetCore()->RegisterClassObject(new CLASS(SoundServer), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/");
+ #endif
+ 
      zg.GetCore()->RegisterClassObject(new CLASS(InputServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputSystem), "kerosin/");
***************
*** 34,39 ****
      zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/");
!     zg.GetCore()->RegisterClassObject(new CLASS(ImageServer), "kerosin/");
!     zg.GetCore()->RegisterClassObject(new CLASS(FontServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/");
--- 39,43 ----
      zg.GetCore()->RegisterClassObject(new CLASS(InputDevice), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(InputControl), "kerosin/");
! 
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/");

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	8 Mar 2006 17:00:17 -0000	1.6
--- Makefile.am	15 Mar 2007 07:26:25 -0000	1.7
***************
*** 3,16 ****
  pkglib_LTLIBRARIES = libkerosin_debug.la
  libkerosin_debug_la_SOURCES = $(sources) 
! nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall
! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL 
  libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@
  else
  pkglib_LTLIBRARIES = libkerosin.la
  libkerosin_la_SOURCES = $(sources) 
! nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_la_CXXFLAGS = -O2
! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ -lSDL @IL_LIBADD@ -lGL 
  libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@
  endif
--- 3,16 ----
  pkglib_LTLIBRARIES = libkerosin_debug.la
  libkerosin_debug_la_SOURCES = $(sources) 
! # nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall
! libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
  libkerosin_debug_la_LDFLAGS = -version-info @kerosin_version_info@
  else
  pkglib_LTLIBRARIES = libkerosin.la
  libkerosin_la_SOURCES = $(sources) 
! # nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_la_CXXFLAGS = -O2
! libkerosin_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
  libkerosin_la_LDFLAGS = -version-info @kerosin_version_info@
  endif
***************
*** 18,33 ****
  bin_SCRIPTS = kerosin-config
  
! BUILT_SOURCES = openglserver/glextensionreg.h
! nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h
  
! openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp
! 	@echo "Copying generated glextension sources"
! 	cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@
  
! openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h
! 	cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@
  
! ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h:
! 	cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all
  endif
  
--- 18,33 ----
  bin_SCRIPTS = kerosin-config
  
! # BUILT_SOURCES = openglserver/glextensionreg.h
! # nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h
  
! # openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp
! # 	@echo "Copying generated glextension sources"
! # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@
  
! # openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h
! # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@
  
! # ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h:
! # 	cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all
  endif
  
***************
*** 144,147 ****
--- 144,149 ----
  textureserver/texture2d.h \
  textureserver/textureserver.h \
+ openglserver/openglwrapper.h \
+ openglserver/openglsystem.h \
  openglserver/openglserver.h \
  openglserver/glbase.h \

Index: kerosin.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kerosin.h	5 Dec 2005 21:38:22 -0000	1.1
--- kerosin.h	15 Mar 2007 07:26:25 -0000	1.2
***************
*** 30,34 ****
--- 30,40 ----
  #define KEROSIN_KEROSIN_H
  
+ #ifndef WIN32
  #include "soundserver/soundserver.h"
+ #include "imageserver/imageserver.h"
+ #include "fontserver/fontserver.h"
+ #include "fontserver/font.h"
+ #endif
+ 
  #include "inputserver/inputserver.h"
  #include "inputserver/inputsystem.h"
***************
*** 36,42 ****
  #include "inputserver/inputcontrol.h"
  #include "inputserver/inputitem.h"
! #include "imageserver/imageserver.h"
! #include "fontserver/fontserver.h"
! #include "fontserver/font.h"
  #include "openglserver/openglserver.h"
  #include "openglserver/openglsystem.h"
--- 42,46 ----
  #include "inputserver/inputcontrol.h"
  #include "inputserver/inputitem.h"
! 
  #include "openglserver/openglserver.h"
  #include "openglserver/openglsystem.h"

--- NEW FILE: kerosin.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="kerosin"
	ProjectGUID="{38291F56-23B6-4B5D-8810-D2AD2A379EE9}"
	RootNamespace="kerosin"
	Keyword="Win32Proj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="4"
			CharacterSet="0"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility"
				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				MinimalRebuild="true"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLibrarianTool"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="VCRelease|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="4"
			CharacterSet="0"
			WholeProgramOptimization="1"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				AdditionalIncludeDirectories="..\win32;..\;sceneserver/helper;..\utility"
				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
				RuntimeLibrary="2"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="3"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLibrarianTool"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="materialserver"
			>
			<File
				RelativePath=".\materialserver\material.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\material.h"
				>
			</File>
			<File
				RelativePath=".\materialserver\material2dtexture.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\material2dtexture.h"
				>
			</File>
			<File
				RelativePath=".\materialserver\material2dtexture_c.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\material_c.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialserver.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialserver.h"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialsolid.cpp"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialsolid.h"
				>
			</File>
			<File
				RelativePath=".\materialserver\materialsolid_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="openglserver"
			>
			<File
				RelativePath=".\openglserver\glbase.h"
				>
			</File>
			<File
				RelativePath=".\openglserver\openglserver.cpp"
				>
			</File>
			<File
				RelativePath=".\openglserver\openglserver.h"
				>
			</File>
			<File
				RelativePath=".\openglserver\openglserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\openglserver\openglsystem.h"
				>
			</File>
			<File
				RelativePath=".\openglserver\openglsystem_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="inputserver"
			>
			<File
				RelativePath=".\inputserver\input.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\input.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputcontrol.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputcontrol.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputcontrol_c.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputdevice.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputdevice.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputdevice_c.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputitem.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputitem.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputitem_c.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputserver.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputserver.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputserver_c.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputsystem.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputsystem.h"
				>
			</File>
			<File
				RelativePath=".\inputserver\inputsystem_c.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\scancodemap.cpp"
				>
			</File>
			<File
				RelativePath=".\inputserver\scancodemap.h"
				>
			</File>
		</Filter>
		<Filter
			Name="renderserver"
			>
			<File
				RelativePath=".\renderserver\customrender.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\customrender.h"
				>
			</File>
			<File
				RelativePath=".\renderserver\customrender_c.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendercontrol.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendercontrol.h"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendercontrol_c.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendernode.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendernode.h"
				>
			</File>
			<File
				RelativePath=".\renderserver\rendernode_c.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\renderserver.cpp"
				>
			</File>
			<File
				RelativePath=".\renderserver\renderserver.h"
				>
			</File>
			<File
				RelativePath=".\renderserver\renderserver_c.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="sceneserver"
			>
			<File
				RelativePath=".\sceneserver\axis.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\axis.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\axis_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\box.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\box.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\box_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\ccylinder.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\ccylinder.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\ccylinder_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\light.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\light.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\light_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\singlematnode.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\singlematnode.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\singlematnode_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sphere.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sphere.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\sphere_c.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\staticmesh.cpp"
				>
			</File>
			<File
				RelativePath=".\sceneserver\staticmesh.h"
				>
			</File>
			<File
				RelativePath=".\sceneserver\staticmesh_c.cpp"
				>
			</File>
			<Filter
				Name="helper"
				>
				<File
					RelativePath=".\sceneserver\helper\nv_algebra.cpp"
					>
				</File>
				<File
					RelativePath=".\sceneserver\helper\NVMeshMender.cpp"
					>
				</File>
				<File
					RelativePath=".\sceneserver\helper\NVMeshMender.h"
					>
				</File>
				<Filter
					Name="nv_math"
					>
					<File
						RelativePath=".\sceneserver\helper\nv_math\nv_algebra.h"
						>
					</File>
					<File
						RelativePath=".\sceneserver\helper\nv_math\nv_math.h"
						>
					</File>
					<File
						RelativePath=".\sceneserver\helper\nv_math\nv_mathdecl.h"
						>
					</File>
				</Filter>
			</Filter>
		</Filter>
		<Filter
			Name="textureserver"
			>
			<File
				RelativePath=".\textureserver\texture.cpp"
				>
			</File>
			<File
				RelativePath=".\textureserver\texture.h"
				>
			</File>
			<File
				RelativePath=".\textureserver\texture2d.cpp"
				>
			</File>
			<File
				RelativePath=".\textureserver\texture2d.h"
				>
			</File>
			<File
				RelativePath=".\textureserver\textureserver.cpp"
				>
			</File>
			<File
				RelativePath=".\textureserver\textureserver.h"
				>
			</File>
			<File
				RelativePath=".\textureserver\textureserver_c.cpp"
				>
			</File>
		</Filter>
		<File
			RelativePath=".\kerosin.cpp"
			>
		</File>
		<File
			RelativePath=".\kerosin.h"
			>
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>