]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 561e062)
Fixing Linux SCons build.
authorrambetter <rambetter>
Tue, 22 Feb 2011 04:48:05 +0000 (04:48 +0000)
committerrambetter <rambetter>
Tue, 22 Feb 2011 04:48:05 +0000 (04:48 +0000)
Fixing plugins on both Linux and Windows.  It's consistent now.
Fixing gl font on Windows.
Mostly, added lots of plugins.

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@474 8a3a26a2-13c4-0310-b231-cf6edde360e5

75 files changed:
SConscript.module patch | blob | history
config.py patch | blob | history
contrib/bkgrnd2d/bkgrnd2d.def patch | blob | history
contrib/bkgrnd2d/bkgrnd2d.vcproj [new file with mode: 0644] patch | blob
contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date [deleted file] patch | blob | history
contrib/bkgrnd2d/dialog.cpp patch | blob | history
contrib/bobtoolz/DEntity.cpp patch | blob | history
contrib/bobtoolz/DMap.cpp patch | blob | history
contrib/bobtoolz/DMap.h patch | blob | history
contrib/bobtoolz/DVisDrawer.cpp patch | blob | history
contrib/bobtoolz/bobToolz.def [deleted file] patch | blob | history
contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date [deleted file] patch | blob | history
contrib/bobtoolz/bobtoolz.def [new file with mode: 0644] patch | blob
contrib/bobtoolz/bobtoolz.vcproj [new file with mode: 0644] patch | blob
contrib/bobtoolz/misc.cpp patch | blob | history
contrib/gtkgensurf/bitmap.cpp patch | blob | history
contrib/gtkgensurf/dec.cpp patch | blob | history
contrib/gtkgensurf/gendlgs.cpp patch | blob | history
contrib/gtkgensurf/gensurf.def [deleted file] patch | blob | history
contrib/gtkgensurf/gtkgensurf.def [new file with mode: 0644] patch | blob
contrib/gtkgensurf/gtkgensurf.vcproj [new file with mode: 0644] patch | blob
contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date [deleted file] patch | blob | history
contrib/hydratoolz/hydratoolz.def patch | blob | history
contrib/hydratoolz/hydratoolz.vcproj [new file with mode: 0644] patch | blob
contrib/hydratoolz/hydratoolz.vcproj.out-of-date [deleted file] patch | blob | history
contrib/prtview/PrtView.def [deleted file] patch | blob | history
contrib/prtview/PrtView.txt patch | blob | history
contrib/prtview/PrtView.vcproj.out-of-date [deleted file] patch | blob | history
contrib/prtview/prtview.def [new file with mode: 0644] patch | blob
contrib/prtview/prtview.vcproj [new file with mode: 0644] patch | blob
contrib/ufoai/ufoai.def patch | blob | history
contrib/ufoai/ufoai.vcproj [new file with mode: 0644] patch | blob
contrib/ufoai/ufoai.vcproj.out-of-date [deleted file] patch | blob | history
gen.vcproj.out-of-date [deleted file] patch | blob | history
plugins/eclassfgd/fgd.def patch | blob | history
plugins/eclassfgd/fgd.vcproj [new file with mode: 0644] patch | blob
plugins/eclassfgd/fgd.vcproj.out-of-date [deleted file] patch | blob | history
plugins/imagem8/imagem8.def patch | blob | history
plugins/imagem8/imagem8.vcproj [new file with mode: 0644] patch | blob
plugins/imagem8/imagem8.vcproj.out-of-date [deleted file] patch | blob | history
plugins/imagewal/imagewal.def patch | blob | history
plugins/imagewal/imagewal.vcproj [new file with mode: 0644] patch | blob
plugins/imagewal/imagewal.vcproj.out-of-date [deleted file] patch | blob | history
plugins/spritemodel/spritemodel.def patch | blob | history
plugins/spritemodel/spritemodel.vcproj [new file with mode: 0644] patch | blob
plugins/spritemodel/spritemodel.vcproj.out-of-date [deleted file] patch | blob | history
plugins/surface_heretic2/surface_heretic2.def patch | blob | history
plugins/surface_heretic2/surface_heretic2.vcproj [new file with mode: 0644] patch | blob
plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date [deleted file] patch | blob | history
plugins/surface_heretic2/surfacedialog.cpp patch | blob | history
plugins/surface_quake2/surface_quake2.def patch | blob | history
plugins/surface_quake2/surface_quake2.vcproj [new file with mode: 0644] patch | blob
plugins/surface_quake2/surface_quake2.vcproj.out-of-date [deleted file] patch | blob | history
plugins/surface_quake2/surfacedialog.cpp patch | blob | history
plugins/surface_ufoai/surface_ufoai.def patch | blob | history
plugins/surface_ufoai/surface_ufoai.vcproj [new file with mode: 0644] patch | blob
plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date [deleted file] patch | blob | history
plugins/surface_ufoai/surfacedialog.cpp patch | blob | history
plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp patch | blob | history
plugins/textool/TexTool.def [deleted file] patch | blob | history
plugins/textool/TexTool.vcproj.out-of-date [deleted file] patch | blob | history
plugins/textool/textool.def [new file with mode: 0644] patch | blob
plugins/textool/textool.vcproj [new file with mode: 0644] patch | blob
plugins/vfspak/vfs.cpp patch | blob | history
plugins/vfspak/vfspak.def patch | blob | history
plugins/vfspak/vfspak.vcproj [new file with mode: 0644] patch | blob
plugins/vfspak/vfspak.vcproj.out-of-date [deleted file] patch | blob | history
plugins/vfswad/vfs.cpp patch | blob | history
plugins/vfswad/vfswad.def patch | blob | history
plugins/vfswad/vfswad.vcproj [new file with mode: 0644] patch | blob
plugins/vfswad/vfswad.vcproj.out-of-date [deleted file] patch | blob | history
radiant.sln patch | blob | history
radiant.xcode/project.pbxproj patch | blob | history
radiant/glwidget.cpp patch | blob | history
radiant/radiant.vcproj patch | blob | history

diff --git a/SConscript.module b/SConscript.module
index a7f254970dc45fdacb39923219c7db362510c4f7..9de1947184f847adc63a6b9caf7afebbd5f9f936 100644 (file)
--- a/SConscript.module
+++ b/SConscript.module
@@ -11,39 +11,43 @@ Import( [ 'utils', 'config', 'settings', 'project', 'shlib_objects' ] )
 libname = os.path.splitext( libname )[0]
 
 env = Environment()
 libname = os.path.splitext( libname )[0]
 
 env = Environment()
-useJPEG = False
-useGtk = False
-useZ = False
-usePNG = False
-if ( libname == 'image' ):
-       useJPEG = True
-if ( libname == 'surface' ):
-       useGtk = True
-if ( libname == 'surface_ufoai' ):
-       useGtk = True
-if ( libname == 'surface_quake2' ):
-       useGtk = True
-if ( libname == 'surface_heretic2' ):
-       useGtk = True
-if ( libname == 'bkgrnd2d' ):
-       useGtk = True
-if ( libname == 'gtkgensurf' ):
-       useGtk = True
-if ( libname == 'bobToolz_gtk' ):
-       useGtk = True
-if ( libname == 'camera' ):
-       useGtk = True
-if ( libname == 'PrtView' ):
-       useGtk = True
-if ( libname == 'spritemodel' ):
-       useGtk = True
-if ( libname == 'model' ):
-       useGtk = True
-if ( libname == 'TexTool' ):
-       useGtk = True
-if ( libname == 'imagepng' ):
-       usePNG = True
+# useJPEG = False
+# useGtk = False
+# useZ = False
+# usePNG = False
+# if ( libname == 'image' ):
+#      useJPEG = True
+# if ( libname == 'surface' ):
+#      useGtk = True
+# if ( libname == 'surface_ufoai' ):
+#      useGtk = True
+# if ( libname == 'surface_quake2' ):
+#      useGtk = True
+# if ( libname == 'surface_heretic2' ):
+#      useGtk = True
+# if ( libname == 'bkgrnd2d' ):
+#      useGtk = True
+# if ( libname == 'gtkgensurf' ):
+#      useGtk = True
+# if ( libname == 'bobtoolz' ):
+#      useGtk = True
+# if ( libname == 'camera' ):
+#      useGtk = True
+# if ( libname == 'prtview' ):
+#      useGtk = True
+# if ( libname == 'spritemodel' ):
+#      useGtk = True
+# if ( libname == 'model' ):
+#      useGtk = True
+# if ( libname == 'textool' ):
+#      useGtk = True
+# if ( libname == 'imagepng' ):
+#      usePNG = True
 
 
+useJPEG = True
+useGtk = True
+useZ = True
+usePNG = True
 
 settings.SetupEnvironment( env, config['name'], useGtk = useGtk, useJPEG = useJPEG, useZ = useZ, usePNG = usePNG )
 proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) )
 
 settings.SetupEnvironment( env, config['name'], useGtk = useGtk, useJPEG = useJPEG, useZ = useZ, usePNG = usePNG )
 proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) )
diff --git a/config.py b/config.py
index 2134b07fecf1885eb243d4d59345b970191f23d4..07b6483e3676f4e4d89dbbf3994bd52812b00620 100644 (file)
--- a/config.py
+++ b/config.py
@@ -77,9 +77,8 @@ class Config:
                        Export( 'utils', 'settings', 'config' )
                        build_dir = os.path.join( 'build', config_name, 'radiant' )
                        BuildDir( build_dir, '.', duplicate = 0 )
                        Export( 'utils', 'settings', 'config' )
                        build_dir = os.path.join( 'build', config_name, 'radiant' )
                        BuildDir( build_dir, '.', duplicate = 0 )
-                       # left out jpeg6, splines (FIXME: I think jpeg6 is not used at all, can trash?)
                        lib_objects = []
                        lib_objects = []
-                       for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
+                       for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]:
                                Export( 'project' )
                                lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
                        Export( 'lib_objects' )
                                Export( 'project' )
                                lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
                        Export( 'lib_objects' )
@@ -88,7 +87,7 @@ class Config:
 
                        # PIC versions of the libs for the modules
                        shlib_objects_extra = {}
 
                        # PIC versions of the libs for the modules
                        shlib_objects_extra = {}
-                       for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]:
+                       for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/splines/splines.vcproj' ]:
                                ( libpath, libname ) = os.path.split( project )
                                libname = os.path.splitext( libname )[0]
                                config['shared'] = True
                                ( libpath, libname ) = os.path.split( project )
                                libname = os.path.splitext( libname )[0]
                                config['shared'] = True
@@ -108,8 +107,7 @@ class Config:
                                         'plugins/imagewal/imagewal.vcproj',
                                         'plugins/imagem8/imagem8.vcproj',
                                         'plugins/spritemodel/spritemodel.vcproj',
                                         'plugins/imagewal/imagewal.vcproj',
                                         'plugins/imagem8/imagem8.vcproj',
                                         'plugins/spritemodel/spritemodel.vcproj',
-                                        'plugins/textool/TexTool.vcproj',
-                                       # 'plugins/sample/sample.vcproj',
+                                        'plugins/textool/textool.vcproj',
                                         'plugins/map/map.vcproj',
                                         'plugins/mapxml/mapxml.vcproj',
                                         'plugins/shaders/shaders.vcproj',
                                         'plugins/map/map.vcproj',
                                         'plugins/mapxml/mapxml.vcproj',
                                         'plugins/shaders/shaders.vcproj',
