- Radiant is now Vista compatible (Aero must be disabled)
authornamespace <namespace>
Wed, 28 Feb 2007 20:55:39 +0000 (20:55 +0000)
committernamespace <namespace>
Wed, 28 Feb 2007 20:55:39 +0000 (20:55 +0000)
- Updated all radiant dependencies (gtk is now 2-2.10)
  New dependency packages can be found here
http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtkradiant-1.5-dependencies-1.0.zip
  or here
http://www.codecreator.net/radiant/gtkradiant-1.5-dependencies-1.0.zip
- Removed Win32 filechooser
   - Fixes crashes caused by utf-8 encoded filenames
   - Fixes Vista "SaveAs"-Bug
- Converted all projects to Visual Studio 2005
- Codefixes for vc2k5 compiler
- Removed old unused projectfiles for Visual Studio 6
- Simplified dependency filestructure
- Simplified install.py
- Updated CONTRIBUTORS list

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

89 files changed:
CHANGES
CONTRIBUTORS
GtkRadiant.sln
contrib/bkgrnd2d/bkgrnd2d.dsp [deleted file]
contrib/bobtoolz/bobToolz.dsw [deleted file]
contrib/bobtoolz/bobToolz_gtk.dsp [deleted file]
contrib/bobtoolz/bobtoolz.vcproj
contrib/bobtoolz/misc.cpp
contrib/brushexport/brushexport.vcproj
contrib/brushexport/callbacks.cpp
contrib/camera/camera.dsp [deleted file]
contrib/gtkgensurf/gtkgensurf.dsp [deleted file]
contrib/hydratoolz/hydratoolz.dsp [deleted file]
contrib/prtview/PrtView.dsp [deleted file]
contrib/prtview/PrtView.vcproj
contrib/shaderplug/shaderplug.vcproj
contrib/sunplug/sunplug.vcproj
contrib/ufoaiplug/ufoai.vcproj
gen.dsp [deleted file]
gen.vcproj
include/include.vcproj
install.py
libs/cmdlib/cmdlib.dsp [deleted file]
libs/cmdlib/cmdlib.vcproj
libs/ddslib/ddslib.dsp [deleted file]
libs/ddslib/ddslib.vcproj
libs/gtkutil/filechooser.cpp
libs/gtkutil/filechooser.h
libs/gtkutil/glfont.cpp
libs/gtkutil/gtkutil.vcproj
libs/jpeg6/jpeg6.dsp [deleted file]
libs/jpeg6/jpeg6.vcproj
libs/l_net/l_net.dsp [deleted file]
libs/l_net/l_net.vcproj
libs/libs.vcproj
libs/mathlib/mathlib.dsp [deleted file]
libs/mathlib/mathlib.vcproj
libs/md5lib/md5lib.dsp [deleted file]
libs/picomodel/picomodel.dsp [deleted file]
libs/picomodel/picomodel.vcproj
libs/profile/profile.vcproj
libs/splines/Splines.dsp [deleted file]
plugins/archivepak/archivepak.dsp [deleted file]
plugins/archivepak/archivepak.vcproj
plugins/archivewad/archivewad.dsp [deleted file]
plugins/archivewad/archivewad.vcproj
plugins/archivezip/archivezip.dsp [deleted file]
plugins/archivezip/archivezip.vcproj
plugins/entity/doom3group.cpp
plugins/entity/eclassmodel.cpp
plugins/entity/entity.dsp [deleted file]
plugins/entity/entityq3.vcproj
plugins/entity/generic.cpp
plugins/entity/light.cpp
plugins/entity/miscmodel.cpp
plugins/image/image.dsp [deleted file]
plugins/image/imageq3.vcproj
plugins/imagehl/imagehl.dsp [deleted file]
plugins/imagehl/imagehl.vcproj
plugins/imagepng/imagepng.dsp [deleted file]
plugins/imagepng/imagepng.vcproj
plugins/imageq2/imageq2.vcproj
plugins/mapq3/mapq3.dsp [deleted file]
plugins/mapq3/mapq3.vcproj
plugins/mapxml/mapxml.dsp [deleted file]
plugins/mapxml/mapxml.vcproj
plugins/md3model/md3model.dsp [deleted file]
plugins/md3model/modelmd3.vcproj
plugins/model/model.dsp [deleted file]
plugins/model/modelpico.vcproj
plugins/sample/sample.vcproj
plugins/shaders/shaders.dsp [deleted file]
plugins/shaders/shadersq3.vcproj
plugins/spritemodel/spritemodel.dsp [deleted file]
plugins/textool/TexTool.dsp [deleted file]
plugins/vfspk3/vfspk3.dsp [deleted file]
plugins/vfspk3/vfsq3.vcproj
radiant.dsw [deleted file]
radiant/GtkRadiant.dsp [deleted file]
radiant/GtkRadiant.vcproj
radiant/preferences.cpp
tools/quake2/q2map/q2map.dsp [deleted file]
tools/quake2/q2map/q2map.vcproj
tools/quake2/qdata/qdata3.dsp [deleted file]
tools/quake2/qdata_heretic2/qdata3_heretic2.dsp [deleted file]
tools/quake3/q3data/q3data.dsp [deleted file]
tools/quake3/q3map2/q3map2.dsp [deleted file]
tools/quake3/q3map2/q3map2.dsw [deleted file]
tools/quake3/q3map2/q3map2.vcproj

diff --git a/CHANGES b/CHANGES
index 721d4cd..ede320a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,24 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+28/02/2007
+namespace
+- Radiant is now Vista compatible (Aero must be disabled)
+- Updated all radiant dependencies (gtk is now 2-2.10)
+  New dependency packages can be found here
+http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtkradiant-1.5-dependencies-1.0.zip
+  or here
+http://www.codecreator.net/radiant/gtkradiant-1.5-dependencies-1.0.zip
+- Removed Win32 filechooser
+   - Fixes crashes caused by utf-8 encoded filenames
+   - Fixes Vista "SaveAs"-Bug
+- Converted all projects to Visual Studio 2005
+- Codefixes for vc2k5 compiler
+- Removed old unused projectfiles for Visual Studio 6
+- Simplified dependency filestructure
+- Simplified install.py
+- Updated CONTRIBUTORS list
+
 26/01/2007
 namespace
 - SnapPlane reenabled by namespace because of multiple reports of
index 8ee734d..9590feb 100644 (file)
@@ -1,7 +1,18 @@
 GtkRadiant CONTRIBUTORS and CREDITS
-last update: 09/12/2004
+last update: 28/02/2007
 =======================
 
+GtkRadiant 1.5 development:
+-------
+Thomas "namespace" Nitschke spam@codecreator.net
+Stefan "Shaderman" Greven
+"Topsun"
+SmallPileofGibs spog@planetquake.com
+
+Small contributions and improvements for 1.5
+--------
+"eb"
+
 Loki
 ----
 Leonardo Zide leo@lokigames.com