@@ -117,32 +115,35 @@ class Config:
                                         'plugins/surface_ufoai/surface_ufoai.vcproj',
                                         'plugins/surface_quake2/surface_quake2.vcproj',
                                         'plugins/surface_heretic2/surface_heretic2.vcproj',
                                         'plugins/surface_ufoai/surface_ufoai.vcproj',
                                         'plugins/surface_quake2/surface_quake2.vcproj',
                                         'plugins/surface_heretic2/surface_heretic2.vcproj',
-                                       # FIXME Needs splines
-                                       # 'contrib/camera/camera.vcproj',
-
-                                       # FIXME What is this? Empty dir for me - remove me?
-                                       # 'contrib/patches/patches.vcproj',
-                                       # 'plugins/archivewad/archivewad.vcproj',
-
-                                        'contrib/prtview/PrtView.vcproj',
+                                        'contrib/camera/camera.vcproj',
+                                        'contrib/prtview/prtview.vcproj',
                                         'contrib/hydratoolz/hydratoolz.vcproj',
                                         'contrib/hydratoolz/hydratoolz.vcproj',
-                                        'contrib/bobtoolz/bobToolz_gtk.vcproj',
+                                        'contrib/bobtoolz/bobtoolz.vcproj',
                                         'contrib/gtkgensurf/gtkgensurf.vcproj',
                                         'contrib/ufoai/ufoai.vcproj',
                                         'contrib/bkgrnd2d/bkgrnd2d.vcproj'
                                 ]:
                                ( libpath, libname ) = os.path.split( project )
                                libname = os.path.splitext( libname )[0]
                                         'contrib/gtkgensurf/gtkgensurf.vcproj',
                                         'contrib/ufoai/ufoai.vcproj',
                                         'contrib/bkgrnd2d/bkgrnd2d.vcproj'
                                 ]:
                                ( libpath, libname ) = os.path.split( project )
                                libname = os.path.splitext( libname )[0]
-                               shlib_objects = shlib_objects_extra['synapse']
-                               if ( libname == 'entity' ):
+                               # The old code assigned shlib_objects to shlib_objects_extra['synapse'],
+                               # and this resulted in a non-copy.  Stuff is added to shlib_objects below.
+                               # So we need the explicit copy so we don't modify shlib_objects_extra['synapse'].
+                               shlib_objects = shlib_objects_extra['synapse'][:]
+                               if ( libname == 'camera' ):
+                                       shlib_objects += shlib_objects_extra['splines']
+                               elif ( libname == 'entity' ):
                                        shlib_objects += shlib_objects_extra['mathlib']
                                        shlib_objects += shlib_objects_extra['mathlib']
+                               elif ( libname == 'map' ):
+                                       shlib_objects += shlib_objects_extra['cmdlib']
                                elif ( libname == 'model' ):
                                        shlib_objects += shlib_objects_extra['picomodel']
                                elif ( libname == 'model' ):
                                        shlib_objects += shlib_objects_extra['picomodel']
-#                              elif ( libname == 'spritemodel' ):
-#                                      shlib_objects += shlib_objects_extra['mathlib']
-#                              elif ( libname == 'TexTool' ):
-#                                      shlib_objects += shlib_objects_extra['mathlib']
-                               elif ( libname == 'map' ):
+                                       shlib_objects += shlib_objects_extra['mathlib']
+                               elif ( libname == 'spritemodel' ):
+                                       shlib_objects += shlib_objects_extra['mathlib']
+                               elif ( libname == 'textool' ):
+                                       shlib_objects += shlib_objects_extra['mathlib']
+                               elif ( libname == 'bobtoolz' ):
+                                       shlib_objects += shlib_objects_extra['mathlib']
                                        shlib_objects += shlib_objects_extra['cmdlib']
                                Export( 'project', 'shlib_objects' )
                                module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
                                        shlib_objects += shlib_objects_extra['cmdlib']
                                Export( 'project', 'shlib_objects' )
                                module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
@@ -158,7 +159,7 @@ class Config:
                        build_dir = os.path.join( 'build', config_name, 'q3map2' )
                        BuildDir( build_dir, '.', duplicate = 0 )
                        lib_objects = []
                        build_dir = os.path.join( 'build', config_name, 'q3map2' )
                        BuildDir( build_dir, '.', duplicate = 0 )
                        lib_objects = []