index bd54ae7..0e3bcd7 100644 (file)
@@ -1,7 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 8.00\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entityq3", "plugins\entity\entityq3.vcproj", "{49C5823A-5E50-4029-ACEE-1627EBB79E47}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtkRadiant", "radiant\GtkRadiant.vcproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -21,16 +20,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtkRadiant", "radiant\GtkRa
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "gen.vcproj", "{BED4E2E5-0368-4042-9898-4914B0372468}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net.vcproj", "{8845D5C1-4154-425F-8643-447FADC03449}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmdlib", "libs\cmdlib\cmdlib.vcproj", "{8845C5C1-4154-425F-8643-447FADC03449}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archivepak", "plugins\archivepak\archivepak.vcproj", "{75160E63-E642-4C71-9D4C-B733E152C418}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -54,8 +47,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imageq3", "plugins\image\im
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelmd3", "plugins\md3model\modelmd3.vcproj", "{C2A5530D-C2DB-4503-A651-4B92AEC5FE74}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelpico", "plugins\model\modelpico.vcproj", "{386DBF35-2F76-4BB1-8B4B-1D69C34F8996}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -63,36 +54,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelpico", "plugins\model\
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfsq3", "plugins\vfspk3\vfsq3.vcproj", "{0BB50F1C-E139-48A2-B9D8-1E781275777F}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapq3", "plugins\mapq3\mapq3.vcproj", "{D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapxml", "plugins\mapxml\mapxml.vcproj", "{B43DBA9D-6EE0-421C-83D9-9776064B66B4}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadersq3", "plugins\shaders\shadersq3.vcproj", "{F79DCF6D-72B1-45F6-A471-5209951C0BDD}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{015EA9D3-85F2-4C4E-BFC3-430AC59093B9}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg6", "libs\jpeg6\jpeg6.vcproj", "{0501A08E-D4D7-42C1-9E2A-BA3F2F320741}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagehl", "plugins\imagehl\imagehl.vcproj", "{15DEA3EA-9386-49C7-80C6-5B090DE1D536}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagepng", "plugins\imagepng\imagepng.vcproj", "{15DEA4EA-9386-49C7-80C6-5B090DE1D536}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{8ED67991-58A6-44AA-9B3A-3217085EF187}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -106,32 +81,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3ma
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib.vcproj", "{8576EC58-4E54-49C0-879A-F054C92B1D03}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "libs\mathlib\mathlib.vcproj", "{BF0FF048-887F-4D43-A455-F8C04FB98F10}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "libs\libs.vcproj", "{1C785349-866D-447D-8C55-8A51E5CA0E87}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "include\include.vcproj", "{04A5D9EE-EC49-4CBC-BD05-D80BC287897C}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profile", "libs\profile\profile.vcproj", "{853632F4-6420-40C5-B80B-38B678E472B8}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imageq2", "plugins\imageq2\imageq2.vcproj", "{697E77F2-9E9E-4F12-973F-C1214494248C}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "plugins\sample\sample.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q2map", "tools\quake2\q2map\q2map.vcproj", "{FB80DE6C-51C8-4D56-876D-C7878A4EB10B}"\r
        ProjectSection(ProjectDependencies) = postProject\r
@@ -139,186 +100,169 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q2map", "tools\quake2\q2map
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkutil", "libs\gtkutil\gtkutil.vcproj", "{68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrtView", "contrib\prtview\PrtView.vcproj", "{B20364D1-4329-4D4E-B9CE-C9767618FDD6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {853632F4-6420-40C5-B80B-38B678E472B8} = {853632F4-6420-40C5-B80B-38B678E472B8}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{B20364D1-4329-4D4E-B9CE-C9767618FDD6}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{439FE12C-77F0-44CD-BC9B-803B3E92C197}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sunplug", "contrib\sunplug\sunplug.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDF}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brushexport", "contrib\brushexport\brushexport.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brushexport", "contrib\brushexport\brushexport.vcproj", "{334D54AE-9AF7-43EA-BC64-2E31846B972E}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaderplug", "contrib\shaderplug\shaderplug.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaderplug", "contrib\shaderplug\shaderplug.vcproj", "{0B09566E-63DB-4A28-A555-BBE2747769B6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1C785349-866D-447D-8C55-8A51E5CA0E87} = {1C785349-866D-447D-8C55-8A51E5CA0E87}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoaiplug\ufoai.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-       EndProjectSection\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoaiplug\ufoai.vcproj", "{623CDF9E-ACC5-43E2-8E8D-B6266235A044}"\r
 EndProject\r
 Global\r
-       GlobalSection(SolutionConfiguration) = preSolution\r
-               Debug = Debug\r
-               Release = Release\r
-       EndGlobalSection\r
-       GlobalSection(ProjectDependencies) = postSolution\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfiguration) = postSolution\r
-               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.ActiveCfg = Debug|Win32\r
-               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.Build.0 = Debug|Win32\r
-               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release.ActiveCfg = Release|Win32\r
-               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release.Build.0 = Release|Win32\r
-               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug.ActiveCfg = Debug|Win32\r
-               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug.Build.0 = Debug|Win32\r
-               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release.ActiveCfg = Release|Win32\r
-               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release.Build.0 = Release|Win32\r
-               {BED4E2E5-0368-4042-9898-4914B0372468}.Debug.ActiveCfg = Debug|Win32\r
-               {BED4E2E5-0368-4042-9898-4914B0372468}.Debug.Build.0 = Debug|Win32\r
-               {BED4E2E5-0368-4042-9898-4914B0372468}.Release.ActiveCfg = Release|Win32\r
-               {BED4E2E5-0368-4042-9898-4914B0372468}.Release.Build.0 = Release|Win32\r
-               {8845D5C1-4154-425F-8643-447FADC03449}.Debug.ActiveCfg = Debug|Win32\r
-               {8845D5C1-4154-425F-8643-447FADC03449}.Debug.Build.0 = Debug|Win32\r
-               {8845D5C1-4154-425F-8643-447FADC03449}.Release.ActiveCfg = Release|Win32\r
-               {8845D5C1-4154-425F-8643-447FADC03449}.Release.Build.0 = Release|Win32\r
-               {8845C5C1-4154-425F-8643-447FADC03449}.Debug.ActiveCfg = Debug|Win32\r
-               {8845C5C1-4154-425F-8643-447FADC03449}.Debug.Build.0 = Debug|Win32\r
-               {8845C5C1-4154-425F-8643-447FADC03449}.Release.ActiveCfg = Release|Win32\r
-               {8845C5C1-4154-425F-8643-447FADC03449}.Release.Build.0 = Release|Win32\r
-               {75160E63-E642-4C71-9D4C-B733E152C418}.Debug.ActiveCfg = Debug|Win32\r
-               {75160E63-E642-4C71-9D4C-B733E152C418}.Debug.Build.0 = Debug|Win32\r
-               {75160E63-E642-4C71-9D4C-B733E152C418}.Release.ActiveCfg = Release|Win32\r
-               {75160E63-E642-4C71-9D4C-B733E152C418}.Release.Build.0 = Release|Win32\r
-               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug.ActiveCfg = Debug|Win32\r
-               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug.Build.0 = Debug|Win32\r
-               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release.ActiveCfg = Release|Win32\r
-               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release.Build.0 = Release|Win32\r
-               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug.ActiveCfg = Debug|Win32\r
-               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug.Build.0 = Debug|Win32\r
-               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release.ActiveCfg = Release|Win32\r
-               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release.Build.0 = Release|Win32\r
-               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug.ActiveCfg = Debug|Win32\r
-               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug.Build.0 = Debug|Win32\r
-               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release.ActiveCfg = Release|Win32\r
-               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release.Build.0 = Release|Win32\r
-               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug.ActiveCfg = Debug|Win32\r
-               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug.Build.0 = Debug|Win32\r
-               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release.ActiveCfg = Release|Win32\r
-               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release.Build.0 = Release|Win32\r
-               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug.ActiveCfg = Debug|Win32\r
-               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug.Build.0 = Debug|Win32\r
-               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release.ActiveCfg = Release|Win32\r
-               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release.Build.0 = Release|Win32\r
-               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug.ActiveCfg = Debug|Win32\r
-               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug.Build.0 = Debug|Win32\r
-               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release.ActiveCfg = Release|Win32\r
-               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release.Build.0 = Release|Win32\r
-               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug.ActiveCfg = Debug|Win32\r
-               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug.Build.0 = Debug|Win32\r
-               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release.ActiveCfg = Release|Win32\r
-               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release.Build.0 = Release|Win32\r
-               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug.ActiveCfg = Debug|Win32\r
-               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug.Build.0 = Debug|Win32\r
-               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release.ActiveCfg = Release|Win32\r
-               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release.Build.0 = Release|Win32\r
-               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug.ActiveCfg = Debug|Win32\r
-               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug.Build.0 = Debug|Win32\r
-               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release.ActiveCfg = Release|Win32\r
-               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release.Build.0 = Release|Win32\r
-               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug.ActiveCfg = Debug|Win32\r
-               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug.Build.0 = Debug|Win32\r
-               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release.ActiveCfg = Release|Win32\r
-               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release.Build.0 = Release|Win32\r
-               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug.ActiveCfg = Debug|Win32\r
-               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug.Build.0 = Debug|Win32\r
-               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release.ActiveCfg = Release|Win32\r
-               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release.Build.0 = Release|Win32\r
-               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug.ActiveCfg = Debug|Win32\r
-               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug.Build.0 = Debug|Win32\r
-               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release.ActiveCfg = Release|Win32\r
-               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release.Build.0 = Release|Win32\r
-               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug.ActiveCfg = Debug|Win32\r
-               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug.Build.0 = Debug|Win32\r
-               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release.ActiveCfg = Release|Win32\r
-               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release.Build.0 = Release|Win32\r
-               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug.ActiveCfg = Debug|Win32\r
-               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug.Build.0 = Debug|Win32\r
-               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release.ActiveCfg = Release|Win32\r
-               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release.Build.0 = Release|Win32\r
-               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug.ActiveCfg = Debug|Win32\r
-               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug.Build.0 = Debug|Win32\r
-               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release.ActiveCfg = Release|Win32\r
-               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release.Build.0 = Release|Win32\r
-               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug.ActiveCfg = Debug|Win32\r
-               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug.Build.0 = Debug|Win32\r
-               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release.ActiveCfg = Release|Win32\r
-               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release.Build.0 = Release|Win32\r
-               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug.ActiveCfg = Debug|Win32\r
-               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug.Build.0 = Debug|Win32\r
-               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release.ActiveCfg = Release|Win32\r
-               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release.Build.0 = Release|Win32\r
-               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug.ActiveCfg = Debug|Win32\r
-               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug.Build.0 = Debug|Win32\r
-               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release.ActiveCfg = Release|Win32\r
-               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release.Build.0 = Release|Win32\r
-               {853632F4-6420-40C5-B80B-38B678E472B8}.Debug.ActiveCfg = Debug|Win32\r
-               {853632F4-6420-40C5-B80B-38B678E472B8}.Debug.Build.0 = Debug|Win32\r
-               {853632F4-6420-40C5-B80B-38B678E472B8}.Release.ActiveCfg = Release|Win32\r
-               {853632F4-6420-40C5-B80B-38B678E472B8}.Release.Build.0 = Release|Win32\r
-               {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug.ActiveCfg = Debug|Win32\r
-               {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug.Build.0 = Debug|Win32\r
-               {697E77F2-9E9E-4F12-973F-C1214494248C}.Release.ActiveCfg = Release|Win32\r
-               {697E77F2-9E9E-4F12-973F-C1214494248C}.Release.Build.0 = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32\r
-               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug.ActiveCfg = Debug|Win32\r
-               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug.Build.0 = Debug|Win32\r
-               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release.ActiveCfg = Release|Win32\r
-               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release.Build.0 = Release|Win32\r
-               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug.ActiveCfg = Debug|Win32\r
-               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug.Build.0 = Debug|Win32\r
-               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release.ActiveCfg = Release|Win32\r
-               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release.Build.0 = Release|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.ActiveCfg = Debug|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.Build.0 = Debug|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.ActiveCfg = Release|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.Build.0 = Release|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.ActiveCfg = Debug|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.Build.0 = Debug|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.ActiveCfg = Release|Win32\r
-               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.Build.0 = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug.ActiveCfg = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug.Build.0 = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release.ActiveCfg = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release.Build.0 = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32\r
-               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
        EndGlobalSection\r
-       GlobalSection(ExtensibilityGlobals) = postSolution\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug|Win32.Build.0 = Debug|Win32\r
+               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release|Win32.ActiveCfg = Release|Win32\r
+               {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release|Win32.Build.0 = Release|Win32\r
+               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release|Win32.Build.0 = Release|Win32\r
+               {BED4E2E5-0368-4042-9898-4914B0372468}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {BED4E2E5-0368-4042-9898-4914B0372468}.Debug|Win32.Build.0 = Debug|Win32\r
+               {BED4E2E5-0368-4042-9898-4914B0372468}.Release|Win32.ActiveCfg = Release|Win32\r
+               {BED4E2E5-0368-4042-9898-4914B0372468}.Release|Win32.Build.0 = Release|Win32\r
+               {8845D5C1-4154-425F-8643-447FADC03449}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8845D5C1-4154-425F-8643-447FADC03449}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8845D5C1-4154-425F-8643-447FADC03449}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8845D5C1-4154-425F-8643-447FADC03449}.Release|Win32.Build.0 = Release|Win32\r
+               {8845C5C1-4154-425F-8643-447FADC03449}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8845C5C1-4154-425F-8643-447FADC03449}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8845C5C1-4154-425F-8643-447FADC03449}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8845C5C1-4154-425F-8643-447FADC03449}.Release|Win32.Build.0 = Release|Win32\r
+               {75160E63-E642-4C71-9D4C-B733E152C418}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {75160E63-E642-4C71-9D4C-B733E152C418}.Debug|Win32.Build.0 = Debug|Win32\r
+               {75160E63-E642-4C71-9D4C-B733E152C418}.Release|Win32.ActiveCfg = Release|Win32\r
+               {75160E63-E642-4C71-9D4C-B733E152C418}.Release|Win32.Build.0 = Release|Win32\r
+               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release|Win32.Build.0 = Release|Win32\r
+               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release|Win32.Build.0 = Release|Win32\r
+               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release|Win32.Build.0 = Release|Win32\r
+               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release|Win32.Build.0 = Release|Win32\r
+               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug|Win32.Build.0 = Debug|Win32\r
+               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release|Win32.ActiveCfg = Release|Win32\r
+               {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release|Win32.Build.0 = Release|Win32\r
+               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release|Win32.Build.0 = Release|Win32\r
+               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release|Win32.Build.0 = Release|Win32\r
+               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release|Win32.Build.0 = Release|Win32\r
+               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release|Win32.Build.0 = Release|Win32\r
+               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug|Win32.Build.0 = Debug|Win32\r
+               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release|Win32.Build.0 = Release|Win32\r
+               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release|Win32.Build.0 = Release|Win32\r
+               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.Build.0 = Debug|Win32\r
+               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.ActiveCfg = Release|Win32\r
+               {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.Build.0 = Release|Win32\r
+               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.Build.0 = Debug|Win32\r
+               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.ActiveCfg = Release|Win32\r
+               {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.Build.0 = Release|Win32\r
+               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release|Win32.Build.0 = Release|Win32\r
+               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release|Win32.Build.0 = Release|Win32\r
+               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug|Win32.Build.0 = Debug|Win32\r
+               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release|Win32.ActiveCfg = Release|Win32\r
+               {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release|Win32.Build.0 = Release|Win32\r
+               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release|Win32.ActiveCfg = Release|Win32\r
+               {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release|Win32.Build.0 = Release|Win32\r
+               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release|Win32.Build.0 = Release|Win32\r
+               {853632F4-6420-40C5-B80B-38B678E472B8}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {853632F4-6420-40C5-B80B-38B678E472B8}.Debug|Win32.Build.0 = Debug|Win32\r
+               {853632F4-6420-40C5-B80B-38B678E472B8}.Release|Win32.ActiveCfg = Release|Win32\r
+               {853632F4-6420-40C5-B80B-38B678E472B8}.Release|Win32.Build.0 = Release|Win32\r
+               {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {697E77F2-9E9E-4F12-973F-C1214494248C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {697E77F2-9E9E-4F12-973F-C1214494248C}.Release|Win32.Build.0 = Release|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release|Win32.Build.0 = Release|Win32\r
+               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release|Win32.Build.0 = Release|Win32\r
+               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug|Win32.Build.0 = Debug|Win32\r
+               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release|Win32.ActiveCfg = Release|Win32\r
+               {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release|Win32.Build.0 = Release|Win32\r
+               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release|Win32.ActiveCfg = Release|Win32\r
+               {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release|Win32.Build.0 = Release|Win32\r
+               {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Debug|Win32.Build.0 = Debug|Win32\r
+               {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Release|Win32.ActiveCfg = Release|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug|Win32.Build.0 = Debug|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release|Win32.ActiveCfg = Release|Win32\r
+               {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release|Win32.Build.0 = Release|Win32\r
+               {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {0B09566E-63DB-4A28-A555-BBE2747769B6}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {0B09566E-63DB-4A28-A555-BBE2747769B6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {0B09566E-63DB-4A28-A555-BBE2747769B6}.Release|Win32.ActiveCfg = Release|Win32\r
+               {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Debug|Win32.Build.0 = Debug|Win32\r
+               {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Release|Win32.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
-       GlobalSection(ExtensibilityAddIns) = postSolution\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
        EndGlobalSection\r
 EndGlobal\r
diff --git a/contrib/bkgrnd2d/bkgrnd2d.dsp b/contrib/bkgrnd2d/bkgrnd2d.dsp
deleted file mode 100644 (file)
index de01e94..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bkgrnd2d" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=bkgrnd2d - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bkgrnd2d.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bkgrnd2d.mak" CFG="bkgrnd2d - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "bkgrnd2d - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "bkgrnd2d - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "bkgrnd2d - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BKGRND2D_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\shared" /I "..\..\..\libxml2\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BKGRND2D_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib glib-2.0.lib synapse.lib /nologo /dll /machine:I386 /libpath:"..\..\libs\synapse\release" /libpath:"..\..\..\gtk2-win32\lib\\"\r
-\r
-!ELSEIF  "$(CFG)" == "bkgrnd2d - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BKGRND2D_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\shared" /I "..\..\..\libxml2\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BKGRND2D_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib glib-2.0.lib synapse.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\libs\synapse\debug" /libpath:"..\..\..\gtk2-win32\lib\\"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "bkgrnd2d - Win32 Release"\r
-# Name "bkgrnd2d - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\bkgrnd2d.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bkgrnd2d.def\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dialog.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plugin.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\bkgrnd2d.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dialog.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plugin.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/contrib/bobtoolz/bobToolz.dsw b/contrib/bobtoolz/bobToolz.dsw
deleted file mode 100644 (file)
index 137773e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00\r
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
-\r
-###############################################################################\r
-\r
-Project: "bobToolz_gtk"=.\bobToolz_gtk.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "ctftoolz_gtk"=.\ctftoolz_gtk.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Global:\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<3>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
diff --git a/contrib/bobtoolz/bobToolz_gtk.dsp b/contrib/bobtoolz/bobToolz_gtk.dsp
deleted file mode 100644 (file)
index 205a046..0000000
+++ /dev/null
@@ -1,344 +0,0 @@
-# Microsoft Developer Studio Project File - Name="bobToolz_gtk" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=bobToolz_gtk - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bobToolz_gtk.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "bobToolz_gtk.mak" CFG="bobToolz_gtk - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "bobToolz_gtk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "bobToolz_gtk - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "bobToolz_gtk"\r
-# PROP Scc_LocalPath "..\.."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "bobToolz_gtk - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 1\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Release/"\r
-# ADD F90 /include:"Release-GTK/"\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOBTOOLZ_GTK_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /O2 /I "../../libs" /I "../../../STLport/stlport" /I "../../include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "dialogs" /I "..\..\..\libxml2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOBTOOLZ_GTK_EXPORTS" /D "_BOBTOOLZGTK_" /D "_GTK_" /FR /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x809 /d "NDEBUG"\r
-# ADD RSC /l 0x809 /d "NDEBUG" /d "_BOBTOOLZGTK_"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib mathlib.lib synapse.lib /nologo /dll /machine:I386 /def:".\bobToolz.def" /out:"Release/bobToolz.dll" /libpath:"..\src\glib" /libpath:"..\src\gtk+\gtk" /libpath:"..\src\gtk+\gdk" /libpath:"../../../src/glib" /libpath:"../../../src/gtk+/gtk" /libpath:"../../../src/gtk+/gdk" /libpath:"..\..\libs\mathlib\Release" /libpath:"../../libs/synapse/release" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "bobToolz_gtk - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 1\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Debug/"\r
-# ADD F90 /include:"Debug-GTK/"\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOBTOOLZ_GTK_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../../libs" /I "../../../STLport/stlport" /I "../../include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "dialogs" /I "..\..\..\libxml2\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOBTOOLZ_GTK_EXPORTS" /D "_BOBTOOLZGTK_" /D "_GTK_" /FR /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x809 /d "_DEBUG"\r
-# ADD RSC /l 0x809 /d "_DEBUG" /d "_BOBTOOLZGTK_"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib mathlib.lib synapse.lib /nologo /dll /debug /machine:I386 /def:".\bobToolz.def" /out:"Debug/bobToolz.dll" /pdbtype:sept /libpath:"../../../src/glib" /libpath:"../../../src/gtk+/gtk" /libpath:"../../../src/gtk+/gdk" /libpath:"..\..\libs\mathlib\Debug" /libpath:"../../libs/synapse/debug" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "bobToolz_gtk - Win32 Release"\r
-# Name "bobToolz_gtk - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Group "dialogs"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=".\dialogs\dialogs-gtk.cpp"\r
-# End Source File\r
-# End Group\r
-# Begin Source File\r
-\r
-SOURCE=".\bobToolz-GTK.cpp"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\bobtoolz-gtk.rc"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bobToolz.def\r
-# PROP Exclude_From_Build 1\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bsploader.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\cportals.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DBobView.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DBrush.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DEntity.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DEPair.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DListener.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DMap.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPatch.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPlane.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPoint.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DShape.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DTrainDrawer.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DTreePlanter.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DVisDrawer.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DWinding.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\funchandlers-GTK.cpp"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lists.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\misc.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\ScriptParser.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\shapes.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\StdAfx.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\visfind.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Group "dialog - headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=".\dialogs\dialogs-gtk.h"\r
-# End Source File\r
-# End Group\r
-# Begin Group "interface"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\iUI.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\qerplugin.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\qertypes.h\r
-# End Source File\r
-# End Group\r
-# Begin Source File\r
-\r
-SOURCE=.\bsploader.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\CPortals.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DBobView.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DBrush.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DEntity.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DEPair.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DListener.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DMap.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPatch.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPlane.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DPoint.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DShape.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DTrainDrawer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DTreePlanter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DVisDrawer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\DWinding.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\funchandlers.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lists.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\misc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\res\plugin.rc2\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=".\resource-GTK.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\shapes.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\StdAfx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\visfind.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
index 365a96c..9a842d6 100644 (file)
@@ -1,32 +1,58 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="bobtoolz"\r
-       ProjectGUID="{B20364D1-4329-4D4E-B9CE-C9767618FDD6}"\r
-       Keyword="MFCProj">\r
+       ProjectGUID="{439FE12C-77F0-44CD-BC9B-803B3E92C197}"\r
+       Keyword="MFCProj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory=".\Debug"\r
                        IntermediateDirectory=".\Debug"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="2"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName="./Debug/$(ProjectName).tlb"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/include/atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
+                               BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                PrecompiledHeaderThrough=""\r
                                PrecompiledHeaderFile=" "\r
                                ProgramDataBaseFileName=".\Debug/"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                                CompileAs="2"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib profile.lib mathlib.lib"\r
                                OutputFile="./Debug/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;;../../libs/profile/debug;../../libs/mathlib/debug"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;;../../libs/profile/debug;../../libs/mathlib/debug"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="./$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                ImportLibrary="./Debug/$(ProjectName).lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               MkTypLibCompatible="TRUE"\r
-                               SuppressStartupBanner="TRUE"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName="./Debug/$(ProjectName).tlb"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
-                               Culture="1033"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory=".\Release"\r
                        IntermediateDirectory=".\Release"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="2"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName="./Release/$(ProjectName).tlb"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
+                               EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/include/atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
-                               EnableFunctionLevelLinking="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                PrecompiledHeaderThrough=""\r
                                PrecompiledHeaderFile=" "\r
@@ -116,60 +169,66 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugi
                                ProgramDataBaseFileName=".\Release/"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                                CompileAs="2"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib profile.lib mathlib.lib"\r
                                OutputFile="./Release/$(ProjectName).dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;;../../libs/profile/release;../../libs/mathlib/release"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;;../../libs/profile/release;../../libs/mathlib/release"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="./$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="./Release/$(ProjectName).lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               MkTypLibCompatible="TRUE"\r
-                               SuppressStartupBanner="TRUE"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName="./Release/$(ProjectName).tlb"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
-                               Culture="1033"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
@@ -177,190 +236,243 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugi
        <Files>\r
                <Filter\r
                        Name="src"\r
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       >\r
                        <File\r
-                               RelativePath=".\bobToolz-GTK.cpp">\r
+                               RelativePath=".\bobToolz-GTK.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\bsploader.cpp">\r
+                               RelativePath=".\bsploader.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\bsploader.h">\r
+                               RelativePath=".\bsploader.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\cportals.cpp">\r
+                               RelativePath=".\cportals.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\CPortals.h">\r
+                               RelativePath=".\CPortals.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DBobView.cpp">\r
+                               RelativePath=".\DBobView.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DBobView.h">\r
+                               RelativePath=".\DBobView.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DBrush.cpp">\r
+                               RelativePath=".\DBrush.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DBrush.h">\r
+                               RelativePath=".\DBrush.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DEntity.cpp">\r
+                               RelativePath=".\DEntity.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DEntity.h">\r
+                               RelativePath=".\DEntity.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DEPair.cpp">\r
+                               RelativePath=".\DEPair.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DEPair.h">\r
+                               RelativePath=".\DEPair.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DMap.cpp">\r
+                               RelativePath=".\DMap.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DMap.h">\r
+                               RelativePath=".\DMap.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPatch.cpp">\r
+                               RelativePath=".\DPatch.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPatch.h">\r
+                               RelativePath=".\DPatch.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPlane.cpp">\r
+                               RelativePath=".\DPlane.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPlane.h">\r
+                               RelativePath=".\DPlane.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPoint.cpp">\r
+                               RelativePath=".\DPoint.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DPoint.h">\r
+                               RelativePath=".\DPoint.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DShape.cpp">\r
+                               RelativePath=".\DShape.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DShape.h">\r
+                               RelativePath=".\DShape.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DTrainDrawer.cpp">\r
+                               RelativePath=".\DTrainDrawer.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DTrainDrawer.h">\r
+                               RelativePath=".\DTrainDrawer.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DTreePlanter.cpp">\r
+                               RelativePath=".\DTreePlanter.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DTreePlanter.h">\r
+                               RelativePath=".\DTreePlanter.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DVisDrawer.cpp">\r
+                               RelativePath=".\DVisDrawer.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DVisDrawer.h">\r
+                               RelativePath=".\DVisDrawer.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DWinding.cpp">\r
+                               RelativePath=".\DWinding.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\DWinding.h">\r
+                               RelativePath=".\DWinding.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\funchandlers-GTK.cpp">\r
+                               RelativePath=".\funchandlers-GTK.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\funchandlers.h">\r
+                               RelativePath=".\funchandlers.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\lists.cpp">\r
+                               RelativePath=".\lists.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\lists.h">\r
+                               RelativePath=".\lists.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\misc.cpp">\r
+                               RelativePath=".\misc.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\misc.h">\r
+                               RelativePath=".\misc.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\resource-gtk.h">\r
+                               RelativePath=".\resource-gtk.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ScriptParser.cpp">\r
+                               RelativePath=".\ScriptParser.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ScriptParser.h">\r
+                               RelativePath=".\ScriptParser.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\shapes.cpp">\r
+                               RelativePath=".\shapes.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\shapes.h">\r
+                               RelativePath=".\shapes.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\visfind.cpp">\r
+                               RelativePath=".\visfind.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\visfind.h">\r
+                               RelativePath=".\visfind.h"\r
+                               >\r
                        </File>\r
                        <Filter\r
                                Name="dialogs"\r
-                               Filter="">\r
+                               >\r
                                <File\r
-                                       RelativePath=".\dialogs\dialogs-gtk.cpp">\r
+                                       RelativePath=".\dialogs\dialogs-gtk.cpp"\r
+                                       >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\dialogs\dialogs-gtk.h">\r
+                                       RelativePath=".\dialogs\dialogs-gtk.h"\r
+                                       >\r
                                </File>\r
                        </Filter>\r
                </Filter>\r
                <File\r
-                       RelativePath="bobtoolz.def">\r
+                       RelativePath="bobtoolz.def"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
                <File\r
-                       RelativePath="..\..\debug.py">\r
+                       RelativePath="..\..\debug.py"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetName).pdb&quot;"\r
-                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"/>\r
+                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetName).pdb&quot;"\r
-                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"/>\r
+                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
        </Files>\r
index 8256053..5d92698 100644 (file)
@@ -166,7 +166,7 @@ char* UnixToDosPath(char* path)
 
 const char* ExtractFilename(const char* path)
 {
-       char* p = strrchr(path, '/');
+       const char* p = strrchr(path, '/');
        if(!p)
        {
                p = strrchr(path, '\\');
index 5c7f1f8..7f30445 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="brushexport"\r
-       ProjectGUID="{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       Keyword="Win32Proj">\r
+       ProjectGUID="{334D54AE-9AF7-43EA-BC64-2E31846B972E}"\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../../gtk2-2.4/include/gtkglext-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BRUSHEXPORT_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comdlg32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
                                OutputFile="$(OutDir)/brushexport.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="../../../gtk2-2.4/lib"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../gtk2-2.10/lib"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                ImportLibrary="$(OutDir)/brushexport.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
+                       WholeProgramOptimization="1"\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
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
+                               EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               OptimizeForWindowsApplication="FALSE"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.4\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.4\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BRUSHEXPORT_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="comdlg32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
                                OutputFile="$(OutDir)/brushexport.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="../../../gtk2-2.4/lib"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="../../../gtk2-2.10/lib"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/brushexport.lib"\r
                                TargetMachine="1"\r
-                               FixedBaseAddress="0"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               FixedBaseAddress="0"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
@@ -150,37 +208,48 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugi
                <Filter\r
                        Name="src"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}">\r
+                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\callbacks.cpp">\r
+                               RelativePath=".\callbacks.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\callbacks.h">\r
+                               RelativePath=".\callbacks.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\export.cpp">\r
+                               RelativePath=".\export.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\export.h">\r
+                               RelativePath=".\export.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\interface.cpp">\r
+                               RelativePath=".\interface.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\plugin.cpp">\r
+                               RelativePath=".\plugin.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\plugin.h">\r
+                               RelativePath=".\plugin.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\support.cpp">\r
+                               RelativePath=".\support.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\support.h">\r
+                               RelativePath=".\support.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\brushexport.def">\r
+                       RelativePath=".\brushexport.def"\r
+                       >\r
                </File>\r
        </Files>\r
        <Globals>\r
index 1225d00..9d34c92 100644 (file)
@@ -33,7 +33,7 @@ void OnExportClicked(GtkButton* button, gpointer user_data)
   GtkListStore* list = GTK_LIST_STORE(gtk_tree_view_get_model(view));\r
 \r
   GtkTreeIter iter;\r
-  bool valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list), &iter);\r
+  gboolean valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list), &iter);\r
   while(valid)\r
   {\r
     gchar* data;\r
diff --git a/contrib/camera/camera.dsp b/contrib/camera/camera.dsp
deleted file mode 100644 (file)
index d22a457..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-# Microsoft Developer Studio Project File - Name="camera" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=camera - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "camera.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "camera.mak" CFG="camera - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "camera - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "camera - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "camera"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "camera - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CAMERA_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\stlport\stlport" /I "..\..\..\libxml2\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CAMERA_EXPORTS" /FR /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "NDEBUG"\r
-# ADD RSC /l 0x40c /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 user32.lib synapse.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib /nologo /dll /machine:I386 /def:".\camera.def" /libpath:"../../libs/synapse/release" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Copy to dir...\r
-PostBuild_Cmds=copy Release\camera.dll "../../install/plugins"\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "camera - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CAMERA_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\stlport\stlport" /I "..\..\..\libxml2\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CAMERA_EXPORTS" /YX /FD /I /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "_DEBUG"\r
-# ADD RSC /l 0x40c /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib synapse.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib /nologo /dll /debug /machine:I386 /def:".\camera.def" /pdbtype:sept /libpath:"../../libs/synapse/debug" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Copy to dir...\r
-PostBuild_Cmds=copy Debug\camera.dll "../../install/plugins"\r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "camera - Win32 Release"\r
-# Name "camera - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\camera.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\camera.def\r
-# PROP Exclude_From_Build 1\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dialogs.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dialogs_common.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\funchandlers.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\listener.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\misc.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\renderer.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\camera.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dialogs.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\funchandlers.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\listener.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\misc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\renderer.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/contrib/gtkgensurf/gtkgensurf.dsp b/contrib/gtkgensurf/gtkgensurf.dsp
deleted file mode 100644 (file)
index 70f9ed9..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gtkgensurf" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=gtkgensurf - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gtkgensurf.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gtkgensurf.mak" CFG="gtkgensurf - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "gtkgensurf - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "gtkgensurf - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "gtkgensurf"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "gtkgensurf - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Release/"\r
-# ADD F90 /include:"Release/"\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GTKGENSURF_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /O2 /I "..\..\libs" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\stlport\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GTKGENSURF_EXPORTS" /FR /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib /nologo /dll /machine:I386 /def:".\gensurf.def" /out:"Release/gensurf.dll" /libpath:"..\..\..\src\glib" /libpath:"..\..\..\src\gtk+\gtk" /libpath:"..\..\..\src\gtk+\gdk" /libpath:"../../libs/synapse/debug" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "gtkgensurf - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Debug/"\r
-# ADD F90 /include:"Debug/"\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GTKGENSURF_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\libs" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\stlport\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GTKGENSURF_EXPORTS" /FR /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib /nologo /dll /debug /machine:I386 /def:".\gensurf.def" /out:"Debug/gensurf.dll" /pdbtype:sept /libpath:"..\..\..\src\glib" /libpath:"..\..\..\src\gtk+\gtk" /libpath:"..\..\..\src\gtk+\gdk" /libpath:"../../libs/synapse/debug" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "gtkgensurf - Win32 Release"\r
-# Name "gtkgensurf - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\bitmap.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dec.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\face.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\font.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gendlgs.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\genmap.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gensurf.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gensurf.def\r
-# PROP Exclude_From_Build 1\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\heretic.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plugin.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\triangle.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\view.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\gendlgs.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gensurf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\triangle.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/contrib/hydratoolz/hydratoolz.dsp b/contrib/hydratoolz/hydratoolz.dsp
deleted file mode 100644 (file)
index e7ef09c..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-# Microsoft Developer Studio Project File - Name="hydratoolz" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=hydratoolz - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "hydratoolz.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "hydratoolz.mak" CFG="hydratoolz - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "hydratoolz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "hydratoolz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "hydratoolz"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "hydratoolz - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYDRATOOLZ_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYDRATOOLZ_EXPORTS" /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "NDEBUG"\r
-# ADD RSC /l 0x40c /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib mathlib.lib /nologo /dll /machine:I386 /libpath:"..\..\..\gtk2-win32\lib\\" /libpath:"..\..\libs\mathlib\release"\r
-\r
-!ELSEIF  "$(CFG)" == "hydratoolz - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYDRATOOLZ_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYDRATOOLZ_EXPORTS" /YX /FD /GZ /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x40c /d "_DEBUG"\r
-# ADD RSC /l 0x40c /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib glib-2.0.lib gobject-2.0.lib mathlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\gtk2-win32\lib\\" /libpath:"..\..\libs\mathlib\debug"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "hydratoolz - Win32 Release"\r
-# Name "hydratoolz - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\hydratoolz.def\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plugin.cpp\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\plugin.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/contrib/prtview/PrtView.dsp b/contrib/prtview/PrtView.dsp
deleted file mode 100644 (file)
index 75aae25..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="PrtView" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=PrtView - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "PrtView.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "PrtView.mak" CFG="PrtView - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "PrtView - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "PrtView - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "PrtView"\r
-# PROP Scc_LocalPath "."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "PrtView - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 6\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 6\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Release/"\r
-# ADD F90 /include:"Release/"\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c\r
-# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\STLport\stlport" /I "..\..\..\libxml2\include" /I "..\..\libs" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /D "NDEBUG" /D "GTK_PLUGIN" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"\r
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib /nologo /subsystem:windows /dll /machine:I386 /def:".\PrtView.def" /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Copy to dir...\r
-PostBuild_Cmds=copy Release\PrtView.dll "..\..\install\plugins"\r
-# End Special Build Tool\r
-\r
-!ELSEIF  "$(CFG)" == "PrtView - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 6\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 6\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-F90=df.exe\r
-# ADD BASE F90 /include:"Debug/"\r
-# ADD F90 /browser /include:"Debug/"\r
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c\r
-# ADD CPP /nologo /MDd /W3 /ZI /Od /I "..\..\..\STLport\stlport" /I "..\..\..\libxml2\include" /I "..\..\libs" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\lib\gtk-2.0\include" /I "..\..\..\gtk2-win32\include\gtk-2.0" /I "..\..\..\gtk2-win32\include\gtk-2.0\gdk" /I "..\..\..\gtk2-win32\include\pango-1.0" /I "..\..\..\gtk2-win32\include\atk-1.0" /D "_DEBUG" /D "GTK_PLUGIN" /D "WIN32" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /c\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:".\PrtView.def" /pdbtype:sept /libpath:"..\..\..\gtk2-win32\lib"\r
-# SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Copy to dir...\r
-PostBuild_Cmds=copy Debug\PrtView.dll "..\..\install\plugins"\r
-# End Special Build Tool\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "PrtView - Win32 Release"\r
-# Name "PrtView - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\AboutDialog.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\ConfigDialog.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\LoadPortalFileDialog.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Portals.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\PrtView.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\PrtView.def\r
-# PROP Exclude_From_Build 1\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\PrtView.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\StdAfx.cpp\r
-# ADD CPP /Yc"stdafx.h"\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\AboutDialog.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\ConfigDialog.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\LoadPortalFileDialog.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Portals.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\PrtView.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\PrtView2.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\Resource.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\StdAfx.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"\r
-# Begin Source File\r
-\r
-SOURCE=.\res\PrtView.rc2\r
-# End Source File\r
-# End Group\r
-# Begin Source File\r
-\r
-SOURCE=.\ReadMe.txt\r
-# End Source File\r
-# End Target\r
-# End Project\r
index 79133b0..43e40fa 100644 (file)
@@ -1,32 +1,58 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="PrtView"\r
        ProjectGUID="{B20364D1-4329-4D4E-B9CE-C9767618FDD6}"\r
-       Keyword="MFCProj">\r
+       Keyword="MFCProj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory=".\Debug"\r
                        IntermediateDirectory=".\Debug"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="2"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Debug/PrtView.tlb"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/include/atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
+                               BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                PrecompiledHeaderThrough=""\r
                                PrecompiledHeaderFile=" "\r
                                ProgramDataBaseFileName=".\Debug/"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                                CompileAs="2"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib profile.lib"\r
                                OutputFile=".\Debug/PrtView.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;;../../libs/profile/debug"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;;../../libs/profile/debug"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile=".\PrtView.def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                ImportLibrary=".\Debug/PrtView.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               MkTypLibCompatible="TRUE"\r
-                               SuppressStartupBanner="TRUE"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName=".\Debug/PrtView.tlb"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
-                               Culture="1033"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory=".\Release"\r
                        IntermediateDirectory=".\Release"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="2"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\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
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="true"\r
+                               SuppressStartupBanner="true"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Release/PrtView.tlb"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
+                               EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/include/atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
-                               EnableFunctionLevelLinking="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                PrecompiledHeaderThrough=""\r
                                PrecompiledHeaderFile=" "\r
@@ -116,60 +169,66 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugi
                                ProgramDataBaseFileName=".\Release/"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               SuppressStartupBanner="true"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
                                CompileAs="2"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib pango-1.0.lib profile.lib"\r
                                OutputFile=".\Release/PrtView.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;;../../libs/profile/release"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;;../../libs/profile/release"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile=".\PrtView.def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary=".\Release/PrtView.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               MkTypLibCompatible="TRUE"\r
-                               SuppressStartupBanner="TRUE"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName=".\Release/PrtView.tlb"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
-                               Culture="1033"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
@@ -177,76 +236,95 @@ copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugi
        <Files>\r
                <Filter\r
                        Name="src"\r
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       >\r
                        <File\r
-                               RelativePath=".\AboutDialog.cpp">\r
+                               RelativePath=".\AboutDialog.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\AboutDialog.h">\r
+                               RelativePath=".\AboutDialog.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ConfigDialog.cpp">\r
+                               RelativePath=".\ConfigDialog.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ConfigDialog.h">\r
+                               RelativePath=".\ConfigDialog.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\LoadPortalFileDialog.cpp">\r
+                               RelativePath=".\LoadPortalFileDialog.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\LoadPortalFileDialog.h">\r
+                               RelativePath=".\LoadPortalFileDialog.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\portals.cpp">\r
+                               RelativePath=".\portals.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\portals.h">\r
+                               RelativePath=".\portals.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\prtview.cpp">\r
+                               RelativePath=".\prtview.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\prtview.h">\r
+                               RelativePath=".\prtview.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="..\..\debug.py">\r
+                       RelativePath="..\..\debug.py"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetName).pdb&quot;"\r
-                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"/>\r
+                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)debug.py&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetName).pdb&quot;"\r
-                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"/>\r
+                                       Outputs="&quot;$(TargetDir)$(TargetName).pdb&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
                <File\r
-                       RelativePath=".\PrtView.def">\r
+                       RelativePath=".\PrtView.def"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
        </Files>\r
index 1b9044b..b7cc2c1 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="shaderplug"\r
-       ProjectGUID="{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       Keyword="Win32Proj">\r
+       ProjectGUID="{0B09566E-63DB-4A28-A555-BBE2747769B6}"\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.4\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;;..\..\libs\generic;&quot;..\..\..\gtk2-2.4\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.4\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\atk-1.0&quot;;..\..\plugins\shaders;&quot;..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\iconv-1.9\include&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.10\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.10\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.10\lib\glib-2.0\include&quot;;..\..\libs\generic;&quot;..\..\..\gtk2-2.10\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.10\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.10\include\atk-1.0&quot;;..\..\plugins\shaders;&quot;..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\gtk2-2.10\include&quot;;&quot;..\..\..\gtk2-2.10\include\cairo&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SHADERPLUG_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="gtk-win32-2.0.lib gobject-2.0.lib libxml2.lib glib-2.0.lib"\r
                                OutputFile="$(OutDir)/shaderplug.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\gtk2-2.4\lib&quot;;&quot;..\..\..\libxml2-2.6\lib&quot;"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;..\..\..\gtk2-2.10\lib&quot;;&quot;..\..\..\libxml2-2.6\lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                ImportLibrary="$(OutDir)/shaderplug.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
+                       WholeProgramOptimization="1"\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
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
+                               EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               OptimizeForWindowsApplication="FALSE"\r
-                               AdditionalIncludeDirectories="../../include;..\..\libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\iconv-1.9\include&quot;;&quot;..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.4\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.4\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.10\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.10\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.10\lib\glib-2.0\include&quot;;..\..\libs\generic;&quot;..\..\..\gtk2-2.10\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.10\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.10\include\atk-1.0&quot;;..\..\plugins\shaders;&quot;..\..\..\libxml2-2.6\include&quot;;&quot;..\..\..\gtk2-2.10\include&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SHADERPLUG_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib gtk-win32-2.0.lib gobject-2.0.lib libxml2.lib"\r
                                OutputFile="$(OutDir)/shaderplug.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;..\..\..\gtk2-2.4\lib&quot;;&quot;..\..\..\libxml2-2.6\lib&quot;"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;..\..\..\gtk2-2.10\lib&quot;;&quot;..\..\..\libxml2-2.6\lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/shaderplug.lib"\r
                                TargetMachine="1"\r
-                               FixedBaseAddress="0"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               FixedBaseAddress="0"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="src"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}">\r
+                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\shaderplug.cpp">\r
+                               RelativePath=".\shaderplug.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\shaderplug.h">\r
+                               RelativePath=".\shaderplug.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\shaderplug.def">\r
+                       RelativePath=".\shaderplug.def"\r
+                       >\r
                </File>\r
        </Files>\r
        <Globals>\r
index 0c98c31..2fe56cc 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="sunplug"\r
        ProjectGUID="{46B36F0C-5E17-458E-AE6F-AECE52F66EDF}"\r
        RootNamespace="sunplug"\r
-       Keyword="Win32Proj">\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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="../../include;../../libs;&quot;../../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SUNPLUG_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
                                OutputFile="$(OutDir)/sunplug.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                ImportLibrary="$(OutDir)/sunplug.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
-                               OptimizeForWindowsApplication="TRUE"\r
-                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../gtk2-2.4/include/atk-1.0&quot;;&quot;../../../gtk2-2.4/include/glib-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0&quot;;&quot;../../../gtk2-2.4/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.4/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.4/include/pango-1.0&quot;;&quot;../../../gtk2-2.4/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.4/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.4/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;"\r
+                               EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SUNPLUG_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
+                               BufferSecurityCheck="false"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="wsock32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib pango-1.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib"\r
                                OutputFile="$(OutDir)/sunplug.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/sunplug.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
-                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;&#x0D;&#x0A;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="src"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}">\r
+                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\sunplug.cpp">\r
+                               RelativePath=".\sunplug.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sunplug.h">\r
+                               RelativePath=".\sunplug.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\sunplug.def">\r
+                       RelativePath=".\sunplug.def"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\modules\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
        </Files>\r
index ab4f11c..a51e9c8 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="ufoai"\r
-       ProjectGUID="{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}"\r
-       Keyword="Win32Proj">\r
+       ProjectGUID="{623CDF9E-ACC5-43E2-8E8D-B6266235A044}"\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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="..\..\include;..\..\libs;&quot;..\..\..\STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.4\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.4\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;;$(NOINHERIT)"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;UFOAI_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="gtk-win32-2.0.lib gobject-2.0.lib"\r
                                OutputFile="$(OutDir)/ufoai.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprtd.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                ImportLibrary="$(OutDir)/ufoai.lib"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="2"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
-                       WholeProgramOptimization="TRUE">\r
+                       WholeProgramOptimization="1"\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
-                               GlobalOptimizations="TRUE"\r
                                InlineFunctionExpansion="2"\r
-                               EnableIntrinsicFunctions="TRUE"\r
+                               EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               OptimizeForWindowsApplication="FALSE"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\libs;&quot;..\..\..\STLPort-4.6/stlport&quot;;&quot;..\..\..\gtk2-2.4\include\gtk-2.0&quot;;&quot;..\..\..\gtk2-2.4\include\glib-2.0&quot;;&quot;..\..\..\gtk2-2.4\lib\glib-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\pango-1.0&quot;;&quot;..\..\..\gtk2-2.4\lib\gtk-2.0\include&quot;;&quot;..\..\..\gtk2-2.4\include\atk-1.0&quot;"\r
+                               AdditionalIncludeDirectories="../../include;../../libs;&quot;../../../gtk2-2.10/include/atk-1.0&quot;;&quot;../../../gtk2-2.10/include/glib-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0&quot;;&quot;../../../gtk2-2.10/include/gtk-2.0/gdk&quot;;&quot;../../../gtk2-2.10/include/gtkglext-1.0&quot;;&quot;../../../gtk2-2.10/include/pango-1.0&quot;;&quot;../../../gtk2-2.10/lib/glib-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtk-2.0/include&quot;;&quot;../../../gtk2-2.10/lib/gtkglext-1.0/include&quot;;&quot;../../../libxml2-2.6/include&quot;;&quot;../../../STLPort-4.6/stlport&quot;;&quot;../../../gtk2-2.10/include/cairo&quot;;$(NOINHERIT)"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UFOAI_EXPORTS"\r
-                               StringPooling="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="4"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="gtk-win32-2.0.lib gobject-2.0.lib"\r
                                OutputFile="$(OutDir)/ufoai.dll"\r
                                LinkIncremental="1"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.4/lib&quot;"\r
+                               SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="&quot;../../../gtk2-2.10/lib&quot;"\r
                                IgnoreDefaultLibraryNames="msvcprt.lib"\r
                                ModuleDefinitionFile="$(ProjectName).def"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                ImportLibrary="$(OutDir)/ufoai.lib"\r
                                TargetMachine="1"\r
-                               FixedBaseAddress="0"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               FixedBaseAddress="0"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="src"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}">\r
+                       UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\ufoai.cpp">\r
+                               RelativePath=".\ufoai.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai.h">\r
+                               RelativePath=".\ufoai.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_filters.cpp">\r
+                               RelativePath=".\ufoai_filters.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_filters.h">\r
+                               RelativePath=".\ufoai_filters.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_gtk.cpp">\r
+                               RelativePath=".\ufoai_gtk.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_gtk.h">\r
+                               RelativePath=".\ufoai_gtk.h"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_level.cpp">\r
+                               RelativePath=".\ufoai_level.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\ufoai_level.h">\r
+                               RelativePath=".\ufoai_level.h"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\ufoai.def">\r
+                       RelativePath=".\ufoai.def"\r
+                       >\r
                        <FileConfiguration\r
-                               Name="Debug|Win32">\r
+                               Name="Debug|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32">\r
+                               Name="Release|Win32"\r
+                               >\r
                                <Tool\r
                                        Name="VCCustomBuildTool"\r
-                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;\r
-"\r
+                                       CommandLine="python &quot;$(SolutionDir)touch.py&quot; &quot;$(TargetPath)&quot;&#x0D;&#x0A;"\r
                                        AdditionalDependencies="&quot;$(SolutionDir)install\plugins\$(TargetFileName)&quot;"\r
-                                       Outputs="&quot;$(TargetPath)&quot;"/>\r
+                                       Outputs="&quot;$(TargetPath)&quot;"\r
+                               />\r
                        </FileConfiguration>\r
                </File>\r
        </Files>\r
diff --git a/gen.dsp b/gen.dsp
deleted file mode 100644 (file)
index 2d9ddb5..0000000
--- a/gen.dsp
+++ /dev/null
@@ -1,124 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gen" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Generic Project" 0x010a\r
-\r
-CFG=gen - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gen.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Generic Project")\r
-!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Generic Project")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "gen"\r
-# PROP Scc_LocalPath "."\r
-MTL=midl.exe\r
-\r
-!IF  "$(CFG)" == "gen - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "gen___Win32_Release"\r
-# PROP BASE Intermediate_Dir "gen___Win32_Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "gen___Win32_Release"\r
-# PROP Intermediate_Dir "gen___Win32_Release"\r
-# PROP Target_Dir ""\r
-\r
-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "gen___Win32_Debug"\r
-# PROP BASE Intermediate_Dir "gen___Win32_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "gen___Win32_Debug"\r
-# PROP Intermediate_Dir "gen___Win32_Debug"\r
-# PROP Target_Dir ""\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "gen - Win32 Release"\r
-# Name "gen - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=.\include\aboutmsg.default\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gen.readme\r
-\r
-!IF  "$(CFG)" == "gen - Win32 Release"\r
-\r
-# PROP Ignore_Default_Tool 1\r
-# Begin Custom Build\r
-InputPath=.\gen.readme\r
-\r
-BuildCmds= \\r
-       run_python.bat makeversion.py\r
-\r
-"include/version.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-\r
-"include/aboutmsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-\r
-"include/RADIANT_MAJOR" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-\r
-"include/RADIANT_MINOR" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "gen - Win32 Debug"\r
-\r
-# PROP Ignore_Default_Tool 1\r
-# Begin Custom Build\r
-InputPath=.\gen.readme\r
-\r
-BuildCmds= \\r
-       run_python.bat makeversion.py\r
-\r
-"include/version.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-\r
-"include/aboutmsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-   $(BuildCmds)\r
-# End Custom Build\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\makeversion.py\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\run_python.bat\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\include\version.default\r
-# End Source File\r
-# End Target\r
-# End Project\r
index adfba8f..75af13f 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="gen"\r
        ProjectGUID="{BED4E2E5-0368-4042-9898-4914B0372468}"\r
        RootNamespace="gen"\r
-       Keyword="Win32Proj">\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
-                               MinimalRebuild="TRUE"\r
+                               MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="5"\r
-                               UsePrecompiledHeader="3"\r
+                               RuntimeLibrary="1"\r
+                               UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="4"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/gen.exe"\r
                                LinkIncremental="2"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/gen.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="1"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
-                               RuntimeLibrary="4"\r
-                               UsePrecompiledHeader="3"\r
+                               RuntimeLibrary="0"\r
+                               UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/gen.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="TRUE"\r
+                               GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
                        <File\r
-                               RelativePath=".\include\aboutmsg.default">\r
+                               RelativePath=".\include\aboutmsg.default"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\makeversion.py">\r
+                               RelativePath=".\makeversion.py"\r
+                               >\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="Debug|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               CommandLine="run_python.bat makeversion.py\r
-"\r
+                                               CommandLine="run_python.bat makeversion.py&#x0D;&#x0A;"\r
                                                AdditionalDependencies="$(InputDir)include\version.default;$(InputDir)include\aboutmsg.default;$(InputDir)svn.py;$(InputDir).svn\entriest"\r
-                                               Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/>\r
+                                               Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"\r
+                                       />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32">\r
+                                       Name="Release|Win32"\r
+                                       >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
-                                               CommandLine="run_python.bat makeversion.py\r
-"\r
+                                               CommandLine="run_python.bat makeversion.py&#x0D;&#x0A;"\r
                                                AdditionalDependencies="$(InputDir).svn\entries;$(InputDir)include\version.default;$(InputDir)include\aboutmsg.default;$(InputDir)svn.py"\r
-                                               Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"/>\r
+                                               Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h"\r
+                                       />\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\svn.py">\r
+                               RelativePath=".\svn.py"\r
+                               >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\version.default">\r
+                               RelativePath=".\include\version.default"\r
+                               >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
                </Filter>\r
        </Files>\r
        <Globals>\r
index 6d2e8fe..d77ed41 100644 (file)
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8,00"\r
        Name="include"\r
        ProjectGUID="{04A5D9EE-EC49-4CBC-BD05-D80BC287897C}"\r
-       Keyword="Win32Proj">\r
+       Keyword="Win32Proj"\r
+       >\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                        OutputDirectory="Debug"\r
                        IntermediateDirectory="Debug"\r
                        ConfigurationType="4"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="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;../include&quot;;&quot;../libs&quot;;&quot;../../STLport-4.6/stlport&quot;;&quot;../../libxml2-2.6/include&quot;;&quot;../../iconv-1.9/include&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               StringPooling="TRUE"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="FALSE"\r
+                               StringPooling="true"\r
+                               MinimalRebuild="true"\r
+                               ExceptionHandling="0"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
-                               BufferSecurityCheck="FALSE"\r
-                               ForceConformanceInForLoopScope="TRUE"\r
+                               BufferSecurityCheck="false"\r
+                               ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="0"\r
                                BrowseInformation="0"\r
                                WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
+                               Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"/>\r
+                               DisableSpecificWarnings="4610;4510;4512;4505;4100;4127"\r
+                       />\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="$(OutDir)/include.lib"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="$(OutDir)/include.lib"\r
+                       />\r
                        <Tool\r
-                               Name="VCResourceCompilerTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCBscMakeTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="Release"\r
                        IntermediateDirectory="Release"\r
                        ConfigurationType="4"\r
-                       CharacterSet="2">\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+   &nb