-                       for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib_VC9.vcproj' ]:
+                       for project in [ 'tools/quake3/common/quake3-common.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
                                Export( 'project' )
                                lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
                        Export( 'lib_objects' )
                                Export( 'project' )
                                lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
                        Export( 'lib_objects' )
@@ -275,7 +276,7 @@ class Config:
                if ( self.platform == 'Windows' ):
                        backup_cwd = os.getcwd()
                        for lib_archive in [
                if ( self.platform == 'Windows' ):
                        backup_cwd = os.getcwd()
                        for lib_archive in [
-                               'gtk+-bundle-2.16.6-20100912-2-win32.zip',
+                               'gtk+-bundle-2.16.6-20100912-3-win32.zip',
                                'gtkglext-1.2.0-3-win32.zip',
                                'libxml2-2.7.3-2-win32.zip',
                                'jpeg-8c-4-win32.zip',
                                'gtkglext-1.2.0-3-win32.zip',
                                'libxml2-2.7.3-2-win32.zip',
                                'jpeg-8c-4-win32.zip',
diff --git a/contrib/bkgrnd2d/bkgrnd2d.def b/contrib/bkgrnd2d/bkgrnd2d.def
index fa90fdb1dcbc383229e422d502cf43b174a25921..30f9b0b31945e4eae687a5e518dcf3401ab1009c 100644 (file)
--- a/contrib/bkgrnd2d/bkgrnd2d.def
+++ b/contrib/bkgrnd2d/bkgrnd2d.def
@@ -1,7 +1,6 @@
 ; bkgrnd2d.def : Declares the module parameters for the DLL.
 
 LIBRARY      "BKGRND2D"
 ; bkgrnd2d.def : Declares the module parameters for the DLL.
 
 LIBRARY      "BKGRND2D"
-DESCRIPTION  'BKGRND2D Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj
new file mode 100644 (file)
index 0000000..07a8a14
--- /dev/null
+++ b/contrib/bkgrnd2d/bkgrnd2d.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="bkgrnd2d"\r
+       ProjectGUID="{D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="bkgrnd2d.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="bkgrnd2d.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bkgrnd2d.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bkgrnd2d.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date b/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date
deleted file mode 100644 (file)
index 8453d9c..0000000
--- a/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="bkgrnd2d" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="bkgrnd2d" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\bkgrnd2d.cpp">
-                       </File>
-                       <File RelativePath=".\bkgrnd2d.def">
-                       </File>
-                       <File RelativePath=".\dialog.cpp">
-                       </File>
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\bkgrnd2d.h">
-                       </File>
-                       <File RelativePath=".\dialog.h">
-                       </File>
-                       <File RelativePath=".\plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp
index 2529bab609d39ed86a49c02d1a4d40f86bdceb80..7b8a2137144c8be9521cc9a3d3df50a15e89b8e6 100644 (file)
--- a/contrib/bkgrnd2d/dialog.cpp
+++ b/contrib/bkgrnd2d/dialog.cpp
@@ -36,6 +36,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // spaces to make label nice and big
 #define NO_FILE_MSG "        (no file loaded)        "
 
 // spaces to make label nice and big
 #define NO_FILE_MSG "        (no file loaded)        "
 
+#ifdef _WIN32
+  // TTimo: THIS IS UGLY
+#define snprintf _snprintf
+#endif
+
 static GtkWidget *pDialogWnd;
 static GtkWidget *pNotebook;
 static GtkTooltips *pTooltips;
 static GtkWidget *pDialogWnd;
 static GtkWidget *pNotebook;
 static GtkTooltips *pTooltips;
diff --git a/contrib/bobtoolz/DEntity.cpp b/contrib/bobtoolz/DEntity.cpp
index a0c44a894b31b2f5994560ac0ea7bbacb0d16e5c..ca035b830770115cc74afeb16101017ba6c852ea 100644 (file)
--- a/contrib/bobtoolz/DEntity.cpp
+++ b/contrib/bobtoolz/DEntity.cpp
@@ -303,7 +303,7 @@ void DEntity::SelectBrushes(bool *selectList)
 
        g_FuncTable.m_pfnAllocateActiveBrushHandles();
 
 
        g_FuncTable.m_pfnAllocateActiveBrushHandles();
 
-       for(std::list<DBrush *>::const_iterator pBrush=brushList.begin(); pBrush!=brushList.end(); pBrush++)
+       for(list<DBrush *>::const_iterator pBrush=brushList.begin(); pBrush!=brushList.end(); pBrush++)
        {
                if(selectList[(*pBrush)->m_nBrushID])
                        g_FuncTable.m_pfnSelectBrush((*pBrush)->QER_brush);
        {
                if(selectList[(*pBrush)->m_nBrushID])
                        g_FuncTable.m_pfnSelectBrush((*pBrush)->QER_brush);
diff --git a/contrib/bobtoolz/DMap.cpp b/contrib/bobtoolz/DMap.cpp
index 0bbaafb8dc7911146dd387814c06dc8163d8e8d3..5d9359594372aa8d9e0a032252e53346c6464407 100644 (file)
--- a/contrib/bobtoolz/DMap.cpp
+++ b/contrib/bobtoolz/DMap.cpp
@@ -40,7 +40,7 @@ DMap::~DMap()
        ClearEntities();
 }
 
        ClearEntities();
 }
 
-DEntity* DMap::AddEntity(const char *classname, int ID)
+DEntity* DMap::AddEntity(char *classname, int ID)
 {
        DEntity* newEntity;
        if(ID == -1)
 {
        DEntity* newEntity;
        if(ID == -1)
diff --git a/contrib/bobtoolz/DMap.h b/contrib/bobtoolz/DMap.h
index b63cafd6c9053f42cd405895dd605c13c5fa0423..60f58543ec6beb0f1ecd7019b16b25b14b43ad47 100644 (file)
--- a/contrib/bobtoolz/DMap.h
+++ b/contrib/bobtoolz/DMap.h
@@ -43,7 +43,7 @@ public:
        void ClearEntities();
 
        DEntity* DMap::GetEntityForID(int ID);
        void ClearEntities();
 
        DEntity* DMap::GetEntityForID(int ID);
-       DEntity* AddEntity(const char* classname = "worldspawn", int ID = -1);
+       DEntity* AddEntity(char* classname = "worldspawn", int ID = -1);
 
        list<DEntity*> entityList;
 
 
        list<DEntity*> entityList;
 
diff --git a/contrib/bobtoolz/DVisDrawer.cpp b/contrib/bobtoolz/DVisDrawer.cpp
index 318b7bc86a73ee9ea777aaa877efc5bdc03d8f9d..c03a9262b950ff2c375b53f83df87f3a62755712 100644 (file)
--- a/contrib/bobtoolz/DVisDrawer.cpp
+++ b/contrib/bobtoolz/DVisDrawer.cpp
@@ -162,7 +162,7 @@ void DVisDrawer::UnRegister()
        m_bHooked = FALSE;
 }
 
        m_bHooked = FALSE;
 }
 
-void DVisDrawer::SetList(std::list<DWinding*> *pointList)
+void DVisDrawer::SetList(list<DWinding*> *pointList)
 {
        if(m_list)
                ClearPoints();
 {
        if(m_list)
                ClearPoints();
diff --git a/contrib/bobtoolz/bobToolz.def b/contrib/bobtoolz/bobToolz.def
deleted file mode 100644 (file)
index c22c76d..0000000
--- a/contrib/bobtoolz/bobToolz.def
+++ /dev/null
@@ -1,8 +0,0 @@
-; plugin.def : Declares the module parameters for the DLL.
-
-LIBRARY      "bobToolz"
-; DESCRIPTION  'bobToolz Windows Dynamic Link Library'
-
-EXPORTS
-    ; Explicit exports can go here
-       Synapse_EnumerateInterfaces @1
diff --git a/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date b/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date
deleted file mode 100644 (file)
index bcdf2d7..0000000
--- a/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="bobToolz_gtk" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="bobToolz_gtk" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\bobToolz-GTK.cpp">
-                       </File>
-                       <File RelativePath=".\bobtoolz-gtk.rc">
-                       </File>
-                       <File RelativePath=".\bobToolz.def">
-                       </File>
-                       <File RelativePath=".\bsploader.cpp">
-                       </File>
-                       <File RelativePath=".\cportals.cpp">
-                       </File>
-                       <File RelativePath=".\DBobView.cpp">
-                       </File>
-                       <File RelativePath=".\DBrush.cpp">
-                       </File>
-                       <File RelativePath=".\DEntity.cpp">
-                       </File>
-                       <File RelativePath=".\DEPair.cpp">
-                       </File>
-                       <File RelativePath=".\DListener.cpp">
-                       </File>
-                       <File RelativePath=".\DMap.cpp">
-                       </File>
-                       <File RelativePath=".\DPatch.cpp">
-                       </File>
-                       <File RelativePath=".\DPlane.cpp">
-                       </File>
-                       <File RelativePath=".\DPoint.cpp">
-                       </File>
-                       <File RelativePath=".\DShape.cpp">
-                       </File>
-                       <File RelativePath=".\DTrainDrawer.cpp">
-                       </File>
-                       <File RelativePath=".\DTreePlanter.cpp">
-                       </File>
-                       <File RelativePath=".\DVisDrawer.cpp">
-                       </File>
-                       <File RelativePath=".\DWinding.cpp">
-                       </File>
-                       <File RelativePath=".\funchandlers-GTK.cpp">
-                       </File>
-                       <File RelativePath=".\lists.cpp">
-                       </File>
-                       <File RelativePath=".\misc.cpp">
-                       </File>
-                       <File RelativePath=".\ScriptParser.cpp">
-                       </File>
-                       <File RelativePath=".\shapes.cpp">
-                       </File>
-                       <File RelativePath=".\StdAfx.cpp">
-                       </File>
-                       <File RelativePath=".\visfind.cpp">
-                       </File>
-                       <Filter Name="dialogs">
-                               <File RelativePath=".\dialogs\dialogs-gtk.cpp">
-                               </File>
-                       </Filter>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\bsploader.h">
-                       </File>
-                       <File RelativePath=".\CPortals.h">
-                       </File>
-                       <File RelativePath=".\DBobView.h">
-                       </File>
-                       <File RelativePath=".\DBrush.h">
-                       </File>
-                       <File RelativePath=".\DEntity.h">
-                       </File>
-                       <File RelativePath=".\DEPair.h">
-                       </File>
-                       <File RelativePath=".\DListener.h">
-                       </File>
-                       <File RelativePath=".\DMap.h">
-                       </File>
-                       <File RelativePath=".\DPatch.h">
-                       </File>
-                       <File RelativePath=".\DPlane.h">
-                       </File>
-                       <File RelativePath=".\DPoint.h">
-                       </File>
-                       <File RelativePath=".\DShape.h">
-                       </File>
-                       <File RelativePath=".\DTrainDrawer.h">
-                       </File>
-                       <File RelativePath=".\DTreePlanter.h">
-                       </File>
-                       <File RelativePath=".\DVisDrawer.h">
-                       </File>
-                       <File RelativePath=".\DWinding.h">
-                       </File>
-                       <File RelativePath=".\funchandlers.h">
-                       </File>
-                       <File RelativePath=".\lists.h">
-                       </File>
-                       <File RelativePath=".\misc.h">
-                       </File>
-                       <File RelativePath=".\res\plugin.rc2">
-                       </File>
-                       <File RelativePath=".\resource-GTK.h">
-                       </File>
-                       <File RelativePath=".\shapes.h">
-                       </File>
-                       <File RelativePath=".\StdAfx.h">
-                       </File>
-                       <File RelativePath=".\visfind.h">
-                       </File>
-                       <Filter Name="dialog - headers">
-                               <File RelativePath=".\dialogs\dialogs-gtk.h">
-                               </File>
-                       </Filter>
-                       <Filter Name="interface">
-                               <File RelativePath="..\..\include\iUI.h">
-                               </File>
-                               <File RelativePath="..\..\include\qerplugin.h">
-                               </File>
-                               <File RelativePath="..\..\include\qertypes.h">
-                               </File>
-                       </Filter>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/contrib/bobtoolz/bobtoolz.def b/contrib/bobtoolz/bobtoolz.def
new file mode 100644 (file)
index 0000000..1ffb72d
--- /dev/null
+++ b/contrib/bobtoolz/bobtoolz.def
@@ -0,0 +1,7 @@
+; plugin.def : Declares the module parameters for the DLL.
+
+LIBRARY      "bobToolz"
+
+EXPORTS
+    ; Explicit exports can go here
+       Synapse_EnumerateInterfaces @1
diff --git a/contrib/bobtoolz/bobtoolz.vcproj b/contrib/bobtoolz/bobtoolz.vcproj
new file mode 100644 (file)
index 0000000..d79a8a3
--- /dev/null
+++ b/contrib/bobtoolz/bobtoolz.vcproj
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="bobtoolz"\r
+       ProjectGUID="{302086A7-5C73-42A4-8591-F5C9336EC911}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib libxml2.lib synapse.lib mathlib.lib cmdlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="bobtoolz.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib libxml2.lib synapse.lib mathlib.lib cmdlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="bobtoolz.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bobToolz-GTK.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bobtoolz.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bsploader.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\cportals.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ctftoolz.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DBobView.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DBrush.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DEntity.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DEPair.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DListener.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DMap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DPatch.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DPlane.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DPoint.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DShape.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DTrainDrawer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DTreePlanter.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DVisDrawer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\DWinding.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\funchandlers-GTK.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lists.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ScriptParser.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\shapes.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StdAfx.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\visfind.cpp"\r
+                               >\r
+                       </File>\r
+                       <Filter\r
+                               Name="dialogs"\r
+                               Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\dialogs\dialogs-gtk.cpp"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp
index a0490b46ff65addb886496fa4a42841b2274be1c..b1929f3858a3eab93c0339947240dde475eac76a 100644 (file)
--- a/contrib/bobtoolz/misc.cpp
+++ b/contrib/bobtoolz/misc.cpp
@@ -180,7 +180,7 @@ char* UnixToDosPath(char* path)
 
 const char* ExtractFilename(const char* path)
 {
 
 const char* ExtractFilename(const char* path)
 {
-       char* p = strrchr(path, '/');
+       const char* p = strrchr(path, '/');
        if(!p)
        {
                p = strrchr(path, '\\');
        if(!p)
        {
                p = strrchr(path, '\\');
diff --git a/contrib/gtkgensurf/bitmap.cpp b/contrib/gtkgensurf/bitmap.cpp
index 9955e8d5575942cc8f1f93d2a11a9ae1bb34456f..bde2595d6c6bc8d75500a9f501f86613bc94271e 100644 (file)
--- a/contrib/gtkgensurf/bitmap.cpp
+++ b/contrib/gtkgensurf/bitmap.cpp
@@ -19,6 +19,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#ifdef _WIN32
+// cough, cough
+typedef __int32 int32_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int32 uint32_t;
+typedef __int16 int16_t;
+#endif
+
 #include <math.h>
 #include "gensurf.h"
 
 #include <math.h>
 #include "gensurf.h"
 
diff --git a/contrib/gtkgensurf/dec.cpp b/contrib/gtkgensurf/dec.cpp
index e651d7418ec461d8ac7227b9d13c0e44327e7a11..8a61b2f700e5df06cb53ab463046e641e68054f0 100644 (file)
--- a/contrib/gtkgensurf/dec.cpp
+++ b/contrib/gtkgensurf/dec.cpp
@@ -441,7 +441,7 @@ int tricall(int NumNodes, NODE *Node, int *NumTris, TRI **inTri, TRI **Tri, cons
        out.edgelist           = (int *) NULL;   /* Needed only if -e switch used. */
        out.edgemarkerlist     = (int *) NULL;   /* Needed if -e used and -B not used. */
 
        out.edgelist           = (int *) NULL;   /* Needed only if -e switch used. */
        out.edgemarkerlist     = (int *) NULL;   /* Needed if -e used and -B not used. */
 
-       triangulate(Options, &in, &out, NULL);
+       triangulate((char *) Options, &in, &out, NULL);
 
        NumTris[0] = out.numberoftriangles;
        *Tri = (TRI *) malloc(NumTris[0] * sizeof(TRI));
 
        NumTris[0] = out.numberoftriangles;
        *Tri = (TRI *) malloc(NumTris[0] * sizeof(TRI));
diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp
index 01df80b8a686728980f1b40d915fae696084b395..a089ed0a7118817a26cac76b165e8d39362c1f14 100644 (file)
--- a/contrib/gtkgensurf/gendlgs.cpp
+++ b/contrib/gtkgensurf/gendlgs.cpp
@@ -913,7 +913,7 @@ static void bitmap_browse (GtkWidget *widget, gpointer data)
   {
     strcpy (gbmp.name, filename);
 
   {
     strcpy (gbmp.name, filename);
 
-    ptr = strrchr (filename, G_DIR_SEPARATOR);
+    ptr = (char *) strrchr (filename, G_DIR_SEPARATOR);
     if (ptr != NULL)
     {
       *(ptr+1) = '\0';
     if (ptr != NULL)
     {
       *(ptr+1) = '\0';
diff --git a/contrib/gtkgensurf/gensurf.def b/contrib/gtkgensurf/gensurf.def
deleted file mode 100644 (file)
index e3152e8..0000000
--- a/contrib/gtkgensurf/gensurf.def
+++ /dev/null
@@ -1,8 +0,0 @@
-; gensurf.def : Declares the module parameters for the DLL.
-
-LIBRARY      "gensurf"
-DESCRIPTION  'gensurf Windows Dynamic Link Library'
-
-EXPORTS
-    ; Explicit exports can go here
-       Synapse_EnumerateInterfaces @1
diff --git a/contrib/gtkgensurf/gtkgensurf.def b/contrib/gtkgensurf/gtkgensurf.def
new file mode 100644 (file)
index 0000000..89b3812
--- /dev/null
+++ b/contrib/gtkgensurf/gtkgensurf.def
@@ -0,0 +1,7 @@
+; gtkgensurf.def : Declares the module parameters for the DLL.
+
+LIBRARY      "gtkgensurf"
+
+EXPORTS
+    ; Explicit exports can go here
+       Synapse_EnumerateInterfaces @1
diff --git a/contrib/gtkgensurf/gtkgensurf.vcproj b/contrib/gtkgensurf/gtkgensurf.vcproj
new file mode 100644 (file)
index 0000000..58f8b83
--- /dev/null
+++ b/contrib/gtkgensurf/gtkgensurf.vcproj
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="gtkgensurf"\r
+       ProjectGUID="{E37A9846-84FC-48F8-9880-954C5D9F8ED0}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="gtkgensurf.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="gtkgensurf.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\bitmap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dec.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\face.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\font.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gendlgs.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\genmap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gensurf.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gtkgensurf.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\heretic.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\triangle.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\view.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date b/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date
deleted file mode 100644 (file)
index 059d57a..0000000
--- a/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="gtkgensurf" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="gtkgensurf" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\bitmap.cpp">
-                       </File>
-                       <File RelativePath=".\dec.cpp">
-                       </File>
-                       <File RelativePath=".\face.cpp">
-                       </File>
-                       <File RelativePath=".\font.cpp">
-                       </File>
-                       <File RelativePath=".\gendlgs.cpp">
-                       </File>
-                       <File RelativePath=".\genmap.cpp">
-                       </File>
-                       <File RelativePath=".\gensurf.cpp">
-                       </File>
-                       <File RelativePath=".\gensurf.def">
-                       </File>
-                       <File RelativePath=".\heretic.cpp">
-                       </File>
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-                       <File RelativePath=".\triangle.c">
-                       </File>
-                       <File RelativePath=".\view.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\gendlgs.h">
-                       </File>
-                       <File RelativePath=".\gensurf.h">
-                       </File>
-                       <File RelativePath=".\triangle.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/contrib/hydratoolz/hydratoolz.def b/contrib/hydratoolz/hydratoolz.def
index c48e519a55c7d6bd30100d8acd12808d262a5290..99afcb5ebefa1c1a7bc6faa6cfa734a10e73ed02 100644 (file)
--- a/contrib/hydratoolz/hydratoolz.def
+++ b/contrib/hydratoolz/hydratoolz.def
@@ -1,7 +1,6 @@
 ; fgd.def : Declares the module parameters for the DLL.
 
 LIBRARY      "HydraToolz"
 ; fgd.def : Declares the module parameters for the DLL.
 
 LIBRARY      "HydraToolz"
-DESCRIPTION  'HydraToolz Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/contrib/hydratoolz/hydratoolz.vcproj b/contrib/hydratoolz/hydratoolz.vcproj
new file mode 100644 (file)
index 0000000..b191cc3
--- /dev/null
+++ b/contrib/hydratoolz/hydratoolz.vcproj
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="hydratoolz"\r
+       ProjectGUID="{4E63003A-6B5D-4076-8ADF-D5A94809CE32}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="hydratoolz.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="hydratoolz.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\hydratoolz.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/hydratoolz/hydratoolz.vcproj.out-of-date b/contrib/hydratoolz/hydratoolz.vcproj.out-of-date
deleted file mode 100644 (file)
index f0d5ecb..0000000
--- a/contrib/hydratoolz/hydratoolz.vcproj.out-of-date
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="hydratoolz" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="hydratoolz" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\hydratoolz.def">
-                       </File>
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-                       <File RelativePath=".\plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/contrib/prtview/PrtView.def b/contrib/prtview/PrtView.def
deleted file mode 100644 (file)
index 24f945d..0000000
--- a/contrib/prtview/PrtView.def
+++ /dev/null
@@ -1,8 +0,0 @@
-; PrtView.def : Declares the module parameters for the DLL.
-
-LIBRARY      "PrtView"
-; DESCRIPTION  'PrtView Windows Dynamic Link Library'
-
-EXPORTS
-    ; Explicit exports can go here
-       Synapse_EnumerateInterfaces @1
diff --git a/contrib/prtview/PrtView.txt b/contrib/prtview/PrtView.txt
index b88e610cf9d15afe22b8f94e99d54f837461518f..fbadabea2fad166c562aabc1b7ae3ed59cda751b 100644 (file)
--- a/contrib/prtview/PrtView.txt
+++ b/contrib/prtview/PrtView.txt
@@ -1,4 +1,4 @@
-Put PrtView.dll in the Q3Radiant plugins directory.
+Put prtview.dll in the Q3Radiant plugins directory.
 
 This program is pretty self explanitary, but point needs to
 be mentioned.  In the configuration menu for 3D view options,
 
 This program is pretty self explanitary, but point needs to
 be mentioned.  In the configuration menu for 3D view options,
diff --git a/contrib/prtview/PrtView.vcproj.out-of-date b/contrib/prtview/PrtView.vcproj.out-of-date
deleted file mode 100644 (file)
index 9ecb4e3..0000000
--- a/contrib/prtview/PrtView.vcproj.out-of-date
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="PrtView" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="PrtView" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\AboutDialog.cpp">
-                       </File>
-                       <File RelativePath=".\ConfigDialog.cpp">
-                       </File>
-                       <File RelativePath=".\LoadPortalFileDialog.cpp">
-                       </File>
-                       <File RelativePath=".\portals.cpp">
-                       </File>
-                       <File RelativePath=".\prtview.cpp">
-                       </File>
-                       <File RelativePath=".\PrtView.def">
-                       </File>
-                       <File RelativePath=".\PrtView.rc">
-                       </File>
-                       <File RelativePath=".\stdafx.cpp">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" UsePrecompiledHeader="1"/>
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" UsePrecompiledHeader="1"/>
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\AboutDialog.h">
-                       </File>
-                       <File RelativePath=".\ConfigDialog.h">
-                       </File>
-                       <File RelativePath=".\LoadPortalFileDialog.h">
-                       </File>
-                       <File RelativePath=".\Portals.h">
-                       </File>
-                       <File RelativePath=".\PrtView.h">
-                       </File>
-                       <File RelativePath=".\PrtView2.h">
-                       </File>
-                       <File RelativePath=".\Resource.h">
-                       </File>
-                       <File RelativePath=".\StdAfx.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" Name="Resource Files">
-                       <File RelativePath=".\res\PrtView.rc2">
-                       </File>
-               </Filter>
-               <File RelativePath=".\ReadMe.txt">
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/contrib/prtview/prtview.def b/contrib/prtview/prtview.def
new file mode 100644 (file)
index 0000000..43318bd
--- /dev/null
+++ b/contrib/prtview/prtview.def
@@ -0,0 +1,7 @@
+; PrtView.def : Declares the module parameters for the DLL.
+
+LIBRARY      "PrtView"
+
+EXPORTS
+    ; Explicit exports can go here
+       Synapse_EnumerateInterfaces @1
diff --git a/contrib/prtview/prtview.vcproj b/contrib/prtview/prtview.vcproj
new file mode 100644 (file)
index 0000000..ad897d1
--- /dev/null
+++ b/contrib/prtview/prtview.vcproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="prtview"\r
+       ProjectGUID="{AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4800;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="prtview.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4800;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="prtview.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\AboutDialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ConfigDialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LoadPortalFileDialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\portals.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\prtview.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\prtview.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\stdafx.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/ufoai/ufoai.def b/contrib/ufoai/ufoai.def
index 764cbb4fec9f0174c37e30bc4cdab8fa6d408d79..9b54378befecbb130a00f5e70b54f91ef1ef120f 100644 (file)
--- a/contrib/ufoai/ufoai.def
+++ b/contrib/ufoai/ufoai.def
@@ -1,7 +1,6 @@
 ; ufoai.def : Declares the module parameters for the DLL.
 
 LIBRARY      "UFOAI"
 ; ufoai.def : Declares the module parameters for the DLL.
 
 LIBRARY      "UFOAI"
-DESCRIPTION  'UFOAI Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/contrib/ufoai/ufoai.vcproj b/contrib/ufoai/ufoai.vcproj
new file mode 100644 (file)
index 0000000..070940c
--- /dev/null
+++ b/contrib/ufoai/ufoai.vcproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="ufoai"\r
+       ProjectGUID="{850DD97C-B457-497D-B5F5-DA1904FAC5F9}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UFOAI_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="ufoai.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UFOAI_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="ufoai.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ufoai.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ufoai_filters.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/contrib/ufoai/ufoai.vcproj.out-of-date b/contrib/ufoai/ufoai.vcproj.out-of-date
deleted file mode 100644 (file)
index 438c657..0000000
--- a/contrib/ufoai/ufoai.vcproj.out-of-date
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="ufoai" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="ufoai" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-                       <File RelativePath=".\ufoai_filters.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\plugin.h">
-                       </File>
-                       <File RelativePath=".\ufoai_filters.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/gen.vcproj.out-of-date b/gen.vcproj.out-of-date
deleted file mode 100644 (file)
index d443b6e..0000000
--- a/gen.vcproj.out-of-date
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="gen" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="gen" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" WholeProgramOptimization="1">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <File RelativePath=".\include\aboutmsg.default">
-               </File>
-               <File RelativePath=".\gen.readme">
-                       <FileConfiguration Name="Debug|Win32">
-                               <Tool CommandLine="run_python.bat makeversion.py  " Name="VCCustomBuildTool" Outputs="include/version.h;include/aboutmsg.h"/>
-                       </FileConfiguration>
-                       <FileConfiguration Name="Release|Win32">
-                               <Tool CommandLine="run_python.bat makeversion.py  " Name="VCCustomBuildTool" Outputs="include/version.h;include/aboutmsg.h;include/RADIANT_MAJOR;include/RADIANT_MINOR"/>
-                       </FileConfiguration>
-               </File>
-               <File RelativePath=".\makeversion.py">
-               </File>
-               <File RelativePath=".\run_python.bat">
-               </File>
-               <File RelativePath=".\include\version.default">
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/eclassfgd/fgd.def b/plugins/eclassfgd/fgd.def
index 7ca58d79943106b335e422d4b910801c14785992..85249497a43f546772c8d044c1574b200907c983 100644 (file)
--- a/plugins/eclassfgd/fgd.def
+++ b/plugins/eclassfgd/fgd.def
@@ -1,7 +1,6 @@
 ; fgd.def : Declares the module parameters for the DLL.
 
 LIBRARY      "FGD"
 ; fgd.def : Declares the module parameters for the DLL.
 
 LIBRARY      "FGD"
-DESCRIPTION  'FGD Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/eclassfgd/fgd.vcproj b/plugins/eclassfgd/fgd.vcproj
new file mode 100644 (file)
index 0000000..a36b54e
--- /dev/null
+++ b/plugins/eclassfgd/fgd.vcproj
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="fgd"\r
+       ProjectGUID="{04213509-5ED3-4C74-B8A2-480BE6F48363}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="fgd.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="fgd.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\fgd.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/eclassfgd/fgd.vcproj.out-of-date b/plugins/eclassfgd/fgd.vcproj.out-of-date
deleted file mode 100644 (file)
index cacf1a1..0000000
--- a/plugins/eclassfgd/fgd.vcproj.out-of-date
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="fgd" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="fgd" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\fgd.def">
-                       </File>
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-                       <File RelativePath=".\plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/imagem8/imagem8.def b/plugins/imagem8/imagem8.def
index 74739a05c6507ca7f49a871811564f37a2731373..ce23debd2dac47875290abd37d6af8caea8e12b7 100644 (file)
--- a/plugins/imagem8/imagem8.def
+++ b/plugins/imagem8/imagem8.def
@@ -1,7 +1,6 @@
 ; imagem8.def : Declares the module parameters for the DLL.
 
 LIBRARY      "ImageM8"
 ; imagem8.def : Declares the module parameters for the DLL.
 
 LIBRARY      "ImageM8"
-DESCRIPTION  'ImageM8 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/imagem8/imagem8.vcproj b/plugins/imagem8/imagem8.vcproj
new file mode 100644 (file)
index 0000000..b57e152
--- /dev/null
+++ b/plugins/imagem8/imagem8.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="imagem8"\r
+       ProjectGUID="{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="imagem8.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="imagem8.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\imagem8.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\imagem8.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\m32.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\m8.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/imagem8/imagem8.vcproj.out-of-date b/plugins/imagem8/imagem8.vcproj.out-of-date
deleted file mode 100644 (file)
index a0f2bcf..0000000
--- a/plugins/imagem8/imagem8.vcproj.out-of-date
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="imagem8" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="imagem8" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\imagem8.cpp">
-                       </File>
-                       <File RelativePath=".\m32.cpp">
-                       </File>
-                       <File RelativePath=".\m8.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\imagem8.h">
-                       </File>
-                       <File RelativePath=".\m32.h">
-                       </File>
-                       <File RelativePath=".\m8.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/imagewal/imagewal.def b/plugins/imagewal/imagewal.def
index 5101a0cc66887f9b9a128ccdc0928f6bef37bb7e..9d14c3589759db9f9b4eeabe07301b412d223abc 100644 (file)
--- a/plugins/imagewal/imagewal.def
+++ b/plugins/imagewal/imagewal.def
@@ -1,7 +1,6 @@
 ; imagewal.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Imagewal"
 ; imagewal.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Imagewal"
-DESCRIPTION  'Imagewal Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/imagewal/imagewal.vcproj b/plugins/imagewal/imagewal.vcproj
new file mode 100644 (file)
index 0000000..e5188ee
--- /dev/null
+++ b/plugins/imagewal/imagewal.vcproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="imagewal"\r
+       ProjectGUID="{8D3160AB-B386-4970-8146-826BC293CCB1}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="imagewal.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="imagewal.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\imagewal.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\imagewal.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\wal.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/imagewal/imagewal.vcproj.out-of-date b/plugins/imagewal/imagewal.vcproj.out-of-date
deleted file mode 100644 (file)
index f32026b..0000000
--- a/plugins/imagewal/imagewal.vcproj.out-of-date
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="imagewal" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="imagewal" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" Name="Source Files">
-                       <File RelativePath=".\imagewal.cpp">
-                       </File>
-                       <File RelativePath=".\imagewal.def">
-                       </File>
-                       <File RelativePath=".\wal.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl;fi;fd" Name="Header Files">
-                       <File RelativePath=".\imagewal.h">
-                       </File>
-                       <File RelativePath=".\wal.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/spritemodel/spritemodel.def b/plugins/spritemodel/spritemodel.def
index fcc9245f1c4cb7dfd98fdb20b26bd4d7611d400c..95a06f3bb2dab9b960906f62d7678d62dfdd6702 100644 (file)
--- a/plugins/spritemodel/spritemodel.def
+++ b/plugins/spritemodel/spritemodel.def
@@ -1,7 +1,6 @@
 ; md3model.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SPRITEMODEL"
 ; md3model.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SPRITEMODEL"
-DESCRIPTION  'SPRITEMODEL Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/spritemodel/spritemodel.vcproj b/plugins/spritemodel/spritemodel.vcproj
new file mode 100644 (file)
index 0000000..3ed3bd4
--- /dev/null
+++ b/plugins/spritemodel/spritemodel.vcproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="spritemodel"\r
+       ProjectGUID="{F291A09D-73BC-48FF-98EE-D672BBDE5C16}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib mathlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="spritemodel.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib mathlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="spritemodel.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\spritemodel.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\spritemodel.def"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/spritemodel/spritemodel.vcproj.out-of-date b/plugins/spritemodel/spritemodel.vcproj.out-of-date
deleted file mode 100644 (file)
index da6392f..0000000
--- a/plugins/spritemodel/spritemodel.vcproj.out-of-date
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="spritemodel" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="spritemodel" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\plugin.cpp">
-                       </File>
-                       <File RelativePath=".\spritemodel.cpp">
-                       </File>
-                       <File RelativePath=".\spritemodel.def">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\plugin.h">
-                       </File>
-                       <File RelativePath=".\spritemodel.h">
-                       </File>
-                       <Filter Name="API">
-                               <File RelativePath="..\..\include\ifilesystem.h">
-                               </File>
-                               <File RelativePath="..\..\include\igl.h">
-                               </File>
-                               <File RelativePath="..\..\include\imodel.h">
-                               </File>
-                               <File RelativePath="..\..\include\ishaders.h">
-                               </File>
-                               <File RelativePath="..\..\include\qerplugin.h">
-                               </File>
-                               <File RelativePath="..\..\include\qertypes.h">
-                               </File>
-                       </Filter>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-               <File RelativePath=".\Conscript">
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/surface_heretic2/surface_heretic2.def b/plugins/surface_heretic2/surface_heretic2.def
index 7f26db48cc9b6c8b66f111e7ac8b9fbdf21cb1d4..0924a861b5013e8681ffd78ce33c06aa0fe99185 100644 (file)
--- a/plugins/surface_heretic2/surface_heretic2.def
+++ b/plugins/surface_heretic2/surface_heretic2.def
@@ -1,7 +1,6 @@
 ; surface_heretic2.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Surface_Heretic2"
 ; surface_heretic2.def : Declares the module parameters for the DLL.
 
 LIBRARY      "Surface_Heretic2"
-DESCRIPTION  'Surface_Heretic2 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/surface_heretic2/surface_heretic2.vcproj b/plugins/surface_heretic2/surface_heretic2.vcproj
new file mode 100644 (file)
index 0000000..47ad7d6
--- /dev/null
+++ b/plugins/surface_heretic2/surface_heretic2.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="surface_heretic2"\r
+       ProjectGUID="{12932084-E212-45AB-B3BE-A2A5AEEBA581}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_HERETIC2_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4800;4101"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_heretic2.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_HERETIC2_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4800;4101"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_heretic2.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\surface_heretic2.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfacedialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfaceflagsdialog_heretic2.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfdlg_plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date b/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date
deleted file mode 100644 (file)
index 27a665e..0000000
--- a/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="surface_heretic2" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="surface_heretic2" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\surfacedialog.cpp">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_heretic2.cpp">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\surfacedialog.h">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_heretic2.h">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-               <File RelativePath="..\..\..\libxml2\win32\binaries-release\libxml2.lib">
-                       <FileConfiguration ExcludedFromBuild="true" Name="Debug|Win32">
-                               <Tool Name="VCCustomBuildTool"/>
-                       </FileConfiguration>
-               </File>
-               <File RelativePath="..\..\..\libxml2\win32\binaries-debug\libxml2.lib">
-                       <FileConfiguration ExcludedFromBuild="true" Name="Release|Win32">
-                               <Tool Name="VCCustomBuildTool"/>
-                       </FileConfiguration>
-               </File>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/surface_heretic2/surfacedialog.cpp b/plugins/surface_heretic2/surfacedialog.cpp
index 343ab291675338389675b02726420ba9e317883d..6a8663cc0ea3c7e2b70966f5c5e6c61cb58e9099 100644 (file)
--- a/plugins/surface_heretic2/surfacedialog.cpp
+++ b/plugins/surface_heretic2/surfacedialog.cpp
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "gtkr_vector.h"
 
 
 #include "gtkr_vector.h"
 
-std::vector<texdef_to_face_t> g_texdef_face_vector;
+vector<texdef_to_face_t> g_texdef_face_vector;
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
diff --git a/plugins/surface_quake2/surface_quake2.def b/plugins/surface_quake2/surface_quake2.def
index 0cec1f32f50fdf04027c5473e2be77bb71cc31bc..8f1435acf9da677a744318f731b35e57ec4c6f35 100644 (file)
--- a/plugins/surface_quake2/surface_quake2.def
+++ b/plugins/surface_quake2/surface_quake2.def
@@ -1,7 +1,6 @@
 ; surface_quake2.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE_QUAKE2"
 ; surface_quake2.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE_QUAKE2"
-DESCRIPTION  'SURFACE_QUAKE2 Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/surface_quake2/surface_quake2.vcproj b/plugins/surface_quake2/surface_quake2.vcproj
new file mode 100644 (file)
index 0000000..1e6fce6
--- /dev/null
+++ b/plugins/surface_quake2/surface_quake2.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="surface_quake2"\r
+       ProjectGUID="{32AB82AA-C781-4E5E-83A0-A164D371306F}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_QUAKE2_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_quake2.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_QUAKE2_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_quake2.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\surface_quake2.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfacedialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfaceflagsdialog_quake2.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfdlg_plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/surface_quake2/surface_quake2.vcproj.out-of-date b/plugins/surface_quake2/surface_quake2.vcproj.out-of-date
deleted file mode 100644 (file)
index b940f02..0000000
--- a/plugins/surface_quake2/surface_quake2.vcproj.out-of-date
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="surface_quake2" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="surface_quake2" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\surface_quake2.def">
-                       </File>
-                       <File RelativePath=".\surfacedialog.cpp">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_quake2.cpp">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\surfacedialog.h">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_quake2.h">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/surface_quake2/surfacedialog.cpp b/plugins/surface_quake2/surfacedialog.cpp
index 5c7efbf474a4e55875cbcfb3b742e0169e63440f..b1b7ec4c05db041ab0748a7756ba2a1696d0478a 100644 (file)
--- a/plugins/surface_quake2/surfacedialog.cpp
+++ b/plugins/surface_quake2/surfacedialog.cpp
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "gtkr_vector.h"
 
 
 #include "gtkr_vector.h"
 
-std::vector<texdef_to_face_t> g_texdef_face_vector;
+vector<texdef_to_face_t> g_texdef_face_vector;
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
diff --git a/plugins/surface_ufoai/surface_ufoai.def b/plugins/surface_ufoai/surface_ufoai.def
index 23669a7bccceb518e6c4463a109313967fbd806b..588ea28938395dbd498c947b4ceb24a795f42981 100644 (file)
--- a/plugins/surface_ufoai/surface_ufoai.def
+++ b/plugins/surface_ufoai/surface_ufoai.def
@@ -1,7 +1,6 @@
 ; surface_ufoai.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE_UFOAI"
 ; surface_ufoai.def : Declares the module parameters for the DLL.
 
 LIBRARY      "SURFACE_UFOAI"
-DESCRIPTION  'SURFACE_UFOAI Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/surface_ufoai/surface_ufoai.vcproj b/plugins/surface_ufoai/surface_ufoai.vcproj
new file mode 100644 (file)
index 0000000..0d9c35a
--- /dev/null
+++ b/plugins/surface_ufoai/surface_ufoai.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="surface_ufoai"\r
+       ProjectGUID="{F400371F-455F-4B6C-9F13-A2E57110E725}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_ufoai.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_UFOAI_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996;4244;4101;4800"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="surface_ufoai.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\surface_ufoai.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfacedialog.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfaceflagsdialog_ufoai.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\surfdlg_plugin.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date b/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date
deleted file mode 100644 (file)
index 1a69d66..0000000
--- a/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="surface_ufoai" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="surface_ufoai" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\surface_ufoai.def">
-                       </File>
-                       <File RelativePath=".\surfacedialog.cpp">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_ufoai.cpp">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.cpp">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\surfacedialog.h">
-                       </File>
-                       <File RelativePath=".\surfaceflagsdialog_ufoai.h">
-                       </File>
-                       <File RelativePath=".\surfdlg_plugin.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/surface_ufoai/surfacedialog.cpp b/plugins/surface_ufoai/surfacedialog.cpp
index dabe39b6afcefd5eaea89e3e50c5a70f687e82d3..a8fe23ee86eca0a33d81c6c993b947c93d304276 100644 (file)
--- a/plugins/surface_ufoai/surfacedialog.cpp
+++ b/plugins/surface_ufoai/surfacedialog.cpp
@@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "gtkr_vector.h"
 
 
 #include "gtkr_vector.h"
 
-std::vector<texdef_to_face_t> g_texdef_face_vector;
+vector<texdef_to_face_t> g_texdef_face_vector;
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
 
 inline texdef_to_face_t* get_texdef_face_list()
 {
diff --git a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp
index 6049ea46b1df625ae9e76922dfafb819847a27cc..47b18975a104deb1a9f3855c700d0c98b98c2e1c 100644 (file)
--- a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp
+++ b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp
@@ -33,6 +33,11 @@ GtkWidget *notebook1;
 // 32 bit is the max
 #define MAX_BUTTONS 32
 
 // 32 bit is the max
 #define MAX_BUTTONS 32
 
+#ifdef _WIN32
+  // TTimo: THIS IS UGLY
+#define snprintf _snprintf
+#endif
+
 GtkWidget *surface_buttons[MAX_BUTTONS];
 GtkWidget *content_buttons[MAX_BUTTONS];
 
 GtkWidget *surface_buttons[MAX_BUTTONS];
 GtkWidget *content_buttons[MAX_BUTTONS];
 
diff --git a/plugins/textool/TexTool.def b/plugins/textool/TexTool.def
deleted file mode 100644 (file)
index 95cbb27..0000000
--- a/plugins/textool/TexTool.def
+++ /dev/null
@@ -1,12 +0,0 @@
-; TexTool.def : Declares the module parameters for the DLL.
-
-LIBRARY      "TexTool"
-DESCRIPTION  'TexTool Windows Dynamic Link Library'
-
-EXPORTS
-    ; Explicit exports can go here
-       QERPlug_Init @1
-       QERPlug_GetName @2
-       QERPlug_GetCommandList @3
-       QERPlug_Dispatch @4
-       QERPlug_GetFuncTable @5
diff --git a/plugins/textool/TexTool.vcproj.out-of-date b/plugins/textool/TexTool.vcproj.out-of-date
deleted file mode 100644 (file)
index f1f6a83..0000000
--- a/plugins/textool/TexTool.vcproj.out-of-date
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="TexTool" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="TexTool" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Name="Source Files">
-                       <File RelativePath=".\2DView.cpp">
-                       </File>
-                       <File RelativePath=".\ControlPointsManager.cpp">
-                       </File>
-                       <File RelativePath=".\StdAfx.cpp">
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" UsePrecompiledHeader="1"/>
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" UsePrecompiledHeader="1"/>
-                               </FileConfiguration>
-                       </File>
-                       <File RelativePath=".\TexTool.cpp">
-                       </File>
-                       <File RelativePath=".\TexTool.def">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl" Name="Header Files">
-                       <File RelativePath=".\2DView.h">
-                       </File>
-                       <File RelativePath=".\ControlPointsManager.h">
-                       </File>
-                       <File RelativePath="..\..\Q3Radiant\QERTYPES.H">
-                       </File>
-                       <File RelativePath="..\common\mathlib.h">
-                       </File>
-                       <File RelativePath="..\..\Q3Radiant\qerplugin.h">
-                       </File>
-                       <File RelativePath=".\stdafx.h">
-                       </File>
-                       <Filter Filter="" Name="interfaces">
-                               <File RelativePath="..\..\Q3Radiant\ISelectedFace.h">
-                               </File>
-                               <File RelativePath="..\..\Q3Radiant\igl.h">
-                               </File>
-                               <File RelativePath="..\..\Q3Radiant\isurfaceplugin.h">
-                               </File>
-                       </Filter>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-                       <File RelativePath=".\TexTool.rc">
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/textool/textool.def b/plugins/textool/textool.def
new file mode 100644 (file)
index 0000000..b35f486
--- /dev/null
+++ b/plugins/textool/textool.def
@@ -0,0 +1,7 @@
+; textool.def : Declares the module parameters for the DLL.
+
+LIBRARY      "TexTool"
+
+EXPORTS
+    ; Explicit exports can go here
+       Synapse_EnumerateInterfaces @1
diff --git a/plugins/textool/textool.vcproj b/plugins/textool/textool.vcproj
new file mode 100644 (file)
index 0000000..f90f1c4
--- /dev/null
+++ b/plugins/textool/textool.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="textool"\r
+       ProjectGUID="{4F52DED4-285A-4E99-9C78-734D59E8ACD6}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib libxml2.lib synapse.lib mathlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="textool.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gtk-win32-2.0.lib libxml2.lib synapse.lib mathlib.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="textool.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\2DView.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ControlPointsManager.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StdAfx.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\TexTool.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\textool.def"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/vfspak/vfs.cpp b/plugins/vfspak/vfs.cpp
index 6779d231efb20769e029d2526fbc6cc95697e023..e64ee4f1a832907c632eb769e6277e4bb896bbab 100644 (file)
--- a/plugins/vfspak/vfs.cpp
+++ b/plugins/vfspak/vfs.cpp
@@ -405,7 +405,7 @@ void vfsInitDirectory (const char *path)
         if(name == NULL)
           break;
 
         if(name == NULL)
           break;
 
-        char *ext = strrchr (name, '.');
+        const char *ext = strrchr (name, '.');
         if ((ext == NULL) || (strcasecmp (ext, ".pak") != 0))
           continue;
 
         if ((ext == NULL) || (strcasecmp (ext, ".pak") != 0))
           continue;
 
diff --git a/plugins/vfspak/vfspak.def b/plugins/vfspak/vfspak.def
index 5172d2d874ee4b39fcd5933e0f8e9e5e1ad59280..36baca3f4e1f2ccacc89fcaccbccc7e264632918 100644 (file)
--- a/plugins/vfspak/vfspak.def
+++ b/plugins/vfspak/vfspak.def
@@ -1,7 +1,6 @@
 ; vfspak.def : Declares the module parameters for the DLL.
 
 LIBRARY      "VFSPAK"
 ; vfspak.def : Declares the module parameters for the DLL.
 
 LIBRARY      "VFSPAK"
-DESCRIPTION  'VFSPAK Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/vfspak/vfspak.vcproj b/plugins/vfspak/vfspak.vcproj
new file mode 100644 (file)
index 0000000..f45bdd3
--- /dev/null
+++ b/plugins/vfspak/vfspak.vcproj
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="vfspak"\r
+       ProjectGUID="{8BE599BF-6318-4B0C-AC3E-DE811676C63B}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="vfspak.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="vfspak.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\vfs.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vfspak.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vfspak.def"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/vfspak/vfspak.vcproj.out-of-date b/plugins/vfspak/vfspak.vcproj.out-of-date
deleted file mode 100644 (file)
index e39d942..0000000
--- a/plugins/vfspak/vfspak.vcproj.out-of-date
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="vfspak" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="vfspak" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" Name="Source Files">
-                       <File RelativePath=".\vfs.cpp">
-                       </File>
-                       <File RelativePath=".\vfspak.cpp">
-                       </File>
-                       <File RelativePath=".\vfspak.def">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl;fi;fd" Name="Header Files">
-                       <File RelativePath=".\vfs.h">
-                       </File>
-                       <File RelativePath=".\vfspak.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/plugins/vfswad/vfs.cpp b/plugins/vfswad/vfs.cpp
index b6e69823364a81d02be57eb7b908f9837c9126ea..5aca73a0d377dc1ec49f366c1ce374e9858068c3 100644 (file)
--- a/plugins/vfswad/vfs.cpp
+++ b/plugins/vfswad/vfs.cpp
@@ -380,7 +380,7 @@ void vfsInitDirectory (const char *path)
         if(name == NULL)
           break;
 
         if(name == NULL)
           break;
 
-        char *ext = strrchr (name, '.');
+        const char *ext = strrchr (name, '.');
         if ((ext == NULL) || (strcmp (ext, ".wad") != 0))
           continue;
 
         if ((ext == NULL) || (strcmp (ext, ".wad") != 0))
           continue;
 
diff --git a/plugins/vfswad/vfswad.def b/plugins/vfswad/vfswad.def
index 0515e470b384b4e8566a3f226f02d6518114c6f3..ef21fb84223e9848503a25ee115e9bebecaed8b6 100644 (file)
--- a/plugins/vfswad/vfswad.def
+++ b/plugins/vfswad/vfswad.def
@@ -1,7 +1,6 @@
 ; vfswad.def : Declares the module parameters for the DLL.
 
 LIBRARY      "vfswad"
 ; vfswad.def : Declares the module parameters for the DLL.
 
 LIBRARY      "vfswad"
-DESCRIPTION  'vfswad Windows Dynamic Link Library'
 
 EXPORTS
     ; Explicit exports can go here
 
 EXPORTS
     ; Explicit exports can go here
diff --git a/plugins/vfswad/vfswad.vcproj b/plugins/vfswad/vfswad.vcproj
new file mode 100644 (file)
index 0000000..b5df30d
--- /dev/null
+++ b/plugins/vfswad/vfswad.vcproj
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9.00"\r
+       Name="vfswad"\r
+       ProjectGUID="{18116120-2710-4DD8-B1AC-940D0BDB36EF}"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="0"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="vfswad.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)\install\modules"\r
+                       IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)"\r
+                       ConfigurationType="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="glib-2.0.lib libxml2.lib synapse.lib"\r
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"\r
+                               ModuleDefinitionFile="vfswad.def"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="src"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\unwad.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vfs.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vfswad.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vfswad.def"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/plugins/vfswad/vfswad.vcproj.out-of-date b/plugins/vfswad/vfswad.vcproj.out-of-date
deleted file mode 100644 (file)
index f44ee23..0000000
--- a/plugins/vfswad/vfswad.vcproj.out-of-date
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" ?><VisualStudioProject Name="vfswad" ProjectGUID="{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectType="Visual C++" RootNamespace="vfswad" Version="8.00">
-       <Platforms>
-               <Platform Name="Win32"/>
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Debug|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" BasicRuntimeChecks="3" DebugInformationFormat="4" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" MinimalRebuild="true" Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="3" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool GenerateDebugInformation="true" Name="VCLinkerTool" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-               <Configuration CharacterSet="2" ConfigurationType="1" IntermediateDirectory="$(ConfigurationName)" Name="Release|Win32" OutputDirectory="$(SolutionDir)\install\modules">
-                       <Tool Name="VCPreBuildEventTool"/>
-                       <Tool Name="VCCustomBuildTool"/>
-                       <Tool Name="VCXMLDataGeneratorTool"/>
-                       <Tool Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool Name="VCMIDLTool"/>
-                       <Tool AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLPort\stlport&quot;;&quot;$(SolutionDir)\..\gtk2\include&quot;;&quot;$(SolutionDir)\..\gtk2\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk2\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2\include&quot;" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" DisableSpecificWarnings="4996;4244;4267" Name="VCCLCompilerTool" PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" WarningLevel="3"/>
-                       <Tool Name="VCManagedResourceCompilerTool"/>
-                       <Tool Name="VCResourceCompilerTool"/>
-                       <Tool Name="VCPreLinkEventTool"/>
-                       <Tool EnableCOMDATFolding="2" GenerateDebugInformation="true" Name="VCLinkerTool" OptimizeReferences="2" TargetMachine="1"/>
-                       <Tool Name="VCALinkTool"/>
-                       <Tool Name="VCManifestTool"/>
-                       <Tool Name="VCXDCMakeTool"/>
-                       <Tool Name="VCBscMakeTool"/>
-                       <Tool Name="VCFxCopTool"/>
-                       <Tool Name="VCAppVerifierTool"/>
-                       <Tool Name="VCWebDeploymentTool"/>
-                       <Tool Name="VCPostBuildEventTool"/>
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" Name="Source Files">
-                       <File RelativePath=".\unwad.cpp">
-                       </File>
-                       <File RelativePath=".\vfs.cpp">
-                       </File>
-                       <File RelativePath=".\vfswad.cpp">
-                       </File>
-                       <File RelativePath=".\vfswad.def">
-                       </File>
-               </Filter>
-               <Filter Filter="h;hpp;hxx;hm;inl;fi;fd" Name="Header Files">
-                       <File RelativePath=".\unwad.h">
-                       </File>
-                       <File RelativePath=".\vfs.h">
-                       </File>
-                       <File RelativePath=".\vfswad.h">
-                       </File>
-               </Filter>
-               <Filter Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" Name="Resource Files">
-                       <File RelativePath=".\vfswad.txt">
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
\ No newline at end of file
diff --git a/radiant.sln b/radiant.sln
index 529feffdb0be19b7ee53cd75fd652feb2d31709b..9561a1db40a73e8c800ab1e1820ee161e5dca8ea 100644 (file)
--- a/radiant.sln
+++ b/radiant.sln
@@ -9,6 +9,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant.
                {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}
        EndProjectSection
 EndProject
                {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}"
+       ProjectSection(ProjectDependencies) = postProject
+               {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16}
+               {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798}
+               {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
+               {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B}
+               {DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E}
+               {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} = {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}
+       EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3-common", "tools\quake3\common\quake3-common.vcproj", "{B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "synapse", "libs\synapse\synapse.vcproj", "{E13CCFB0-A366-4EF3-A66F-C374B563E4DF}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3-common", "tools\quake3\common\quake3-common.vcproj", "{B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "synapse", "libs\synapse\synapse.vcproj", "{E13CCFB0-A366-4EF3-A66F-C374B563E4DF}"
@@ -25,6 +35,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5lib", "libs\md5lib\md5li
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{818BAC3D-0399-4416-930D-0AA28D55F798}"
 EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{818BAC3D-0399-4416-930D-0AA28D55F798}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "splines", "libs\splines\splines.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}"
        ProjectSection(ProjectDependencies) = postProject
                {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}"
        ProjectSection(ProjectDependencies) = postProject
                {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
@@ -80,16 +92,88 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfspk3", "plugins\vfspk3\vf
                {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
        EndProjectSection
 EndProject
                {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "splines", "libs\splines\splines.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfspak", "plugins\vfspak\vfspak.vcproj", "{8BE599BF-6318-4B0C-AC3E-DE811676C63B}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
 EndProject
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfswad", "plugins\vfswad\vfswad.vcproj", "{18116120-2710-4DD8-B1AC-940D0BDB36EF}"
        ProjectSection(ProjectDependencies) = postProject
        ProjectSection(ProjectDependencies) = postProject
-               {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16}
-               {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798}
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgd", "plugins\eclassfgd\fgd.vcproj", "{04213509-5ED3-4C74-B8A2-480BE6F48363}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagewal", "plugins\imagewal\imagewal.vcproj", "{8D3160AB-B386-4970-8146-826BC293CCB1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagem8", "plugins\imagem8\imagem8.vcproj", "{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spritemodel", "plugins\spritemodel\spritemodel.vcproj", "{F291A09D-73BC-48FF-98EE-D672BBDE5C16}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
                {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
                {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
-               {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B}
-               {DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E}
-               {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} = {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "textool", "plugins\textool\textool.vcproj", "{4F52DED4-285A-4E99-9C78-734D59E8ACD6}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+               {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_ufoai", "plugins\surface_ufoai\surface_ufoai.vcproj", "{F400371F-455F-4B6C-9F13-A2E57110E725}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_quake2", "plugins\surface_quake2\surface_quake2.vcproj", "{32AB82AA-C781-4E5E-83A0-A164D371306F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_heretic2", "plugins\surface_heretic2\surface_heretic2.vcproj", "{12932084-E212-45AB-B3BE-A2A5AEEBA581}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prtview", "contrib\prtview\prtview.vcproj", "{AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hydratoolz", "contrib\hydratoolz\hydratoolz.vcproj", "{4E63003A-6B5D-4076-8ADF-D5A94809CE32}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{302086A7-5C73-42A4-8591-F5C9336EC911}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+               {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F}
+               {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkgensurf", "contrib\gtkgensurf\gtkgensurf.vcproj", "{E37A9846-84FC-48F8-9880-954C5D9F8ED0}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoai\ufoai.vcproj", "{850DD97C-B457-497D-B5F5-DA1904FAC5F9}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bkgrnd2d", "contrib\bkgrnd2d\bkgrnd2d.vcproj", "{D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
        EndProjectSection
 EndProject
 Global
        EndProjectSection
 EndProject
 Global
@@ -174,6 +258,70 @@ Global
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.Build.0 = Debug|Win32
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.ActiveCfg = Release|Win32
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.Build.0 = Release|Win32
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.Build.0 = Debug|Win32
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.ActiveCfg = Release|Win32
                {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.Build.0 = Release|Win32
+               {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.Build.0 = Debug|Win32
+               {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.ActiveCfg = Release|Win32
+               {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.Build.0 = Release|Win32
+               {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.ActiveCfg = Debug|Win32
+               {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.Build.0 = Debug|Win32
+               {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.ActiveCfg = Release|Win32
+               {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.Build.0 = Release|Win32
+               {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.ActiveCfg = Debug|Win32
+               {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.Build.0 = Debug|Win32
+               {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.ActiveCfg = Release|Win32
+               {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.Build.0 = Release|Win32
+               {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.Build.0 = Debug|Win32
+               {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.ActiveCfg = Release|Win32
+               {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.Build.0 = Release|Win32
+               {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.Build.0 = Debug|Win32
+               {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.ActiveCfg = Release|Win32
+               {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.Build.0 = Release|Win32
+               {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.Build.0 = Debug|Win32
+               {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.ActiveCfg = Release|Win32
+               {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.Build.0 = Release|Win32
+               {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.ActiveCfg = Debug|Win32
+               {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.Build.0 = Debug|Win32
+               {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.ActiveCfg = Release|Win32
+               {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.Build.0 = Release|Win32
+               {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.Build.0 = Debug|Win32
+               {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.ActiveCfg = Release|Win32
+               {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.Build.0 = Release|Win32
+               {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.ActiveCfg = Debug|Win32
+               {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.Build.0 = Debug|Win32
+               {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.ActiveCfg = Release|Win32
+               {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.Build.0 = Release|Win32
+               {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.ActiveCfg = Debug|Win32
+               {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.Build.0 = Debug|Win32
+               {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.ActiveCfg = Release|Win32
+               {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.Build.0 = Release|Win32
+               {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.ActiveCfg = Debug|Win32
+               {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.Build.0 = Debug|Win32
+               {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.ActiveCfg = Release|Win32
+               {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.Build.0 = Release|Win32
+               {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.ActiveCfg = Debug|Win32
+               {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.Build.0 = Debug|Win32
+               {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.ActiveCfg = Release|Win32
+               {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.Build.0 = Release|Win32
+               {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.ActiveCfg = Debug|Win32
+               {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.Build.0 = Debug|Win32
+               {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.ActiveCfg = Release|Win32
+               {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.Build.0 = Release|Win32
+               {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.Build.0 = Debug|Win32
+               {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.ActiveCfg = Release|Win32
+               {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.Build.0 = Release|Win32
+               {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.ActiveCfg = Debug|Win32
+               {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.Build.0 = Debug|Win32
+               {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.ActiveCfg = Release|Win32
+               {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.Build.0 = Release|Win32
+               {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.Build.0 = Debug|Win32
+               {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|Win32.ActiveCfg = Release|Win32
+               {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|Win32.Build.0 = Release|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.ActiveCfg = Debug|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.Build.0 = Debug|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.ActiveCfg = Release|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.ActiveCfg = Debug|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.Build.0 = Debug|Win32
                {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/radiant.xcode/project.pbxproj b/radiant.xcode/project.pbxproj
index 4157860b90c95afdcc4d7bfd461bc0d4750b58a3..b5f41ab9c79d34f77923c40788c140b4891f349e 100644 (file)
--- a/radiant.xcode/project.pbxproj
+++ b/radiant.xcode/project.pbxproj
@@ -597,7 +597,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.def.svn-base";
+                       path = "textool.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -613,7 +613,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.vcproj.svn-base";
+                       path = "textool.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -731,7 +731,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.def.svn-work";
+                       path = "textool.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -747,7 +747,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.vcproj.svn-work";
+                       path = "textool.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -873,7 +873,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.def.svn-base";
+                       path = "textool.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -889,7 +889,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = "TexTool.vcproj.svn-base";
+                       path = "textool.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1051,7 +1051,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.def.svn-work";
+                       path = "textool.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1067,7 +1067,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "TexTool.vcproj.svn-work";
+                       path = "textool.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1423,7 +1423,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = TexTool.def;
+                       path = textool.def;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -1439,7 +1439,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = TexTool.vcproj;
+                       path = textool.vcproj;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -52114,7 +52114,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz.def.svn-base";
+                       path = "bobtoolz.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -52138,7 +52138,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz_gtk.vcproj.svn-base";
+                       path = "bobtoolz.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -52662,7 +52662,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz.def.svn-work";
+                       path = "bobtoolz.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -52686,7 +52686,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz_gtk.vcproj.svn-work";
+                       path = "bobtoolz.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -53218,7 +53218,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz.def.svn-base";
+                       path = "bobtoolz.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -53242,7 +53242,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = "bobToolz_gtk.vcproj.svn-base";
+                       path = "bobtoolz.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -53810,7 +53810,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz.def.svn-work";
+                       path = "bobtoolz.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -53834,7 +53834,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "bobToolz_gtk.vcproj.svn-work";
+                       path = "bobtoolz.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -54820,7 +54820,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = bobToolz.def;
+                       path = bobtoolz.def;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -54844,7 +54844,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = bobToolz_gtk.vcproj;
+                       path = bobtoolz.vcproj;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -58770,7 +58770,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "gensurf.def.svn-base";
+                       path = "gtkgensurf.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -58940,7 +58940,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "gensurf.def.svn-work";
+                       path = "gtkgensurf.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -59118,7 +59118,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "gensurf.def.svn-base";
+                       path = "gtkgensurf.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -59332,7 +59332,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "gensurf.def.svn-work";
+                       path = "gtkgensurf.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -59468,7 +59468,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = gensurf.def;
+                       path = gtkgensurf.def;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60508,7 +60508,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.def.svn-base";
+                       path = "prtview.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60540,7 +60540,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.vcproj.svn-base";
+                       path = "prtview.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60705,7 +60705,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.def.svn-work";
+                       path = "prtview.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60737,7 +60737,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.vcproj.svn-work";
+                       path = "prtview.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60909,7 +60909,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.def.svn-base";
+                       path = "prtview.def.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -60941,7 +60941,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = "PrtView.vcproj.svn-base";
+                       path = "prtview.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -61150,7 +61150,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.def.svn-work";
+                       path = "prtview.def.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -61182,7 +61182,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "PrtView.vcproj.svn-work";
+                       path = "prtview.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -61309,7 +61309,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = PrtView.def;
+                       path = prtview.def;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -61341,7 +61341,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = PrtView.vcproj;
+                       path = prtview.vcproj;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -86923,7 +86923,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "Splines.vcproj.svn-base";
+                       path = "splines.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -87093,7 +87093,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "Splines.vcproj.svn-work";
+                       path = "splines.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -87271,7 +87271,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = "Splines.vcproj.svn-base";
+                       path = "splines.vcproj.svn-base";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -87485,7 +87485,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text;
-                       path = "Splines.vcproj.svn-work";
+                       path = "splines.vcproj.svn-work";
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
@@ -87621,7 +87621,7 @@
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = text.plist.xml;
-                       path = Splines.vcproj;
+                       path = splines.vcproj;
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };
diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp
index 57699b379ee1b9ff137ec8ff4c0b76acf755e606..0e7adc70e1d5efc20ebe8832d9a8d858199e33b3 100644 (file)
--- a/radiant/glwidget.cpp
+++ b/radiant/glwidget.cpp
@@ -34,9 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <gtk/gtkgl.h>
 
 
 #include <gtk/gtkgl.h>
 
-#ifndef _WIN32
 #include <pango/pangoft2.h>
 #include <pango/pangoft2.h>
-#endif
 
 #include "glwidget.h"
 #include "qgl.h"
 
 #include "glwidget.h"
 #include "qgl.h"
@@ -212,108 +210,48 @@ gboolean WINAPI gtk_glwidget_make_current (GtkWidget *widget)
 }
 
 
 }
 
 
-#ifdef _WIN32
-
-GLuint font_list_base;
-static gchar font_string[] = "courier 8";
-static gint font_height;
-static int font_created = 0;
-
-#else
-
 // Think about rewriting this font stuff to use OpenGL display lists and glBitmap().
 // Bit maps together with display lists may offer a performance increase, but
 // they would not allow antialiased fonts.
 // Think about rewriting this font stuff to use OpenGL display lists and glBitmap().
 // Bit maps together with display lists may offer a performance increase, but
 // they would not allow antialiased fonts.
+#ifdef _WIN32
+static const char font_string[] = "Courier bold";
+static const int font_height = 9;
+#else
 static const char font_string[] = "Monospace";
 static const int font_height = 10;
 static const char font_string[] = "Monospace";
 static const int font_height = 10;
+#endif
 static int font_ascent = -1;
 static int font_descent = -1;
 static int y_offset_bitmap_render_pango_units = -1;
 static PangoContext *ft2_context = NULL;
 static int _debug_font_created = 0;
 
 static int font_ascent = -1;
 static int font_descent = -1;
 static int y_offset_bitmap_render_pango_units = -1;
 static PangoContext *ft2_context = NULL;
 static int _debug_font_created = 0;
 
-#endif
-
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_ascent()
 {
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_ascent()
 {
-#ifdef _WIN32
-
-  return 6; // Approximation.
-
-#else
-
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_ascent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_ascent;
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_ascent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_ascent;
-
-#endif
 }
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_descent()
 {
 }
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_descent()
 {
-#ifdef _WIN32
-
-  return 0; // Approximation.
-
-#else
-
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_descent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_descent;
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_descent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_descent;
-
-#endif
 }
 
 }
 
-#ifdef _WIN32
-
-void gtk_glwidget_create_font_win_internal()
-{
-  if (font_created) return;
-  font_created = 1;
-
-  PangoFontDescription *font_desc;
-  PangoFont *font;
-  PangoFontMetrics *font_metrics;
-
-  font_list_base = qglGenLists (256);
-
-  font_desc = pango_font_description_from_string (font_string);
-
-  font = gdk_gl_font_use_pango_font (font_desc, 0, 256, font_list_base);
-
-  if(font != NULL)
-  {
-    font_metrics = pango_font_get_metrics (font, NULL);
-
-    font_height = pango_font_metrics_get_ascent (font_metrics) +
-                  pango_font_metrics_get_descent (font_metrics);
-    font_height = PANGO_PIXELS (font_height);
-
-    pango_font_metrics_unref (font_metrics);
-  }
-
-  pango_font_description_free (font_desc);
-}
-
-#endif
 
 void gtk_glwidget_create_font()
 {
 
 void gtk_glwidget_create_font()
 {
-#ifdef _WIN32
-
-  // Do nothing.
-
-#else
-
   PangoFontDescription *font_desc;
   PangoLayout *layout;
   PangoRectangle log_rect;
   PangoFontDescription *font_desc;
   PangoLayout *layout;
   PangoRectangle log_rect;
@@ -336,15 +274,6 @@ void gtk_glwidget_create_font()
 
   layout = pango_layout_new(ft2_context);
 
 
   layout = pango_layout_new(ft2_context);
 
-#ifdef _WIN32
-
-  PangoLayoutIter *iter;  
-  iter = pango_layout_get_iter(layout);
-  font_ascent_pango_units = pango_layout_iter_get_baseline(iter);
-  pango_layout_iter_free(iter);
-
-#else
-
   // I don't believe that's standard preprocessor syntax?
 #if !PANGO_VERSION_CHECK(1,22,0)
   PangoLayoutIter *iter;  
   // I don't believe that's standard preprocessor syntax?
 #if !PANGO_VERSION_CHECK(1,22,0)
   PangoLayoutIter *iter;  
@@ -353,8 +282,6 @@ void gtk_glwidget_create_font()
   pango_layout_iter_free(iter);
 #else
   font_ascent_pango_units = pango_layout_get_baseline(layout);
   pango_layout_iter_free(iter);
 #else
   font_ascent_pango_units = pango_layout_get_baseline(layout);
-#endif
-
 #endif
 
   pango_layout_get_extents(layout, NULL, &log_rect);
 #endif
 
   pango_layout_get_extents(layout, NULL, &log_rect);
@@ -364,18 +291,10 @@ void gtk_glwidget_create_font()
   font_ascent = PANGO_PIXELS_CEIL(font_ascent_pango_units);
   font_descent = PANGO_PIXELS_CEIL(font_descent_pango_units);
   y_offset_bitmap_render_pango_units = (font_ascent * PANGO_SCALE) - font_ascent_pango_units;
   font_ascent = PANGO_PIXELS_CEIL(font_ascent_pango_units);
   font_descent = PANGO_PIXELS_CEIL(font_descent_pango_units);
   y_offset_bitmap_render_pango_units = (font_ascent * PANGO_SCALE) - font_ascent_pango_units;
-
-#endif
 }
 
 void gtk_glwidget_destroy_font()
 {
 }
 
 void gtk_glwidget_destroy_font()
 {
-#ifdef _WIN32
-
-  // Do nothing.
-
-#else
-
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_destroy_font() called when font "
           "does not exist");
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_destroy_font() called when font "
           "does not exist");
@@ -386,8 +305,6 @@ void gtk_glwidget_destroy_font()
   y_offset_bitmap_render_pango_units = -1;
   g_object_unref(G_OBJECT(ft2_context));
   _debug_font_created = 0;
   y_offset_bitmap_render_pango_units = -1;
   g_object_unref(G_OBJECT(ft2_context));
   _debug_font_created = 0;
-
-#endif
 }
 
 
 }
 
 
@@ -403,14 +320,6 @@ void gtk_glwidget_destroy_font()
 // Google for "glDrawPixels clipping".
 void gtk_glwidget_print_string(const char *s)
 {
 // Google for "glDrawPixels clipping".
 void gtk_glwidget_print_string(const char *s)
 {
-#ifdef _WIN32
-
-  gtk_glwidget_create_font_win_internal();
-  qglListBase(font_list_base);
-  qglCallLists(strlen(s), GL_UNSIGNED_BYTE, (unsigned char *)s);
-
-#else
-
   // The idea for this code initially came from the font-pangoft2.c example that comes with GtkGLExt.
 
   PangoLayout *layout;
   // The idea for this code initially came from the font-pangoft2.c example that comes with GtkGLExt.
 
   PangoLayout *layout;
@@ -484,24 +393,12 @@ void gtk_glwidget_print_string(const char *s)
   }
 
   g_object_unref(G_OBJECT(layout));
   }
 
   g_object_unref(G_OBJECT(layout));
-
-#endif
 }
 
 void gtk_glwidget_print_char(char s)
 {
 }
 
 void gtk_glwidget_print_char(char s)
 {
-#ifdef _WIN32
-
-  gtk_glwidget_create_font_win_internal();
-  qglListBase(font_list_base);
-  qglCallLists(1, GL_UNSIGNED_BYTE, (unsigned char *) &s);
-
-#else
-
   char str[2];
   str[0] = s;
   str[1] = '\0';
   gtk_glwidget_print_string(str);
   char str[2];
   str[0] = s;
   str[1] = '\0';
   gtk_glwidget_print_string(str);
-
-#endif
 }
 }
diff --git a/radiant/radiant.vcproj b/radiant/radiant.vcproj
index 8584ff801de815cdb49e51602f909699e6f84d80..ad3b7e31cbc0be804a4a8f04391c252f5d16bf86 100644 (file)
--- a/radiant/radiant.vcproj
+++ b/radiant/radiant.vcproj
@@ -39,7 +39,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include&quot;"
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\freetype2&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -60,7 +60,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Ws2_32.lib glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib pango-1.0.lib gdkglext-win32-1.0.lib gtkglext-win32-1.0.lib libxml2.lib mathlib.lib synapse.lib l_net.lib cmdlib.lib"
+                               AdditionalDependencies="Ws2_32.lib glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gdkglext-win32-1.0.lib gtkglext-win32-1.0.lib libxml2.lib mathlib.lib synapse.lib l_net.lib cmdlib.lib"
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
@@ -111,7 +111,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include&quot;"
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\STLport-5.2.1\stlport&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\gtk-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\cairo&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\pango-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\gtk-2.0\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\atk-1.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\freetype2&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -130,7 +130,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Ws2_32.lib glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib pango-1.0.lib gdkglext-win32-1.0.lib gtkglext-win32-1.0.lib libxml2.lib mathlib.lib synapse.lib l_net.lib cmdlib.lib"
+                               AdditionalDependencies="Ws2_32.lib glib-2.0.lib gobject-2.0.lib intl.lib gtk-win32-2.0.lib gdk-win32-2.0.lib pango-1.0.lib pangoft2-1.0.lib gdkglext-win32-1.0.lib gtkglext-win32-1.0.lib libxml2.lib mathlib.lib synapse.lib l_net.lib cmdlib.lib"
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\gtkglext-1.2.0\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"