From 2d579770120632e47961d765c569a5316a2b53b5 Mon Sep 17 00:00:00 2001 From: namespace Date: Wed, 28 Feb 2007 20:55:39 +0000 Subject: [PATCH] - 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 git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@143 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 18 + CONTRIBUTORS | 13 +- GtkRadiant.sln | 352 +++--- contrib/bkgrnd2d/bkgrnd2d.dsp | 133 -- contrib/bobtoolz/bobToolz.dsw | 41 - contrib/bobtoolz/bobToolz_gtk.dsp | 344 ------ contrib/bobtoolz/bobtoolz.vcproj | 400 +++--- contrib/bobtoolz/misc.cpp | 2 +- contrib/brushexport/brushexport.vcproj | 219 ++-- contrib/brushexport/callbacks.cpp | 2 +- contrib/camera/camera.dsp | 174 --- contrib/gtkgensurf/gtkgensurf.dsp | 172 --- contrib/hydratoolz/hydratoolz.dsp | 117 -- contrib/prtview/PrtView.dsp | 195 --- contrib/prtview/PrtView.vcproj | 286 +++-- contrib/shaderplug/shaderplug.vcproj | 196 ++- contrib/sunplug/sunplug.vcproj | 202 +-- contrib/ufoaiplug/ufoai.vcproj | 230 ++-- gen.dsp | 124 -- gen.vcproj | 188 ++- include/include.vcproj | 398 ++++-- install.py | 18 +- libs/cmdlib/cmdlib.dsp | 101 -- libs/cmdlib/cmdlib.vcproj | 149 ++- libs/ddslib/ddslib.dsp | 106 -- libs/ddslib/ddslib.vcproj | 173 ++- libs/gtkutil/filechooser.cpp | 184 +-- libs/gtkutil/filechooser.h | 4 - libs/gtkutil/glfont.cpp | 4 + libs/gtkutil/gtkutil.vcproj | 284 +++-- libs/jpeg6/jpeg6.dsp | 218 ---- libs/jpeg6/jpeg6.vcproj | 242 ++-- libs/l_net/l_net.dsp | 118 -- libs/l_net/l_net.vcproj | 154 ++- libs/libs.vcproj | 672 ++++++---- libs/mathlib/mathlib.dsp | 126 -- libs/mathlib/mathlib.vcproj | 236 ++-- libs/md5lib/md5lib.dsp | 106 -- libs/picomodel/picomodel.dsp | 206 ---- libs/picomodel/picomodel.vcproj | 229 ++-- libs/profile/profile.vcproj | 154 ++- libs/splines/Splines.dsp | 160 --- plugins/archivepak/archivepak.dsp | 150 --- plugins/archivepak/archivepak.vcproj | 239 ++-- plugins/archivewad/archivewad.dsp | 150 --- plugins/archivewad/archivewad.vcproj | 239 ++-- plugins/archivezip/archivezip.dsp | 154 --- plugins/archivezip/archivezip.vcproj | 253 ++-- plugins/entity/doom3group.cpp | 5 + plugins/entity/eclassmodel.cpp | 6 + plugins/entity/entity.dsp | 230 ---- plugins/entity/entityq3.vcproj | 364 ++++-- plugins/entity/generic.cpp | 5 + plugins/entity/light.cpp | 5 + plugins/entity/miscmodel.cpp | 6 + plugins/image/image.dsp | 166 --- plugins/image/imageq3.vcproj | 259 ++-- plugins/imagehl/imagehl.dsp | 174 --- plugins/imagehl/imagehl.vcproj | 247 ++-- plugins/imagepng/imagepng.dsp | 120 -- plugins/imagepng/imagepng.vcproj | 239 ++-- plugins/imageq2/imageq2.vcproj | 241 ++-- plugins/mapq3/mapq3.dsp | 166 --- plugins/mapq3/mapq3.vcproj | 241 ++-- plugins/mapxml/mapxml.dsp | 167 --- plugins/mapxml/mapxml.vcproj | 250 ++-- plugins/md3model/md3model.dsp | 218 ---- plugins/md3model/modelmd3.vcproj | 298 +++-- plugins/model/model.dsp | 178 --- plugins/model/modelpico.vcproj | 236 ++-- plugins/sample/sample.vcproj | 223 ++-- plugins/shaders/shaders.dsp | 142 --- plugins/shaders/shadersq3.vcproj | 243 ++-- plugins/spritemodel/spritemodel.dsp | 160 --- plugins/textool/TexTool.dsp | 174 --- plugins/vfspk3/vfspk3.dsp | 146 --- plugins/vfspk3/vfsq3.vcproj | 250 ++-- radiant.dsw | 1080 ---------------- radiant/GtkRadiant.dsp | 1082 ----------------- radiant/GtkRadiant.vcproj | 759 ++++++++---- radiant/preferences.cpp | 7 - tools/quake2/q2map/q2map.dsp | 290 ----- tools/quake2/q2map/q2map.vcproj | 357 ++++-- tools/quake2/qdata/qdata3.dsp | 218 ---- .../quake2/qdata_heretic2/qdata3_heretic2.dsp | 314 ----- tools/quake3/q3data/q3data.dsp | 200 --- tools/quake3/q3map2/q3map2.dsp | 378 ------ tools/quake3/q3map2/q3map2.dsw | 167 --- tools/quake3/q3map2/q3map2.vcproj | 426 ++++--- 89 files changed, 6619 insertions(+), 12453 deletions(-) delete mode 100644 contrib/bkgrnd2d/bkgrnd2d.dsp delete mode 100644 contrib/bobtoolz/bobToolz.dsw delete mode 100644 contrib/bobtoolz/bobToolz_gtk.dsp delete mode 100644 contrib/camera/camera.dsp delete mode 100644 contrib/gtkgensurf/gtkgensurf.dsp delete mode 100644 contrib/hydratoolz/hydratoolz.dsp delete mode 100644 contrib/prtview/PrtView.dsp delete mode 100644 gen.dsp delete mode 100644 libs/cmdlib/cmdlib.dsp delete mode 100644 libs/ddslib/ddslib.dsp delete mode 100644 libs/jpeg6/jpeg6.dsp delete mode 100644 libs/l_net/l_net.dsp delete mode 100644 libs/mathlib/mathlib.dsp delete mode 100644 libs/md5lib/md5lib.dsp delete mode 100644 libs/picomodel/picomodel.dsp delete mode 100644 libs/splines/Splines.dsp delete mode 100644 plugins/archivepak/archivepak.dsp delete mode 100644 plugins/archivewad/archivewad.dsp delete mode 100644 plugins/archivezip/archivezip.dsp delete mode 100644 plugins/entity/entity.dsp delete mode 100644 plugins/image/image.dsp delete mode 100644 plugins/imagehl/imagehl.dsp delete mode 100644 plugins/imagepng/imagepng.dsp delete mode 100644 plugins/mapq3/mapq3.dsp delete mode 100644 plugins/mapxml/mapxml.dsp delete mode 100644 plugins/md3model/md3model.dsp delete mode 100644 plugins/model/model.dsp delete mode 100644 plugins/shaders/shaders.dsp delete mode 100644 plugins/spritemodel/spritemodel.dsp delete mode 100644 plugins/textool/TexTool.dsp delete mode 100644 plugins/vfspk3/vfspk3.dsp delete mode 100644 radiant.dsw delete mode 100644 radiant/GtkRadiant.dsp delete mode 100644 tools/quake2/q2map/q2map.dsp delete mode 100644 tools/quake2/qdata/qdata3.dsp delete mode 100644 tools/quake2/qdata_heretic2/qdata3_heretic2.dsp delete mode 100644 tools/quake3/q3data/q3data.dsp delete mode 100644 tools/quake3/q3map2/q3map2.dsp delete mode 100644 tools/quake3/q3map2/q3map2.dsw diff --git a/CHANGES b/CHANGES index 721d4cdb..ede320a5 100644 --- 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 diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 8ee734d9..9590febe 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -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 diff --git a/GtkRadiant.sln b/GtkRadiant.sln index bd54ae7a..0e3bcd76 100644 --- a/GtkRadiant.sln +++ b/GtkRadiant.sln @@ -1,7 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entityq3", "plugins\entity\entityq3.vcproj", "{49C5823A-5E50-4029-ACEE-1627EBB79E47}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtkRadiant", "radiant\GtkRadiant.vcproj", "{8E70385C-223A-4DD1-9B99-28FF2331A2B5}" ProjectSection(ProjectDependencies) = postProject @@ -21,16 +20,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GtkRadiant", "radiant\GtkRa EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gen", "gen.vcproj", "{BED4E2E5-0368-4042-9898-4914B0372468}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net.vcproj", "{8845D5C1-4154-425F-8643-447FADC03449}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmdlib", "libs\cmdlib\cmdlib.vcproj", "{8845C5C1-4154-425F-8643-447FADC03449}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archivepak", "plugins\archivepak\archivepak.vcproj", "{75160E63-E642-4C71-9D4C-B733E152C418}" ProjectSection(ProjectDependencies) = postProject @@ -54,8 +47,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imageq3", "plugins\image\im EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelmd3", "plugins\md3model\modelmd3.vcproj", "{C2A5530D-C2DB-4503-A651-4B92AEC5FE74}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelpico", "plugins\model\modelpico.vcproj", "{386DBF35-2F76-4BB1-8B4B-1D69C34F8996}" ProjectSection(ProjectDependencies) = postProject @@ -63,36 +54,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelpico", "plugins\model\ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfsq3", "plugins\vfspk3\vfsq3.vcproj", "{0BB50F1C-E139-48A2-B9D8-1E781275777F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapq3", "plugins\mapq3\mapq3.vcproj", "{D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapxml", "plugins\mapxml\mapxml.vcproj", "{B43DBA9D-6EE0-421C-83D9-9776064B66B4}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadersq3", "plugins\shaders\shadersq3.vcproj", "{F79DCF6D-72B1-45F6-A471-5209951C0BDD}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{015EA9D3-85F2-4C4E-BFC3-430AC59093B9}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg6", "libs\jpeg6\jpeg6.vcproj", "{0501A08E-D4D7-42C1-9E2A-BA3F2F320741}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagehl", "plugins\imagehl\imagehl.vcproj", "{15DEA3EA-9386-49C7-80C6-5B090DE1D536}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagepng", "plugins\imagepng\imagepng.vcproj", "{15DEA4EA-9386-49C7-80C6-5B090DE1D536}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{8ED67991-58A6-44AA-9B3A-3217085EF187}" ProjectSection(ProjectDependencies) = postProject @@ -106,32 +81,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3ma EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib.vcproj", "{8576EC58-4E54-49C0-879A-F054C92B1D03}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "libs\mathlib\mathlib.vcproj", "{BF0FF048-887F-4D43-A455-F8C04FB98F10}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "libs\libs.vcproj", "{1C785349-866D-447D-8C55-8A51E5CA0E87}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "include", "include\include.vcproj", "{04A5D9EE-EC49-4CBC-BD05-D80BC287897C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profile", "libs\profile\profile.vcproj", "{853632F4-6420-40C5-B80B-38B678E472B8}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imageq2", "plugins\imageq2\imageq2.vcproj", "{697E77F2-9E9E-4F12-973F-C1214494248C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample", "plugins\sample\sample.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q2map", "tools\quake2\q2map\q2map.vcproj", "{FB80DE6C-51C8-4D56-876D-C7878A4EB10B}" ProjectSection(ProjectDependencies) = postProject @@ -139,186 +100,169 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q2map", "tools\quake2\q2map EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkutil", "libs\gtkutil\gtkutil.vcproj", "{68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PrtView", "contrib\prtview\PrtView.vcproj", "{B20364D1-4329-4D4E-B9CE-C9767618FDD6}" ProjectSection(ProjectDependencies) = postProject {853632F4-6420-40C5-B80B-38B678E472B8} = {853632F4-6420-40C5-B80B-38B678E472B8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{B20364D1-4329-4D4E-B9CE-C9767618FDD6}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{439FE12C-77F0-44CD-BC9B-803B3E92C197}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sunplug", "contrib\sunplug\sunplug.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brushexport", "contrib\brushexport\brushexport.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brushexport", "contrib\brushexport\brushexport.vcproj", "{334D54AE-9AF7-43EA-BC64-2E31846B972E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaderplug", "contrib\shaderplug\shaderplug.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaderplug", "contrib\shaderplug\shaderplug.vcproj", "{0B09566E-63DB-4A28-A555-BBE2747769B6}" ProjectSection(ProjectDependencies) = postProject {1C785349-866D-447D-8C55-8A51E5CA0E87} = {1C785349-866D-447D-8C55-8A51E5CA0E87} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoaiplug\ufoai.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoaiplug\ufoai.vcproj", "{623CDF9E-ACC5-43E2-8E8D-B6266235A044}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.ActiveCfg = Debug|Win32 - {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.Build.0 = Debug|Win32 - {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release.ActiveCfg = Release|Win32 - {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release.Build.0 = Release|Win32 - {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug.ActiveCfg = Debug|Win32 - {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug.Build.0 = Debug|Win32 - {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release.ActiveCfg = Release|Win32 - {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release.Build.0 = Release|Win32 - {BED4E2E5-0368-4042-9898-4914B0372468}.Debug.ActiveCfg = Debug|Win32 - {BED4E2E5-0368-4042-9898-4914B0372468}.Debug.Build.0 = Debug|Win32 - {BED4E2E5-0368-4042-9898-4914B0372468}.Release.ActiveCfg = Release|Win32 - {BED4E2E5-0368-4042-9898-4914B0372468}.Release.Build.0 = Release|Win32 - {8845D5C1-4154-425F-8643-447FADC03449}.Debug.ActiveCfg = Debug|Win32 - {8845D5C1-4154-425F-8643-447FADC03449}.Debug.Build.0 = Debug|Win32 - {8845D5C1-4154-425F-8643-447FADC03449}.Release.ActiveCfg = Release|Win32 - {8845D5C1-4154-425F-8643-447FADC03449}.Release.Build.0 = Release|Win32 - {8845C5C1-4154-425F-8643-447FADC03449}.Debug.ActiveCfg = Debug|Win32 - {8845C5C1-4154-425F-8643-447FADC03449}.Debug.Build.0 = Debug|Win32 - {8845C5C1-4154-425F-8643-447FADC03449}.Release.ActiveCfg = Release|Win32 - {8845C5C1-4154-425F-8643-447FADC03449}.Release.Build.0 = Release|Win32 - {75160E63-E642-4C71-9D4C-B733E152C418}.Debug.ActiveCfg = Debug|Win32 - {75160E63-E642-4C71-9D4C-B733E152C418}.Debug.Build.0 = Debug|Win32 - {75160E63-E642-4C71-9D4C-B733E152C418}.Release.ActiveCfg = Release|Win32 - {75160E63-E642-4C71-9D4C-B733E152C418}.Release.Build.0 = Release|Win32 - {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug.ActiveCfg = Debug|Win32 - {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug.Build.0 = Debug|Win32 - {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release.ActiveCfg = Release|Win32 - {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release.Build.0 = Release|Win32 - {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug.ActiveCfg = Debug|Win32 - {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug.Build.0 = Debug|Win32 - {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release.ActiveCfg = Release|Win32 - {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release.Build.0 = Release|Win32 - {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug.ActiveCfg = Debug|Win32 - {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug.Build.0 = Debug|Win32 - {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release.ActiveCfg = Release|Win32 - {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release.Build.0 = Release|Win32 - {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug.ActiveCfg = Debug|Win32 - {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug.Build.0 = Debug|Win32 - {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release.ActiveCfg = Release|Win32 - {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release.Build.0 = Release|Win32 - {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug.ActiveCfg = Debug|Win32 - {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug.Build.0 = Debug|Win32 - {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release.ActiveCfg = Release|Win32 - {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release.Build.0 = Release|Win32 - {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug.ActiveCfg = Debug|Win32 - {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug.Build.0 = Debug|Win32 - {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release.ActiveCfg = Release|Win32 - {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release.Build.0 = Release|Win32 - {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug.ActiveCfg = Debug|Win32 - {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug.Build.0 = Debug|Win32 - {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release.ActiveCfg = Release|Win32 - {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release.Build.0 = Release|Win32 - {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug.ActiveCfg = Debug|Win32 - {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug.Build.0 = Debug|Win32 - {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release.ActiveCfg = Release|Win32 - {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release.Build.0 = Release|Win32 - {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug.ActiveCfg = Debug|Win32 - {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug.Build.0 = Debug|Win32 - {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release.ActiveCfg = Release|Win32 - {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release.Build.0 = Release|Win32 - {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug.ActiveCfg = Debug|Win32 - {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug.Build.0 = Debug|Win32 - {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release.ActiveCfg = Release|Win32 - {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release.Build.0 = Release|Win32 - {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug.ActiveCfg = Debug|Win32 - {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug.Build.0 = Debug|Win32 - {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release.ActiveCfg = Release|Win32 - {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release.Build.0 = Release|Win32 - {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug.ActiveCfg = Debug|Win32 - {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug.Build.0 = Debug|Win32 - {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release.ActiveCfg = Release|Win32 - {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release.Build.0 = Release|Win32 - {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug.ActiveCfg = Debug|Win32 - {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug.Build.0 = Debug|Win32 - {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release.ActiveCfg = Release|Win32 - {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release.Build.0 = Release|Win32 - {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug.ActiveCfg = Debug|Win32 - {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug.Build.0 = Debug|Win32 - {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release.ActiveCfg = Release|Win32 - {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release.Build.0 = Release|Win32 - {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug.ActiveCfg = Debug|Win32 - {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug.Build.0 = Debug|Win32 - {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release.ActiveCfg = Release|Win32 - {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release.Build.0 = Release|Win32 - {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug.ActiveCfg = Debug|Win32 - {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug.Build.0 = Debug|Win32 - {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release.ActiveCfg = Release|Win32 - {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release.Build.0 = Release|Win32 - {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug.ActiveCfg = Debug|Win32 - {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug.Build.0 = Debug|Win32 - {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release.ActiveCfg = Release|Win32 - {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release.Build.0 = Release|Win32 - {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug.ActiveCfg = Debug|Win32 - {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug.Build.0 = Debug|Win32 - {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release.ActiveCfg = Release|Win32 - {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release.Build.0 = Release|Win32 - {853632F4-6420-40C5-B80B-38B678E472B8}.Debug.ActiveCfg = Debug|Win32 - {853632F4-6420-40C5-B80B-38B678E472B8}.Debug.Build.0 = Debug|Win32 - {853632F4-6420-40C5-B80B-38B678E472B8}.Release.ActiveCfg = Release|Win32 - {853632F4-6420-40C5-B80B-38B678E472B8}.Release.Build.0 = Release|Win32 - {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug.ActiveCfg = Debug|Win32 - {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug.Build.0 = Debug|Win32 - {697E77F2-9E9E-4F12-973F-C1214494248C}.Release.ActiveCfg = Release|Win32 - {697E77F2-9E9E-4F12-973F-C1214494248C}.Release.Build.0 = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 - {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug.ActiveCfg = Debug|Win32 - {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug.Build.0 = Debug|Win32 - {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release.ActiveCfg = Release|Win32 - {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release.Build.0 = Release|Win32 - {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug.ActiveCfg = Debug|Win32 - {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug.Build.0 = Debug|Win32 - {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release.ActiveCfg = Release|Win32 - {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release.Build.0 = Release|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.ActiveCfg = Debug|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.Build.0 = Debug|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.ActiveCfg = Release|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.Build.0 = Release|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.ActiveCfg = Debug|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug.Build.0 = Debug|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.ActiveCfg = Release|Win32 - {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release.Build.0 = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug.ActiveCfg = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug.Build.0 = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release.ActiveCfg = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release.Build.0 = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 - {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug|Win32.ActiveCfg = Debug|Win32 + {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug|Win32.Build.0 = Debug|Win32 + {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release|Win32.ActiveCfg = Release|Win32 + {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Release|Win32.Build.0 = Release|Win32 + {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Debug|Win32.Build.0 = Debug|Win32 + {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release|Win32.ActiveCfg = Release|Win32 + {8E70385C-223A-4DD1-9B99-28FF2331A2B5}.Release|Win32.Build.0 = Release|Win32 + {BED4E2E5-0368-4042-9898-4914B0372468}.Debug|Win32.ActiveCfg = Debug|Win32 + {BED4E2E5-0368-4042-9898-4914B0372468}.Debug|Win32.Build.0 = Debug|Win32 + {BED4E2E5-0368-4042-9898-4914B0372468}.Release|Win32.ActiveCfg = Release|Win32 + {BED4E2E5-0368-4042-9898-4914B0372468}.Release|Win32.Build.0 = Release|Win32 + {8845D5C1-4154-425F-8643-447FADC03449}.Debug|Win32.ActiveCfg = Debug|Win32 + {8845D5C1-4154-425F-8643-447FADC03449}.Debug|Win32.Build.0 = Debug|Win32 + {8845D5C1-4154-425F-8643-447FADC03449}.Release|Win32.ActiveCfg = Release|Win32 + {8845D5C1-4154-425F-8643-447FADC03449}.Release|Win32.Build.0 = Release|Win32 + {8845C5C1-4154-425F-8643-447FADC03449}.Debug|Win32.ActiveCfg = Debug|Win32 + {8845C5C1-4154-425F-8643-447FADC03449}.Debug|Win32.Build.0 = Debug|Win32 + {8845C5C1-4154-425F-8643-447FADC03449}.Release|Win32.ActiveCfg = Release|Win32 + {8845C5C1-4154-425F-8643-447FADC03449}.Release|Win32.Build.0 = Release|Win32 + {75160E63-E642-4C71-9D4C-B733E152C418}.Debug|Win32.ActiveCfg = Debug|Win32 + {75160E63-E642-4C71-9D4C-B733E152C418}.Debug|Win32.Build.0 = Debug|Win32 + {75160E63-E642-4C71-9D4C-B733E152C418}.Release|Win32.ActiveCfg = Release|Win32 + {75160E63-E642-4C71-9D4C-B733E152C418}.Release|Win32.Build.0 = Release|Win32 + {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug|Win32.ActiveCfg = Debug|Win32 + {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Debug|Win32.Build.0 = Debug|Win32 + {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release|Win32.ActiveCfg = Release|Win32 + {9DC47AF9-ACFC-40A5-A4A6-FF3E7F8EFFBE}.Release|Win32.Build.0 = Release|Win32 + {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug|Win32.ActiveCfg = Debug|Win32 + {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Debug|Win32.Build.0 = Debug|Win32 + {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release|Win32.ActiveCfg = Release|Win32 + {A7E0FE03-E9BB-4478-9752-250BBD406C2D}.Release|Win32.Build.0 = Release|Win32 + {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Debug|Win32.Build.0 = Debug|Win32 + {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release|Win32.ActiveCfg = Release|Win32 + {0A0D3519-2ADD-4B47-A890-746170B2CCD8}.Release|Win32.Build.0 = Release|Win32 + {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug|Win32.ActiveCfg = Debug|Win32 + {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Debug|Win32.Build.0 = Debug|Win32 + {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release|Win32.ActiveCfg = Release|Win32 + {C2A5530D-C2DB-4503-A651-4B92AEC5FE74}.Release|Win32.Build.0 = Release|Win32 + {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug|Win32.ActiveCfg = Debug|Win32 + {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Debug|Win32.Build.0 = Debug|Win32 + {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release|Win32.ActiveCfg = Release|Win32 + {386DBF35-2F76-4BB1-8B4B-1D69C34F8996}.Release|Win32.Build.0 = Release|Win32 + {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Debug|Win32.Build.0 = Debug|Win32 + {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release|Win32.ActiveCfg = Release|Win32 + {0BB50F1C-E139-48A2-B9D8-1E781275777F}.Release|Win32.Build.0 = Release|Win32 + {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Debug|Win32.Build.0 = Debug|Win32 + {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release|Win32.ActiveCfg = Release|Win32 + {D6130A5F-12DC-487B-BB9E-4BFDA60FBADF}.Release|Win32.Build.0 = Release|Win32 + {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Debug|Win32.Build.0 = Debug|Win32 + {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release|Win32.ActiveCfg = Release|Win32 + {B43DBA9D-6EE0-421C-83D9-9776064B66B4}.Release|Win32.Build.0 = Release|Win32 + {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug|Win32.ActiveCfg = Debug|Win32 + {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Debug|Win32.Build.0 = Debug|Win32 + {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release|Win32.ActiveCfg = Release|Win32 + {F79DCF6D-72B1-45F6-A471-5209951C0BDD}.Release|Win32.Build.0 = Release|Win32 + {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug|Win32.ActiveCfg = Debug|Win32 + {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Debug|Win32.Build.0 = Debug|Win32 + {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release|Win32.ActiveCfg = Release|Win32 + {015EA9D3-85F2-4C4E-BFC3-430AC59093B9}.Release|Win32.Build.0 = Release|Win32 + {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug|Win32.ActiveCfg = Debug|Win32 + {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Debug|Win32.Build.0 = Debug|Win32 + {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release|Win32.ActiveCfg = Release|Win32 + {0501A08E-D4D7-42C1-9E2A-BA3F2F320741}.Release|Win32.Build.0 = Release|Win32 + {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.ActiveCfg = Debug|Win32 + {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.Build.0 = Debug|Win32 + {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.ActiveCfg = Release|Win32 + {15DEA3EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.Build.0 = Release|Win32 + {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.ActiveCfg = Debug|Win32 + {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Debug|Win32.Build.0 = Debug|Win32 + {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.ActiveCfg = Release|Win32 + {15DEA4EA-9386-49C7-80C6-5B090DE1D536}.Release|Win32.Build.0 = Release|Win32 + {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug|Win32.ActiveCfg = Debug|Win32 + {8ED67991-58A6-44AA-9B3A-3217085EF187}.Debug|Win32.Build.0 = Debug|Win32 + {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release|Win32.ActiveCfg = Release|Win32 + {8ED67991-58A6-44AA-9B3A-3217085EF187}.Release|Win32.Build.0 = Release|Win32 + {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug|Win32.ActiveCfg = Debug|Win32 + {8576EC58-4E54-49C0-879A-F054C92B1D03}.Debug|Win32.Build.0 = Debug|Win32 + {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release|Win32.ActiveCfg = Release|Win32 + {8576EC58-4E54-49C0-879A-F054C92B1D03}.Release|Win32.Build.0 = Release|Win32 + {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug|Win32.ActiveCfg = Debug|Win32 + {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Debug|Win32.Build.0 = Debug|Win32 + {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release|Win32.ActiveCfg = Release|Win32 + {BF0FF048-887F-4D43-A455-F8C04FB98F10}.Release|Win32.Build.0 = Release|Win32 + {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C785349-866D-447D-8C55-8A51E5CA0E87}.Debug|Win32.Build.0 = Debug|Win32 + {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release|Win32.ActiveCfg = Release|Win32 + {1C785349-866D-447D-8C55-8A51E5CA0E87}.Release|Win32.Build.0 = Release|Win32 + {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug|Win32.ActiveCfg = Debug|Win32 + {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Debug|Win32.Build.0 = Debug|Win32 + {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release|Win32.ActiveCfg = Release|Win32 + {04A5D9EE-EC49-4CBC-BD05-D80BC287897C}.Release|Win32.Build.0 = Release|Win32 + {853632F4-6420-40C5-B80B-38B678E472B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {853632F4-6420-40C5-B80B-38B678E472B8}.Debug|Win32.Build.0 = Debug|Win32 + {853632F4-6420-40C5-B80B-38B678E472B8}.Release|Win32.ActiveCfg = Release|Win32 + {853632F4-6420-40C5-B80B-38B678E472B8}.Release|Win32.Build.0 = Release|Win32 + {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug|Win32.ActiveCfg = Debug|Win32 + {697E77F2-9E9E-4F12-973F-C1214494248C}.Debug|Win32.Build.0 = Debug|Win32 + {697E77F2-9E9E-4F12-973F-C1214494248C}.Release|Win32.ActiveCfg = Release|Win32 + {697E77F2-9E9E-4F12-973F-C1214494248C}.Release|Win32.Build.0 = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug|Win32.ActiveCfg = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug|Win32.Build.0 = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release|Win32.ActiveCfg = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release|Win32.Build.0 = Release|Win32 + {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug|Win32.ActiveCfg = Debug|Win32 + {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Debug|Win32.Build.0 = Debug|Win32 + {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release|Win32.ActiveCfg = Release|Win32 + {FB80DE6C-51C8-4D56-876D-C7878A4EB10B}.Release|Win32.Build.0 = Release|Win32 + {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug|Win32.ActiveCfg = Debug|Win32 + {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Debug|Win32.Build.0 = Debug|Win32 + {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release|Win32.ActiveCfg = Release|Win32 + {68E2C6B6-96CA-4BBD-A485-FEE6F2E65407}.Release|Win32.Build.0 = Release|Win32 + {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug|Win32.ActiveCfg = Debug|Win32 + {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Debug|Win32.Build.0 = Debug|Win32 + {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release|Win32.ActiveCfg = Release|Win32 + {B20364D1-4329-4D4E-B9CE-C9767618FDD6}.Release|Win32.Build.0 = Release|Win32 + {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Debug|Win32.ActiveCfg = Debug|Win32 + {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Debug|Win32.Build.0 = Debug|Win32 + {439FE12C-77F0-44CD-BC9B-803B3E92C197}.Release|Win32.ActiveCfg = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug|Win32.ActiveCfg = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Debug|Win32.Build.0 = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release|Win32.ActiveCfg = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDF}.Release|Win32.Build.0 = Release|Win32 + {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Debug|Win32.ActiveCfg = Debug|Win32 + {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Debug|Win32.Build.0 = Debug|Win32 + {334D54AE-9AF7-43EA-BC64-2E31846B972E}.Release|Win32.ActiveCfg = Release|Win32 + {0B09566E-63DB-4A28-A555-BBE2747769B6}.Debug|Win32.ActiveCfg = Debug|Win32 + {0B09566E-63DB-4A28-A555-BBE2747769B6}.Debug|Win32.Build.0 = Debug|Win32 + {0B09566E-63DB-4A28-A555-BBE2747769B6}.Release|Win32.ActiveCfg = Release|Win32 + {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Debug|Win32.ActiveCfg = Debug|Win32 + {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Debug|Win32.Build.0 = Debug|Win32 + {623CDF9E-ACC5-43E2-8E8D-B6266235A044}.Release|Win32.ActiveCfg = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/contrib/bkgrnd2d/bkgrnd2d.dsp b/contrib/bkgrnd2d/bkgrnd2d.dsp deleted file mode 100644 index de01e945..00000000 --- a/contrib/bkgrnd2d/bkgrnd2d.dsp +++ /dev/null @@ -1,133 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bkgrnd2d" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=bkgrnd2d - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "bkgrnd2d.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bkgrnd2d.mak" CFG="bkgrnd2d - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bkgrnd2d - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "bkgrnd2d - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bkgrnd2d - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BKGRND2D_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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\\" - -!ELSEIF "$(CFG)" == "bkgrnd2d - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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\\" - -!ENDIF - -# Begin Target - -# Name "bkgrnd2d - Win32 Release" -# Name "bkgrnd2d - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\bkgrnd2d.cpp -# End Source File -# Begin Source File - -SOURCE=.\bkgrnd2d.def -# End Source File -# Begin Source File - -SOURCE=.\dialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\bkgrnd2d.h -# End Source File -# Begin Source File - -SOURCE=.\dialog.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/contrib/bobtoolz/bobToolz.dsw b/contrib/bobtoolz/bobToolz.dsw deleted file mode 100644 index 137773ec..00000000 --- a/contrib/bobtoolz/bobToolz.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "bobToolz_gtk"=.\bobToolz_gtk.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ctftoolz_gtk"=.\ctftoolz_gtk.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/bobtoolz/bobToolz_gtk.dsp b/contrib/bobtoolz/bobToolz_gtk.dsp deleted file mode 100644 index 205a0461..00000000 --- a/contrib/bobtoolz/bobToolz_gtk.dsp +++ /dev/null @@ -1,344 +0,0 @@ -# Microsoft Developer Studio Project File - Name="bobToolz_gtk" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=bobToolz_gtk - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "bobToolz_gtk.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "bobToolz_gtk.mak" CFG="bobToolz_gtk - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "bobToolz_gtk - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "bobToolz_gtk - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "bobToolz_gtk" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "bobToolz_gtk - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release-GTK/" -# 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 -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" /d "_BOBTOOLZGTK_" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "bobToolz_gtk - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /include:"Debug-GTK/" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" /d "_BOBTOOLZGTK_" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "bobToolz_gtk - Win32 Release" -# Name "bobToolz_gtk - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "dialogs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=".\dialogs\dialogs-gtk.cpp" -# End Source File -# End Group -# Begin Source File - -SOURCE=".\bobToolz-GTK.cpp" -# End Source File -# Begin Source File - -SOURCE=".\bobtoolz-gtk.rc" -# End Source File -# Begin Source File - -SOURCE=.\bobToolz.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\bsploader.cpp -# End Source File -# Begin Source File - -SOURCE=.\cportals.cpp -# End Source File -# Begin Source File - -SOURCE=.\DBobView.cpp -# End Source File -# Begin Source File - -SOURCE=.\DBrush.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEntity.cpp -# End Source File -# Begin Source File - -SOURCE=.\DEPair.cpp -# End Source File -# Begin Source File - -SOURCE=.\DListener.cpp -# End Source File -# Begin Source File - -SOURCE=.\DMap.cpp -# End Source File -# Begin Source File - -SOURCE=.\DPatch.cpp -# End Source File -# Begin Source File - -SOURCE=.\DPlane.cpp -# End Source File -# Begin Source File - -SOURCE=.\DPoint.cpp -# End Source File -# Begin Source File - -SOURCE=.\DShape.cpp -# End Source File -# Begin Source File - -SOURCE=.\DTrainDrawer.cpp -# End Source File -# Begin Source File - -SOURCE=.\DTreePlanter.cpp -# End Source File -# Begin Source File - -SOURCE=.\DVisDrawer.cpp -# End Source File -# Begin Source File - -SOURCE=.\DWinding.cpp -# End Source File -# Begin Source File - -SOURCE=".\funchandlers-GTK.cpp" -# End Source File -# Begin Source File - -SOURCE=.\lists.cpp -# End Source File -# Begin Source File - -SOURCE=.\misc.cpp -# End Source File -# Begin Source File - -SOURCE=.\ScriptParser.cpp -# End Source File -# Begin Source File - -SOURCE=.\shapes.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# End Source File -# Begin Source File - -SOURCE=.\visfind.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "dialog - headers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=".\dialogs\dialogs-gtk.h" -# End Source File -# End Group -# Begin Group "interface" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\iUI.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\bsploader.h -# End Source File -# Begin Source File - -SOURCE=.\CPortals.h -# End Source File -# Begin Source File - -SOURCE=.\DBobView.h -# End Source File -# Begin Source File - -SOURCE=.\DBrush.h -# End Source File -# Begin Source File - -SOURCE=.\DEntity.h -# End Source File -# Begin Source File - -SOURCE=.\DEPair.h -# End Source File -# Begin Source File - -SOURCE=.\DListener.h -# End Source File -# Begin Source File - -SOURCE=.\DMap.h -# End Source File -# Begin Source File - -SOURCE=.\DPatch.h -# End Source File -# Begin Source File - -SOURCE=.\DPlane.h -# End Source File -# Begin Source File - -SOURCE=.\DPoint.h -# End Source File -# Begin Source File - -SOURCE=.\DShape.h -# End Source File -# Begin Source File - -SOURCE=.\DTrainDrawer.h -# End Source File -# Begin Source File - -SOURCE=.\DTreePlanter.h -# End Source File -# Begin Source File - -SOURCE=.\DVisDrawer.h -# End Source File -# Begin Source File - -SOURCE=.\DWinding.h -# End Source File -# Begin Source File - -SOURCE=.\funchandlers.h -# End Source File -# Begin Source File - -SOURCE=.\lists.h -# End Source File -# Begin Source File - -SOURCE=.\misc.h -# End Source File -# Begin Source File - -SOURCE=.\res\plugin.rc2 -# End Source File -# Begin Source File - -SOURCE=".\resource-GTK.h" -# End Source File -# Begin Source File - -SOURCE=.\shapes.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# Begin Source File - -SOURCE=.\visfind.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/contrib/bobtoolz/bobtoolz.vcproj b/contrib/bobtoolz/bobtoolz.vcproj index 365a96c3..9a842d64 100644 --- a/contrib/bobtoolz/bobtoolz.vcproj +++ b/contrib/bobtoolz/bobtoolz.vcproj @@ -1,32 +1,58 @@ + ProjectGUID="{439FE12C-77F0-44CD-BC9B-803B3E92C197}" + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_AFXDLL;_DEBUG" + Culture="1033" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_AFXDLL;NDEBUG" + Culture="1033" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> @@ -177,190 +236,243 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugi + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\bobToolz-GTK.cpp" + > + RelativePath=".\bsploader.cpp" + > + RelativePath=".\bsploader.h" + > + RelativePath=".\cportals.cpp" + > + RelativePath=".\CPortals.h" + > + RelativePath=".\DBobView.cpp" + > + RelativePath=".\DBobView.h" + > + RelativePath=".\DBrush.cpp" + > + RelativePath=".\DBrush.h" + > + RelativePath=".\DEntity.cpp" + > + RelativePath=".\DEntity.h" + > + RelativePath=".\DEPair.cpp" + > + RelativePath=".\DEPair.h" + > + RelativePath=".\DMap.cpp" + > + RelativePath=".\DMap.h" + > + RelativePath=".\DPatch.cpp" + > + RelativePath=".\DPatch.h" + > + RelativePath=".\DPlane.cpp" + > + RelativePath=".\DPlane.h" + > + RelativePath=".\DPoint.cpp" + > + RelativePath=".\DPoint.h" + > + RelativePath=".\DShape.cpp" + > + RelativePath=".\DShape.h" + > + RelativePath=".\DTrainDrawer.cpp" + > + RelativePath=".\DTrainDrawer.h" + > + RelativePath=".\DTreePlanter.cpp" + > + RelativePath=".\DTreePlanter.h" + > + RelativePath=".\DVisDrawer.cpp" + > + RelativePath=".\DVisDrawer.h" + > + RelativePath=".\DWinding.cpp" + > + RelativePath=".\DWinding.h" + > + RelativePath=".\funchandlers-GTK.cpp" + > + RelativePath=".\funchandlers.h" + > + RelativePath=".\lists.cpp" + > + RelativePath=".\lists.h" + > + RelativePath=".\misc.cpp" + > + RelativePath=".\misc.h" + > + RelativePath=".\resource-gtk.h" + > + RelativePath=".\ScriptParser.cpp" + > + RelativePath=".\ScriptParser.h" + > + RelativePath=".\shapes.cpp" + > + RelativePath=".\shapes.h" + > + RelativePath=".\visfind.cpp" + > + RelativePath=".\visfind.h" + > + > + RelativePath=".\dialogs\dialogs-gtk.cpp" + > + RelativePath=".\dialogs\dialogs-gtk.h" + > + RelativePath="bobtoolz.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp index 82560533..5d926986 100644 --- a/contrib/bobtoolz/misc.cpp +++ b/contrib/bobtoolz/misc.cpp @@ -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, '\\'); diff --git a/contrib/brushexport/brushexport.vcproj b/contrib/brushexport/brushexport.vcproj index 5c7f1f82..7f304452 100644 --- a/contrib/brushexport/brushexport.vcproj +++ b/contrib/brushexport/brushexport.vcproj @@ -1,147 +1,205 @@ + ProjectGUID="{334D54AE-9AF7-43EA-BC64-2E31846B972E}" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> @@ -150,37 +208,48 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugi + UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}" + > + RelativePath=".\callbacks.cpp" + > + RelativePath=".\callbacks.h" + > + RelativePath=".\export.cpp" + > + RelativePath=".\export.h" + > + RelativePath=".\interface.cpp" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + RelativePath=".\support.cpp" + > + RelativePath=".\support.h" + > + RelativePath=".\brushexport.def" + > diff --git a/contrib/brushexport/callbacks.cpp b/contrib/brushexport/callbacks.cpp index 1225d00f..9d34c926 100644 --- a/contrib/brushexport/callbacks.cpp +++ b/contrib/brushexport/callbacks.cpp @@ -33,7 +33,7 @@ void OnExportClicked(GtkButton* button, gpointer user_data) GtkListStore* list = GTK_LIST_STORE(gtk_tree_view_get_model(view)); GtkTreeIter iter; - bool valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list), &iter); + gboolean valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list), &iter); while(valid) { gchar* data; diff --git a/contrib/camera/camera.dsp b/contrib/camera/camera.dsp deleted file mode 100644 index d22a457b..00000000 --- a/contrib/camera/camera.dsp +++ /dev/null @@ -1,174 +0,0 @@ -# Microsoft Developer Studio Project File - Name="camera" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=camera - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "camera.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "camera.mak" CFG="camera - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "camera - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "camera - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "camera" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "camera - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CAMERA_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\camera.dll "../../install/plugins" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "camera - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\camera.dll "../../install/plugins" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "camera - Win32 Release" -# Name "camera - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\camera.cpp -# End Source File -# Begin Source File - -SOURCE=.\camera.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\dialogs.cpp -# End Source File -# Begin Source File - -SOURCE=.\dialogs_common.cpp -# End Source File -# Begin Source File - -SOURCE=.\funchandlers.cpp -# End Source File -# Begin Source File - -SOURCE=.\listener.cpp -# End Source File -# Begin Source File - -SOURCE=.\misc.cpp -# End Source File -# Begin Source File - -SOURCE=.\renderer.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\camera.h -# End Source File -# Begin Source File - -SOURCE=.\dialogs.h -# End Source File -# Begin Source File - -SOURCE=.\funchandlers.h -# End Source File -# Begin Source File - -SOURCE=.\listener.h -# End Source File -# Begin Source File - -SOURCE=.\misc.h -# End Source File -# Begin Source File - -SOURCE=.\renderer.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/contrib/gtkgensurf/gtkgensurf.dsp b/contrib/gtkgensurf/gtkgensurf.dsp deleted file mode 100644 index 70f9ed91..00000000 --- a/contrib/gtkgensurf/gtkgensurf.dsp +++ /dev/null @@ -1,172 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gtkgensurf" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=gtkgensurf - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gtkgensurf.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gtkgensurf.mak" CFG="gtkgensurf - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gtkgensurf - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "gtkgensurf - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "gtkgensurf" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "gtkgensurf - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GTKGENSURF_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "gtkgensurf - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /include:"Debug/" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "gtkgensurf - Win32 Release" -# Name "gtkgensurf - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\bitmap.cpp -# End Source File -# Begin Source File - -SOURCE=.\dec.cpp -# End Source File -# Begin Source File - -SOURCE=.\face.cpp -# End Source File -# Begin Source File - -SOURCE=.\font.cpp -# End Source File -# Begin Source File - -SOURCE=.\gendlgs.cpp -# End Source File -# Begin Source File - -SOURCE=.\genmap.cpp -# End Source File -# Begin Source File - -SOURCE=.\gensurf.cpp -# End Source File -# Begin Source File - -SOURCE=.\gensurf.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\heretic.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\triangle.c -# End Source File -# Begin Source File - -SOURCE=.\view.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\gendlgs.h -# End Source File -# Begin Source File - -SOURCE=.\gensurf.h -# End Source File -# Begin Source File - -SOURCE=.\triangle.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/contrib/hydratoolz/hydratoolz.dsp b/contrib/hydratoolz/hydratoolz.dsp deleted file mode 100644 index e7ef09c8..00000000 --- a/contrib/hydratoolz/hydratoolz.dsp +++ /dev/null @@ -1,117 +0,0 @@ -# Microsoft Developer Studio Project File - Name="hydratoolz" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=hydratoolz - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "hydratoolz.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "hydratoolz.mak" CFG="hydratoolz - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "hydratoolz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "hydratoolz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "hydratoolz" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "hydratoolz - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HYDRATOOLZ_EXPORTS" /YX /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ELSEIF "$(CFG)" == "hydratoolz - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ENDIF - -# Begin Target - -# Name "hydratoolz - Win32 Release" -# Name "hydratoolz - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\hydratoolz.def -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/contrib/prtview/PrtView.dsp b/contrib/prtview/PrtView.dsp deleted file mode 100644 index 75aae25f..00000000 --- a/contrib/prtview/PrtView.dsp +++ /dev/null @@ -1,195 +0,0 @@ -# Microsoft Developer Studio Project File - Name="PrtView" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=PrtView - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "PrtView.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "PrtView.mak" CFG="PrtView - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "PrtView - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "PrtView - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "PrtView" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "PrtView - Win32 Release" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 -# 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" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\PrtView.dll "..\..\install\plugins" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "PrtView - Win32 Debug" - -# PROP BASE Use_MFC 6 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 6 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /browser /include:"Debug/" -# 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 -# 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 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# 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" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\PrtView.dll "..\..\install\plugins" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "PrtView - Win32 Release" -# Name "PrtView - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\AboutDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\ConfigDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\LoadPortalFileDialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\Portals.cpp -# End Source File -# Begin Source File - -SOURCE=.\PrtView.cpp -# End Source File -# Begin Source File - -SOURCE=.\PrtView.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\PrtView.rc -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\AboutDialog.h -# End Source File -# Begin Source File - -SOURCE=.\ConfigDialog.h -# End Source File -# Begin Source File - -SOURCE=.\LoadPortalFileDialog.h -# End Source File -# Begin Source File - -SOURCE=.\Portals.h -# End Source File -# Begin Source File - -SOURCE=.\PrtView.h -# End Source File -# Begin Source File - -SOURCE=.\PrtView2.h -# End Source File -# Begin Source File - -SOURCE=.\Resource.h -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\res\PrtView.rc2 -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ReadMe.txt -# End Source File -# End Target -# End Project diff --git a/contrib/prtview/PrtView.vcproj b/contrib/prtview/PrtView.vcproj index 79133b02..43e40fab 100644 --- a/contrib/prtview/PrtView.vcproj +++ b/contrib/prtview/PrtView.vcproj @@ -1,32 +1,58 @@ + Keyword="MFCProj" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_AFXDLL;_DEBUG" + Culture="1033" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_AFXDLL;NDEBUG" + Culture="1033" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> @@ -177,76 +236,95 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugi + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\AboutDialog.cpp" + > + RelativePath=".\AboutDialog.h" + > + RelativePath=".\ConfigDialog.cpp" + > + RelativePath=".\ConfigDialog.h" + > + RelativePath=".\LoadPortalFileDialog.cpp" + > + RelativePath=".\LoadPortalFileDialog.h" + > + RelativePath=".\portals.cpp" + > + RelativePath=".\portals.h" + > + RelativePath=".\prtview.cpp" + > + RelativePath=".\prtview.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\PrtView.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/contrib/shaderplug/shaderplug.vcproj b/contrib/shaderplug/shaderplug.vcproj index 1b9044be..b7cc2c15 100644 --- a/contrib/shaderplug/shaderplug.vcproj +++ b/contrib/shaderplug/shaderplug.vcproj @@ -1,145 +1,205 @@ + ProjectGUID="{0B09566E-63DB-4A28-A555-BBE2747769B6}" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> @@ -148,16 +208,20 @@ + UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}" + > + RelativePath=".\shaderplug.cpp" + > + RelativePath=".\shaderplug.h" + > + RelativePath=".\shaderplug.def" + > diff --git a/contrib/sunplug/sunplug.vcproj b/contrib/sunplug/sunplug.vcproj index 0c98c31e..2fe56cc6 100644 --- a/contrib/sunplug/sunplug.vcproj +++ b/contrib/sunplug/sunplug.vcproj @@ -1,134 +1,194 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + Name="VCResourceCompilerTool" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + + Name="VCResourceCompilerTool" + /> + - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\plugins" " + /> @@ -137,33 +197,39 @@ + UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}" + > + RelativePath=".\sunplug.cpp" + > + RelativePath=".\sunplug.h" + > + RelativePath=".\sunplug.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/contrib/ufoaiplug/ufoai.vcproj b/contrib/ufoaiplug/ufoai.vcproj index ab4f11ce..a51e9c80 100644 --- a/contrib/ufoaiplug/ufoai.vcproj +++ b/contrib/ufoaiplug/ufoai.vcproj @@ -1,143 +1,205 @@ + ProjectGUID="{623CDF9E-ACC5-43E2-8E8D-B6266235A044}" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins"" + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins"" + /> @@ -146,51 +208,63 @@ + UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}" + > + RelativePath=".\ufoai.cpp" + > + RelativePath=".\ufoai.h" + > + RelativePath=".\ufoai_filters.cpp" + > + RelativePath=".\ufoai_filters.h" + > + RelativePath=".\ufoai_gtk.cpp" + > + RelativePath=".\ufoai_gtk.h" + > + RelativePath=".\ufoai_level.cpp" + > + RelativePath=".\ufoai_level.h" + > + RelativePath=".\ufoai.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/gen.dsp b/gen.dsp deleted file mode 100644 index 2d9ddb5f..00000000 --- a/gen.dsp +++ /dev/null @@ -1,124 +0,0 @@ -# Microsoft Developer Studio Project File - Name="gen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=gen - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "gen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "gen" -# PROP Scc_LocalPath "." -MTL=midl.exe - -!IF "$(CFG)" == "gen - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "gen___Win32_Release" -# PROP BASE Intermediate_Dir "gen___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "gen___Win32_Release" -# PROP Intermediate_Dir "gen___Win32_Release" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "gen - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "gen___Win32_Debug" -# PROP BASE Intermediate_Dir "gen___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "gen___Win32_Debug" -# PROP Intermediate_Dir "gen___Win32_Debug" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "gen - Win32 Release" -# Name "gen - Win32 Debug" -# Begin Source File - -SOURCE=.\include\aboutmsg.default -# End Source File -# Begin Source File - -SOURCE=.\gen.readme - -!IF "$(CFG)" == "gen - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputPath=.\gen.readme - -BuildCmds= \ - run_python.bat makeversion.py - -"include/version.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"include/aboutmsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"include/RADIANT_MAJOR" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"include/RADIANT_MINOR" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "gen - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputPath=.\gen.readme - -BuildCmds= \ - run_python.bat makeversion.py - -"include/version.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"include/aboutmsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\makeversion.py -# End Source File -# Begin Source File - -SOURCE=.\run_python.bat -# End Source File -# Begin Source File - -SOURCE=.\include\version.default -# End Source File -# End Target -# End Project diff --git a/gen.vcproj b/gen.vcproj index adfba8f8..75af13f4 100644 --- a/gen.vcproj +++ b/gen.vcproj @@ -1,109 +1,173 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> @@ -112,42 +176,50 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\include\aboutmsg.default" + > + RelativePath=".\makeversion.py" + > + Name="Debug|Win32" + > + Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h" + /> + Name="Release|Win32" + > + Outputs="$(InputDir)include\version.h;$(InputDir)include\aboutmsg.h" + /> + RelativePath=".\svn.py" + > + RelativePath=".\include\version.default" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > diff --git a/include/include.vcproj b/include/include.vcproj index 6d2e8fe4..d77ed417 100644 --- a/include/include.vcproj +++ b/include/include.vcproj @@ -1,366 +1,498 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/include.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/include.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + RelativePath=".\cullable.cpp" + > + RelativePath=".\cullable.h" + > + RelativePath=".\editable.cpp" + > + RelativePath=".\editable.h" + > + RelativePath=".\iarchive.cpp" + > + RelativePath=".\iarchive.h" + > + RelativePath=".\ibrush.cpp" + > + RelativePath=".\ibrush.h" + > + RelativePath=".\icamera.cpp" + > + RelativePath=".\icamera.h" + > + RelativePath=".\idatastream.cpp" + > + RelativePath=".\idatastream.h" + > + RelativePath=".\ieclass.cpp" + > + RelativePath=".\ieclass.h" + > + RelativePath=".\ientity.cpp" + > + RelativePath=".\ientity.h" + > + RelativePath=".\ifilesystem.cpp" + > + RelativePath=".\ifilesystem.h" + > + RelativePath=".\ifiletypes.cpp" + > + RelativePath=".\ifiletypes.h" + > + RelativePath=".\ifilter.cpp" + > + RelativePath=".\ifilter.h" + > + RelativePath=".\igl.cpp" + > + RelativePath=".\igl.h" + > + RelativePath=".\iglrender.cpp" + > + RelativePath=".\iglrender.h" + > + RelativePath=".\igtkgl.cpp" + > + RelativePath=".\igtkgl.h" + > + RelativePath=".\iimage.cpp" + > + RelativePath=".\iimage.h" + > + RelativePath=".\imap.cpp" + > + RelativePath=".\imap.h" + > + RelativePath=".\imodel.cpp" + > + RelativePath=".\imodel.h" + > + RelativePath=".\ipatch.cpp" + > + RelativePath=".\ipatch.h" + > + RelativePath=".\iplugin.cpp" + > + RelativePath=".\iplugin.h" + > + RelativePath=".\ireference.cpp" + > + RelativePath=".\ireference.h" + > + RelativePath=".\irender.cpp" + > + RelativePath=".\irender.h" + > + RelativePath=".\iscenegraph.cpp" + > + RelativePath=".\iscenegraph.h" + > + RelativePath=".\iscriplib.cpp" + > + RelativePath=".\iscriplib.h" + > + RelativePath=".\iselection.cpp" + > + RelativePath=".\iselection.h" + > + RelativePath=".\ishaders.cpp" + > + RelativePath=".\ishaders.h" + > + RelativePath=".\itexdef.cpp" + > + RelativePath=".\itexdef.h" + > + RelativePath=".\itextstream.cpp" + > + RelativePath=".\itextstream.h" + > + RelativePath=".\itextures.cpp" + > + RelativePath=".\itextures.h" + > + RelativePath=".\itoolbar.cpp" + > + RelativePath=".\itoolbar.h" + > + RelativePath=".\iundo.cpp" + > + RelativePath=".\iundo.h" + > + RelativePath=".\mapfile.cpp" + > + RelativePath=".\mapfile.h" + > + RelativePath=".\modelskin.cpp" + > + RelativePath=".\modelskin.h" + > + RelativePath=".\moduleobserver.cpp" + > + RelativePath=".\moduleobserver.h" + > + RelativePath=".\modulesystem.cpp" + > + RelativePath=".\modulesystem.h" + > + RelativePath=".\nameable.cpp" + > + RelativePath=".\nameable.h" + > + RelativePath=".\namespace.cpp" + > + RelativePath=".\namespace.h" + > + RelativePath=".\preferencesystem.cpp" + > + RelativePath=".\preferencesystem.h" + > + RelativePath=".\qerplugin.cpp" + > + RelativePath=".\qerplugin.h" + > + RelativePath=".\renderable.cpp" + > + RelativePath=".\renderable.h" + > + RelativePath=".\selectable.cpp" + > + RelativePath=".\selectable.h" + > + RelativePath=".\stream_version.h" + > + RelativePath=".\warnings.h" + > + RelativePath=".\windowobserver.cpp" + > + RelativePath=".\windowobserver.h" + > diff --git a/install.py b/install.py index cc5d9103..10960da9 100644 --- a/install.py +++ b/install.py @@ -22,7 +22,6 @@ Builds the ./install directory. Copies files from various locations: ./setup/data/tools/ ./games// -..//.dll ./include/version.default is used to generate RADIANT_MAJOR and RADIANT_MINOR """ @@ -102,27 +101,18 @@ for game in games: copyGame(gamesRoot, game, installRoot) # copy win32 dlls -gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.4")) +gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.10/install")) if os.path.exists(gtk2Root): - copySvn(os.path.join(gtk2Root, "install"), installRoot) - -iconv = os.path.normpath(os.path.join(thisDir, "../iconv-1.9/bin/iconv.dll")) -copyFileIfExists(iconv, installRoot) + copySvn(gtk2Root, installRoot) libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/bin/libxml2.dll")) copyFileIfExists(libxml2, installRoot) -libpng = os.path.normpath(os.path.join(thisDir, "../libpng-1.2/lib/libpng13.dll")) -copyFileIfExists(libpng, installRoot) - libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll")) copyFileIfExists(libmhash, installRoot) -zlib = os.path.normpath(os.path.join(thisDir, "../zlib1-1.2/zlib1.dll")) -copyFileIfExists(zlib, installRoot) - -msvcr71 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr71.dll")) -copyFileIfExists(msvcr71, installRoot) +msvcr80 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr80.dll")) +copyFileIfExists(msvcr80, installRoot) dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll")) copyFileIfExists(dbghelp, installRoot) diff --git a/libs/cmdlib/cmdlib.dsp b/libs/cmdlib/cmdlib.dsp deleted file mode 100644 index ee229aa5..00000000 --- a/libs/cmdlib/cmdlib.dsp +++ /dev/null @@ -1,101 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cmdlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=cmdlib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cmdlib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cmdlib.mak" CFG="cmdlib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cmdlib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "cmdlib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "cmdlib" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cmdlib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "cmdlib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /include:"Debug/" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Z7 /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "cmdlib - Win32 Release" -# Name "cmdlib - Win32 Debug" -# Begin Source File - -SOURCE=.\CMDLIB.cpp -# End Source File -# Begin Source File - -SOURCE=..\cmdlib.h -# End Source File -# End Target -# End Project diff --git a/libs/cmdlib/cmdlib.vcproj b/libs/cmdlib/cmdlib.vcproj index 2bd36f28..9df64c93 100644 --- a/libs/cmdlib/cmdlib.vcproj +++ b/libs/cmdlib/cmdlib.vcproj @@ -1,105 +1,153 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/cmdlib.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/cmdlib.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -108,12 +156,15 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\cmdlib.cpp" + > + RelativePath="..\cmdlib.h" + > diff --git a/libs/ddslib/ddslib.dsp b/libs/ddslib/ddslib.dsp deleted file mode 100644 index 1b684d90..00000000 --- a/libs/ddslib/ddslib.dsp +++ /dev/null @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ddslib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=ddslib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ddslib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ddslib.mak" CFG="ddslib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ddslib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "ddslib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "Perforce Project" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ddslib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -F90=df.exe -MTL=midl.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "ddslib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -F90=df.exe -MTL=midl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "ddslib - Win32 Release" -# Name "ddslib - Win32 Debug" -# Begin Group "src" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ddslib.c -# End Source File -# End Group -# Begin Group "include" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\ddslib.h -# End Source File -# End Group -# End Target -# End Project diff --git a/libs/ddslib/ddslib.vcproj b/libs/ddslib/ddslib.vcproj index 676b3837..e1db4e12 100644 --- a/libs/ddslib/ddslib.vcproj +++ b/libs/ddslib/ddslib.vcproj @@ -1,121 +1,171 @@ + ProjectGUID="{8576EC58-4E54-49C0-879A-F054C92B1D03}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + - + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Release\ddslib.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + - + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Debug\ddslib.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -123,31 +173,38 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="ddslib.c" + > + Name="Release|Win32" + > + BrowseInformation="1" + /> + Name="Debug|Win32" + > + BrowseInformation="1" + /> + RelativePath="..\ddslib.h" + > diff --git a/libs/gtkutil/filechooser.cpp b/libs/gtkutil/filechooser.cpp index fca0c679..f164d220 100644 --- a/libs/gtkutil/filechooser.cpp +++ b/libs/gtkutil/filechooser.cpp @@ -92,178 +92,6 @@ public: } }; -#ifdef WIN32 - -class Win32Filters -{ - const FileTypeList& m_types; - Array m_filters; -public: - Win32Filters(const FileTypeList& typeList) : m_types(typeList) - { - std::size_t len = 0; - for(FileTypeList::const_iterator i = m_types.begin(); i != m_types.end(); ++i) - { - len = len + strlen((*i).m_name.c_str()) + strlen((*i).m_pattern.c_str()) * 2 + 5; - } - m_filters.resize(len + 1); // length + null char - char *w = m_filters.data(); - for(FileTypeList::const_iterator i = m_types.begin(); i != m_types.end(); ++i) - { - for(const char *r = (*i).m_name.c_str(); *r!='\0'; r++, w++) - { - *w = *r; - } - *w++ = ' '; - *w++ = '('; - for(const char *r = (*i).m_pattern.c_str(); *r!='\0'; r++, w++) - { - *w = *r; - } - *w++ = ')'; - *w++ = '\0'; - for(const char *r = (*i).m_pattern.c_str(); *r!='\0'; r++, w++) - { - *w = (*r == ',') ? ';' : *r; - } - *w++ = '\0'; - } - m_filters[len] = '\0'; - } - filetype_pair_t getType(const char *filter) const - { - for(FileTypeList::const_iterator i = m_types.begin(); i != m_types.end(); ++i) - { - if(string_equal((*i).m_pattern.c_str(), filter)) - { - return filetype_pair_t((*i).m_moduleName.c_str(), filetype_t((*i).m_name.c_str(), (*i).m_pattern.c_str())); - } - } - return filetype_pair_t(); - } - const char* getFilters() const - { - return m_filters.data(); - } -}; - -#define WIN32_LEAN_AND_MEAN -#include -#include - -static char szFile[MAX_PATH]; /* filename string */ - - -#define FILEDLG_CUSTOM_FILTER_LENGTH 64 -// to be used with the advanced file selector - -const char* file_dialog_show_win32(GtkWidget* parent, bool open, const char* title, const char* path, const char* pattern) -{ - const char* r; - char* w; - filetype_t type; - FileTypeList typelist; - - if(pattern == 0) - { - pattern = "*"; - } - - GlobalFiletypes().getTypeList(pattern, &typelist); - - Win32Filters filters(typelist); - - // win32 dialog stores the selected "save as type" extension in the second null-terminated string - char customfilter[FILEDLG_CUSTOM_FILTER_LENGTH]; - - static OPENFILENAME ofn; /* common dialog box structure */ - static char szDirName[MAX_PATH]; /* directory string */ - static char szFile[MAX_PATH]; /* filename string */ - static char szFileTitle[MAX_PATH]; /* file title string */ - static int i, cbString; /* integer count variables */ - static HANDLE hf; /* file handle */ - - // do that the native way - /* Place the terminating null character in the szFile. */ - szFile[0] = '\0'; - customfilter[0] = customfilter[1] = customfilter[2] = '\0'; - - /* Set the members of the OPENFILENAME structure. */ - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = (HWND)GDK_WINDOW_HWND(parent->window); - ofn.nFilterIndex = 0; - ofn.lpstrFilter = filters.getFilters(); - ofn.lpstrCustomFilter = customfilter; - ofn.nMaxCustFilter = sizeof(customfilter); - ofn.lpstrFile = szFile; - ofn.nMaxFile = sizeof(szFile); - ofn.lpstrFileTitle = 0; // we don't need to get the name of the file - if(path) - { - // szDirName: Radiant uses unix convention for paths internally - // Win32 (of course) and Gtk (who would have thought) expect the '\\' convention - // copy path, replacing dir separators as appropriate - for(r=path, w=szDirName; *r!='\0'; r++) - *w++ = (*r=='/') ? '\\' : *r; - // terminate string - *w = '\0'; - ofn.lpstrInitialDir = szDirName; - } - else ofn.lpstrInitialDir = 0; - ofn.lpstrTitle = title; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - /* Display the Open dialog box. */ - // it's open or close depending on 'open' parameter - if (open) - { - if (!GetOpenFileName(&ofn)) - return 0; // canceled - } - else - { - if (!GetSaveFileName(&ofn)) - return 0; // canceled - } - - if(!string_equal(pattern, "*")) - { - type = filters.getType(customfilter+1).m_type; - } - - // don't return an empty filename - if(szFile[0] == '\0') return 0; - - // convert back to unix format - for(w=szFile; *w!='\0'; w++) - { - if(*w=='\\') - { - *w = '/'; - } - } - // when saving, force an extension depending on filetype - /* \todo SPoG - file_dialog should return filetype information separately.. not force file extension.. */ - if(!open && !string_equal(pattern, "*")) - { - // last ext separator - const char* extension = path_get_extension(szFile); - // no extension - if(string_empty(extension)) - { - strcat(szFile, type.pattern+1); - } - else - { - strcpy(szFile + (extension - szFile), type.pattern+2); - } - } - - return szFile; -} - -#endif - class GTKMasks { @@ -460,21 +288,11 @@ char* dir_dialog(GtkWidget* parent, const char* title, const char* path) return filename; } - -#ifdef WIN32 -bool g_FileChooser_nativeGUI = true; -#endif - const char* file_dialog(GtkWidget* parent, bool open, const char* title, const char* path, const char* pattern) { for(;;) { - const char* file = -#ifdef WIN32 - g_FileChooser_nativeGUI - ? file_dialog_show_win32(parent, open, title, path, pattern) : -#endif - file_dialog_show(parent, open, title, path, pattern); + const char* file = file_dialog_show(parent, open, title, path, pattern); if(open || file == 0 diff --git a/libs/gtkutil/filechooser.h b/libs/gtkutil/filechooser.h index f145193a..d23beb5d 100644 --- a/libs/gtkutil/filechooser.h +++ b/libs/gtkutil/filechooser.h @@ -25,10 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA /// \file /// GTK+ file-chooser dialogs. -#ifdef WIN32 -extern bool g_FileChooser_nativeGUI; -#endif - typedef struct _GtkWidget GtkWidget; const char* file_dialog(GtkWidget *parent, bool open, const char* title, const char* path = 0, const char* pattern = 0); diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index 48ba7ce8..dcba6526 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -46,6 +46,10 @@ GLFont glfont_create(const char* font_string) pango_font_description_free (font_desc); + // fix for pango/gtkglext metrix bug + if(font_height > 16) + font_height = 16; + return GLFont(font_list_base, font_height); } diff --git a/libs/gtkutil/gtkutil.vcproj b/libs/gtkutil/gtkutil.vcproj index e05c4262..ecad044d 100644 --- a/libs/gtkutil/gtkutil.vcproj +++ b/libs/gtkutil/gtkutil.vcproj @@ -1,107 +1,155 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/gtkutil.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/gtkutil.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -109,144 +157,190 @@ + > + RelativePath=".\accelerator.cpp" + > + RelativePath=".\accelerator.h" + > + RelativePath=".\button.cpp" + > + RelativePath=".\button.h" + > + RelativePath=".\clipboard.cpp" + > + RelativePath=".\clipboard.h" + > + RelativePath=".\closure.cpp" + > + RelativePath=".\closure.h" + > + RelativePath=".\container.cpp" + > + RelativePath=".\container.h" + > + RelativePath=".\cursor.cpp" + > + RelativePath=".\cursor.h" + > + RelativePath=".\dialog.cpp" + > + RelativePath=".\dialog.h" + > + RelativePath=".\entry.cpp" + > + RelativePath=".\entry.h" + > + RelativePath=".\filechooser.cpp" + > + RelativePath=".\filechooser.h" + > + RelativePath=".\frame.cpp" + > + RelativePath=".\frame.h" + > + RelativePath=".\glfont.cpp" + > + RelativePath=".\glfont.h" + > + RelativePath=".\glwidget.cpp" + > + RelativePath=".\glwidget.h" + > + RelativePath=".\idledraw.cpp" + > + RelativePath=".\idledraw.h" + > + RelativePath=".\image.cpp" + > + RelativePath=".\image.h" + > + RelativePath=".\menu.cpp" + > + RelativePath=".\menu.h" + > + RelativePath=".\messagebox.cpp" + > + RelativePath=".\messagebox.h" + > + RelativePath=".\nonmodal.cpp" + > + RelativePath=".\nonmodal.h" + > + RelativePath=".\paned.cpp" + > + RelativePath=".\paned.h" + > + RelativePath=".\pointer.cpp" + > + RelativePath=".\pointer.h" + > + RelativePath=".\toolbar.cpp" + > + RelativePath=".\toolbar.h" + > + RelativePath=".\widget.cpp" + > + RelativePath=".\widget.h" + > + RelativePath=".\window.cpp" + > + RelativePath=".\window.h" + > + RelativePath=".\xorrectangle.cpp" + > + RelativePath=".\xorrectangle.h" + > diff --git a/libs/jpeg6/jpeg6.dsp b/libs/jpeg6/jpeg6.dsp deleted file mode 100644 index 99b49748..00000000 --- a/libs/jpeg6/jpeg6.dsp +++ /dev/null @@ -1,218 +0,0 @@ -# Microsoft Developer Studio Project File - Name="jpeg6" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=jpeg6 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "jpeg6.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "jpeg6.mak" CFG="jpeg6 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "jpeg6 - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "jpeg6 - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "jpeg6" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "jpeg6 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "jpeg6 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Z7 /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "jpeg6 - Win32 Release" -# Name "jpeg6 - Win32 Debug" -# Begin Source File - -SOURCE=.\Jchuff.h -# End Source File -# Begin Source File - -SOURCE=.\JCOMAPI.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jconfig.h -# End Source File -# Begin Source File - -SOURCE=.\JDAPIMIN.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDAPISTD.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDATASRC.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDCOEFCT.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDCOLOR.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jdct.h -# End Source File -# Begin Source File - -SOURCE=.\JDDCTMGR.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDHUFF.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jdhuff.h -# End Source File -# Begin Source File - -SOURCE=.\JDINPUT.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDMAINCT.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDMARKER.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDMASTER.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDPOSTCT.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDSAMPLE.cpp -# End Source File -# Begin Source File - -SOURCE=.\JDTRANS.cpp -# End Source File -# Begin Source File - -SOURCE=.\JERROR.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jerror.h -# End Source File -# Begin Source File - -SOURCE=.\JFDCTFLT.cpp -# End Source File -# Begin Source File - -SOURCE=.\JIDCTFLT.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jinclude.h -# End Source File -# Begin Source File - -SOURCE=.\JMEMMGR.cpp -# End Source File -# Begin Source File - -SOURCE=.\JMEMNOBS.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jmemsys.h -# End Source File -# Begin Source File - -SOURCE=.\Jmorecfg.h -# End Source File -# Begin Source File - -SOURCE=.\Jpegint.h -# End Source File -# Begin Source File - -SOURCE=.\JPGLOAD.cpp -# End Source File -# Begin Source File - -SOURCE=.\JUTILS.cpp -# End Source File -# Begin Source File - -SOURCE=.\Jversion.h -# End Source File -# End Target -# End Project diff --git a/libs/jpeg6/jpeg6.vcproj b/libs/jpeg6/jpeg6.vcproj index c55aa542..49db7b11 100644 --- a/libs/jpeg6/jpeg6.vcproj +++ b/libs/jpeg6/jpeg6.vcproj @@ -1,107 +1,155 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/jpeg6.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/jpeg6.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -110,105 +158,139 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\jchuff.h" + > + RelativePath=".\jcomapi.cpp" + > + RelativePath=".\jconfig.h" + > + RelativePath=".\jdapimin.cpp" + > + RelativePath=".\jdapistd.cpp" + > + RelativePath=".\jdatasrc.cpp" + > + RelativePath=".\jdcoefct.cpp" + > + RelativePath=".\jdcolor.cpp" + > + RelativePath=".\jdct.h" + > + RelativePath=".\jddctmgr.cpp" + > + RelativePath=".\jdhuff.cpp" + > + RelativePath=".\jdhuff.h" + > + RelativePath=".\jdinput.cpp" + > + RelativePath=".\jdmainct.cpp" + > + RelativePath=".\jdmarker.cpp" + > + RelativePath=".\jdmaster.cpp" + > + RelativePath=".\jdpostct.cpp" + > + RelativePath=".\jdsample.cpp" + > + RelativePath=".\jdtrans.cpp" + > + RelativePath=".\jerror.cpp" + > + RelativePath=".\jerror.h" + > + RelativePath=".\jfdctflt.cpp" + > + RelativePath=".\jidctflt.cpp" + > + RelativePath=".\jinclude.h" + > + RelativePath=".\jmemmgr.cpp" + > + RelativePath=".\jmemnobs.cpp" + > + RelativePath=".\jmemsys.h" + > + RelativePath=".\jmorecfg.h" + > + RelativePath=".\jpegint.h" + > + RelativePath=".\jpgload.cpp" + > + RelativePath=".\jutils.cpp" + > + RelativePath=".\jversion.h" + > + RelativePath="..\radiant_jpeglib.h" + > diff --git a/libs/l_net/l_net.dsp b/libs/l_net/l_net.dsp deleted file mode 100644 index 36a13189..00000000 --- a/libs/l_net/l_net.dsp +++ /dev/null @@ -1,118 +0,0 @@ -# Microsoft Developer Studio Project File - Name="l_net" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=l_net - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "l_net.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "l_net.mak" CFG="l_net - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "l_net - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "l_net - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "l_net" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "l_net - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /nologo /warn:nofileopt -# ADD F90 /compile_only /include:"Release/" /nologo /warn:nofileopt -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "l_net - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /nologo /warn:argument_checking /warn:nofileopt -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "l_net - Win32 Release" -# Name "l_net - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\l_net.c -# End Source File -# Begin Source File - -SOURCE=.\l_net_wins.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\l_net.h -# End Source File -# Begin Source File - -SOURCE=.\l_net_wins.h -# End Source File -# End Group -# End Target -# End Project diff --git a/libs/l_net/l_net.vcproj b/libs/l_net/l_net.vcproj index ee9d198f..e2725a82 100644 --- a/libs/l_net/l_net.vcproj +++ b/libs/l_net/l_net.vcproj @@ -1,103 +1,151 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/l_net.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/l_net.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -105,18 +153,22 @@ + > + RelativePath=".\l_net.c" + > + RelativePath=".\l_net.h" + > + RelativePath=".\l_net_wins.c" + > + RelativePath=".\l_net_wins.h" + > diff --git a/libs/libs.vcproj b/libs/libs.vcproj index a3c52214..af708f7d 100644 --- a/libs/libs.vcproj +++ b/libs/libs.vcproj @@ -1,110 +1,158 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libs.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/libs.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -112,549 +160,715 @@ + > + RelativePath=".\math\aabb.cpp" + > + RelativePath=".\math\aabb.h" + > + RelativePath=".\math\curve.cpp" + > + RelativePath=".\math\curve.h" + > + RelativePath=".\math\expression.cpp" + > + RelativePath=".\math\expression.h" + > + RelativePath=".\math\frustum.cpp" + > + RelativePath=".\math\frustum.h" + > + RelativePath=".\math\line.cpp" + > + RelativePath=".\math\line.h" + > + RelativePath=".\math\matrix.cpp" + > + RelativePath=".\math\matrix.h" + > + RelativePath=".\math\pi.cpp" + > + RelativePath=".\math\pi.h" + > + RelativePath=".\math\plane.cpp" + > + RelativePath=".\math\plane.h" + > + RelativePath=".\math\quaternion.cpp" + > + RelativePath=".\math\quaternion.h" + > + RelativePath=".\math\vector.cpp" + > + RelativePath=".\math\vector.h" + > + > + RelativePath=".\script\scripttokeniser.cpp" + > + RelativePath=".\script\scripttokeniser.h" + > + RelativePath=".\script\scripttokenwriter.cpp" + > + RelativePath=".\script\scripttokenwriter.h" + > + > + RelativePath=".\string\pooledstring.cpp" + > + RelativePath=".\string\pooledstring.h" + > + RelativePath=".\string\string.cpp" + > + RelativePath=".\string\string.h" + > + RelativePath=".\string\stringfwd.cpp" + > + RelativePath=".\string\stringfwd.h" + > + > + RelativePath=".\xml\ixml.cpp" + > + RelativePath=".\xml\ixml.h" + > + RelativePath=".\xml\xmlelement.cpp" + > + RelativePath=".\xml\xmlelement.h" + > + RelativePath=".\xml\xmlparser.cpp" + > + RelativePath=".\xml\xmlparser.h" + > + RelativePath=".\xml\xmltextags.cpp" + > + RelativePath=".\xml\xmltextags.h" + > + RelativePath=".\xml\xmlwriter.cpp" + > + RelativePath=".\xml\xmlwriter.h" + > + > + RelativePath=".\modulesystem\moduleregistry.cpp" + > + RelativePath=".\modulesystem\moduleregistry.h" + > + RelativePath=".\modulesystem\modulesmap.cpp" + > + RelativePath=".\modulesystem\modulesmap.h" + > + RelativePath=".\modulesystem\singletonmodule.cpp" + > + RelativePath=".\modulesystem\singletonmodule.h" + > + > + RelativePath=".\os\dir.cpp" + > + RelativePath=".\os\dir.h" + > + RelativePath=".\os\file.cpp" + > + RelativePath=".\os\file.h" + > + RelativePath=".\os\path.cpp" + > + RelativePath=".\os\path.h" + > + > + RelativePath=".\stream\filestream.cpp" + > + RelativePath=".\stream\filestream.h" + > + RelativePath=".\stream\memstream.cpp" + > + RelativePath=".\stream\memstream.h" + > + RelativePath=".\stream\stringstream.cpp" + > + RelativePath=".\stream\stringstream.h" + > + RelativePath=".\stream\textfilestream.cpp" + > + RelativePath=".\stream\textfilestream.h" + > + RelativePath=".\stream\textstream.cpp" + > + RelativePath=".\stream\textstream.h" + > + > + RelativePath=".\container\array.cpp" + > + RelativePath=".\container\array.h" + > + RelativePath=".\container\cache.cpp" + > + RelativePath=".\container\cache.h" + > + RelativePath=".\container\container.cpp" + > + RelativePath=".\container\container.h" + > + RelativePath=".\container\hashfunc.cpp" + > + RelativePath=".\container\hashfunc.h" + > + RelativePath=".\container\hashtable.cpp" + > + RelativePath=".\container\hashtable.h" + > + RelativePath=".\container\stack.cpp" + > + RelativePath=".\container\stack.h" + > + > + RelativePath=".\generic\arrayrange.cpp" + > + RelativePath=".\generic\arrayrange.h" + > + RelativePath=".\generic\bitfield.cpp" + > + RelativePath=".\generic\bitfield.h" + > + RelativePath=".\generic\callback.cpp" + > + RelativePath=".\generic\callback.h" + > + RelativePath=".\generic\callbackfwd.cpp" + > + RelativePath=".\generic\callbackfwd.h" + > + RelativePath=".\generic\constant.cpp" + > + RelativePath=".\generic\constant.h" + > + RelativePath=".\generic\enumeration.cpp" + > + RelativePath=".\generic\enumeration.h" + > + RelativePath=".\generic\functional.cpp" + > + RelativePath=".\generic\functional.h" + > + RelativePath=".\generic\object.cpp" + > + RelativePath=".\generic\object.h" + > + RelativePath=".\generic\reference.cpp" + > + RelativePath=".\generic\reference.h" + > + RelativePath=".\generic\referencecounted.cpp" + > + RelativePath=".\generic\referencecounted.h" + > + RelativePath=".\generic\static.cpp" + > + RelativePath=".\generic\static.h" + > + RelativePath=".\generic\vector.cpp" + > + Name="Debug|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + Name="Release|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + RelativePath=".\generic\vector.h" + > + > + RelativePath=".\memory\allocator.cpp" + > + RelativePath=".\memory\allocator.h" + > + > + RelativePath=".\debugging\debugging.cpp" + > + RelativePath=".\debugging\debugging.h" + > + > + RelativePath=".\signal\isignal.cpp" + > + RelativePath=".\signal\isignal.h" + > + RelativePath=".\signal\signal.cpp" + > + RelativePath=".\signal\signal.h" + > + RelativePath=".\signal\signalfwd.cpp" + > + RelativePath=".\signal\signalfwd.h" + > + RelativePath=".\archivelib.cpp" + > + RelativePath=".\archivelib.h" + > + RelativePath=".\bytestreamutils.cpp" + > + RelativePath=".\bytestreamutils.h" + > + RelativePath=".\character.cpp" + > + RelativePath=".\character.h" + > + RelativePath=".\convert.cpp" + > + RelativePath=".\convert.h" + > + RelativePath=".\dragplanes.cpp" + > + RelativePath=".\dragplanes.h" + > + RelativePath=".\eclasslib.cpp" + > + RelativePath=".\eclasslib.h" + > + RelativePath=".\entitylib.cpp" + > + RelativePath=".\entitylib.h" + > + RelativePath=".\entityxml.cpp" + > + RelativePath=".\entityxml.h" + > + RelativePath=".\fs_filesystem.cpp" + > + RelativePath=".\fs_filesystem.h" + > + RelativePath=".\fs_path.cpp" + > + RelativePath=".\fs_path.h" + > + RelativePath=".\imagelib.cpp" + > + RelativePath=".\imagelib.h" + > + RelativePath=".\instancelib.cpp" + > + RelativePath=".\instancelib.h" + > + RelativePath=".\maplib.cpp" + > + RelativePath=".\maplib.h" + > + RelativePath=".\moduleobservers.cpp" + > + RelativePath=".\moduleobservers.h" + > + RelativePath=".\pivot.cpp" + > + RelativePath=".\pivot.h" + > + RelativePath=".\render.cpp" + > + RelativePath=".\render.h" + > + RelativePath=".\scenelib.cpp" + > + RelativePath=".\scenelib.h" + > + RelativePath=".\selectionlib.cpp" + > + RelativePath=".\selectionlib.h" + > + RelativePath=".\shaderlib.cpp" + > + RelativePath=".\shaderlib.h" + > + RelativePath=".\stringio.cpp" + > + RelativePath=".\stringio.h" + > + RelativePath=".\texturelib.cpp" + > + RelativePath=".\texturelib.h" + > + RelativePath=".\transformlib.cpp" + > + RelativePath=".\transformlib.h" + > + RelativePath=".\traverselib.cpp" + > + RelativePath=".\traverselib.h" + > + RelativePath=".\typesystem.cpp" + > + RelativePath=".\typesystem.h" + > + RelativePath=".\undolib.cpp" + > + RelativePath=".\undolib.h" + > + RelativePath=".\uniquenames.cpp" + > + RelativePath=".\uniquenames.h" + > + RelativePath=".\versionlib.cpp" + > + RelativePath=".\versionlib.h" + > diff --git a/libs/mathlib/mathlib.dsp b/libs/mathlib/mathlib.dsp deleted file mode 100644 index 358da218..00000000 --- a/libs/mathlib/mathlib.dsp +++ /dev/null @@ -1,126 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mathlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=mathlib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mathlib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mathlib.mak" CFG="mathlib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mathlib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "mathlib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "mathlib" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mathlib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "mathlib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "mathlib - Win32 Release" -# Name "mathlib - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\bbox.c -# End Source File -# Begin Source File - -SOURCE=.\line.c -# End Source File -# Begin Source File - -SOURCE=.\linear.c -# End Source File -# Begin Source File - -SOURCE=.\m4x4.c -# End Source File -# Begin Source File - -SOURCE=.\mathlib.c -# End Source File -# Begin Source File - -SOURCE=.\ray.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\mathlib.h -# End Source File -# End Group -# End Target -# End Project diff --git a/libs/mathlib/mathlib.vcproj b/libs/mathlib/mathlib.vcproj index cd053c80..c0166fbd 100644 --- a/libs/mathlib/mathlib.vcproj +++ b/libs/mathlib/mathlib.vcproj @@ -1,120 +1,170 @@ + ProjectGUID="{BF0FF048-887F-4D43-A455-F8C04FB98F10}" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + - - + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1036" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Debug\mathlib.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + - + SuppressStartupBanner="true" + CompileAs="0" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1036" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile=".\Release\mathlib.lib" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -122,118 +172,146 @@ + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="bbox.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + RelativePath="line.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + RelativePath="m4x4.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + RelativePath="mathlib.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + RelativePath="ray.c" + > + Name="Debug|Win32" + > + BrowseInformation="1" + /> + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Filter="h;hpp;hxx;hm;inl" + > + RelativePath="..\mathlib.h" + > diff --git a/libs/md5lib/md5lib.dsp b/libs/md5lib/md5lib.dsp deleted file mode 100644 index 81addbbc..00000000 --- a/libs/md5lib/md5lib.dsp +++ /dev/null @@ -1,106 +0,0 @@ -# Microsoft Developer Studio Project File - Name="md5lib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=md5lib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "md5lib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "md5lib.mak" CFG="md5lib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "md5lib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "md5lib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "Perforce Project" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "md5lib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "md5lib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "md5lib - Win32 Release" -# Name "md5lib - Win32 Debug" -# Begin Group "src" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\md5lib.c -# End Source File -# End Group -# Begin Group "include" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\md5lib.h -# End Source File -# End Group -# End Target -# End Project diff --git a/libs/picomodel/picomodel.dsp b/libs/picomodel/picomodel.dsp deleted file mode 100644 index 8638409c..00000000 --- a/libs/picomodel/picomodel.dsp +++ /dev/null @@ -1,206 +0,0 @@ -# Microsoft Developer Studio Project File - Name="picomodel" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=picomodel - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "picomodel.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "picomodel.mak" CFG="picomodel - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "picomodel - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "picomodel - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "picomodel" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "picomodel - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "picomodel - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "picomodel - Win32 Release" -# Name "picomodel - Win32 Debug" -# Begin Group "src" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "lwo" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\lwo\clip.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\envelope.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\list.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\lwio.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\lwo2.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\lwob.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\pntspols.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\surface.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\vecmath.c -# End Source File -# Begin Source File - -SOURCE=.\lwo\vmap.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\picointernal.c -# End Source File -# Begin Source File - -SOURCE=.\picomodel.c -# End Source File -# Begin Source File - -SOURCE=.\picomodules.c -# End Source File -# Begin Source File - -SOURCE=.\pm_3ds.c -# End Source File -# Begin Source File - -SOURCE=.\pm_ase.c -# End Source File -# Begin Source File - -SOURCE=.\pm_fm.c -# End Source File -# Begin Source File - -SOURCE=.\pm_lwo.c -# End Source File -# Begin Source File - -SOURCE=.\pm_md2.c -# End Source File -# Begin Source File - -SOURCE=.\pm_md3.c -# End Source File -# Begin Source File - -SOURCE=.\pm_mdc.c -# End Source File -# Begin Source File - -SOURCE=.\pm_ms3d.c -# End Source File -# Begin Source File - -SOURCE=.\pm_obj.c -# End Source File -# End Group -# Begin Group "include" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\lwo\lwo2.h -# End Source File -# Begin Source File - -SOURCE=.\picointernal.h -# End Source File -# Begin Source File - -SOURCE=..\picomodel.h -# End Source File -# Begin Source File - -SOURCE=.\pm_fm.h -# End Source File -# End Group -# End Target -# End Project diff --git a/libs/picomodel/picomodel.vcproj b/libs/picomodel/picomodel.vcproj index f4f94c0a..99a2bfd4 100644 --- a/libs/picomodel/picomodel.vcproj +++ b/libs/picomodel/picomodel.vcproj @@ -1,105 +1,153 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/picomodel.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/picomodel.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -108,96 +156,125 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\picointernal.c" + > + RelativePath=".\picomodel.c" + > + RelativePath=".\picomodules.c" + > + RelativePath=".\pm_3ds.c" + > + RelativePath=".\pm_ase.c" + > + RelativePath=".\pm_fm.c" + > + RelativePath=".\pm_lwo.c" + > + RelativePath=".\pm_md2.c" + > + RelativePath=".\pm_md3.c" + > + RelativePath=".\pm_mdc.c" + > + RelativePath=".\pm_ms3d.c" + > + RelativePath=".\pm_obj.c" + > + RelativePath=".\pm_terrain.c" + > + > + RelativePath=".\lwo\clip.c" + > + RelativePath=".\lwo\envelope.c" + > + RelativePath=".\lwo\list.c" + > + RelativePath=".\lwo\lwio.c" + > + RelativePath=".\lwo\lwo2.c" + > + RelativePath=".\lwo\lwo2.h" + > + RelativePath=".\lwo\lwob.c" + > + RelativePath=".\lwo\pntspols.c" + > + RelativePath=".\lwo\surface.c" + > + RelativePath=".\lwo\vecmath.c" + > + RelativePath=".\lwo\vmap.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\picointernal.h" + > + RelativePath="..\picomodel.h" + > + RelativePath=".\pm_fm.h" + > diff --git a/libs/profile/profile.vcproj b/libs/profile/profile.vcproj index d73bb4c4..bd51526f 100644 --- a/libs/profile/profile.vcproj +++ b/libs/profile/profile.vcproj @@ -1,107 +1,155 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/profile.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/profile.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> @@ -109,18 +157,22 @@ + > + RelativePath=".\file.cpp" + > + RelativePath=".\file.h" + > + RelativePath=".\profile.cpp" + > + RelativePath=".\profile.h" + > diff --git a/libs/splines/Splines.dsp b/libs/splines/Splines.dsp deleted file mode 100644 index 55263124..00000000 --- a/libs/splines/Splines.dsp +++ /dev/null @@ -1,160 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Splines" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=Splines - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Splines.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Splines.mak" CFG="Splines - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Splines - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "Splines - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/Wolf5/src/splines", ENNAAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Splines - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "Splines - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -MTL=midl.exe -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "Splines - Win32 Release" -# Name "Splines - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\math_angles.cpp -# End Source File -# Begin Source File - -SOURCE=.\math_matrix.cpp -# End Source File -# Begin Source File - -SOURCE=.\math_quaternion.cpp -# End Source File -# Begin Source File - -SOURCE=.\math_vector.cpp -# End Source File -# Begin Source File - -SOURCE=.\q_parse.cpp -# End Source File -# Begin Source File - -SOURCE=.\q_shared.cpp -# End Source File -# Begin Source File - -SOURCE=.\splines.cpp -# End Source File -# Begin Source File - -SOURCE=.\util_str.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\math_angles.h -# End Source File -# Begin Source File - -SOURCE=.\math_matrix.h -# End Source File -# Begin Source File - -SOURCE=.\math_quaternion.h -# End Source File -# Begin Source File - -SOURCE=.\math_vector.h -# End Source File -# Begin Source File - -SOURCE=.\q_shared.h -# End Source File -# Begin Source File - -SOURCE=.\splines.h -# End Source File -# Begin Source File - -SOURCE=.\util_list.h -# End Source File -# Begin Source File - -SOURCE=.\util_str.h -# End Source File -# End Group -# End Target -# End Project diff --git a/plugins/archivepak/archivepak.dsp b/plugins/archivepak/archivepak.dsp deleted file mode 100644 index 2c1d3594..00000000 --- a/plugins/archivepak/archivepak.dsp +++ /dev/null @@ -1,150 +0,0 @@ -# Microsoft Developer Studio Project File - Name="archivepak" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=archivepak - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "archivepak.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "archivepak.mak" CFG="archivepak - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "archivepak - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "archivepak - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "archivepak" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "archivepak - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEPAK_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEPAK_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\archivepak.def" /libpath:"..\..\libs\cmdlib\release" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\archivepak.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "archivepak - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEPAK_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEPAK_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\archivepak.def" /pdbtype:sept /libpath:"..\..\libs\cmdlib\debug" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\archivepak.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "archivepak - Win32 Release" -# Name "archivepak - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\archive.cpp -# End Source File -# Begin Source File - -SOURCE=.\archivepak.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\archive.h -# End Source File -# Begin Source File - -SOURCE=.\pak.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/archivepak/archivepak.vcproj b/plugins/archivepak/archivepak.vcproj index bbae8fb8..dbab76df 100644 --- a/plugins/archivepak/archivepak.vcproj +++ b/plugins/archivepak/archivepak.vcproj @@ -1,143 +1,201 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -146,66 +204,79 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\archive.cpp" + > + RelativePath=".\archive.h" + > + RelativePath=".\pak.cpp" + > + RelativePath=".\pak.h" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + RelativePath=".\archivepak.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> diff --git a/plugins/archivewad/archivewad.dsp b/plugins/archivewad/archivewad.dsp deleted file mode 100644 index b26d4c10..00000000 --- a/plugins/archivewad/archivewad.dsp +++ /dev/null @@ -1,150 +0,0 @@ -# Microsoft Developer Studio Project File - Name="archivewad" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=archivewad - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "archivewad.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "archivewad.mak" CFG="archivewad - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "archivewad - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "archivewad - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "archivewad" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "archivewad - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEWAD_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEWAD_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\archivewad.def" /libpath:"../../libs/cmdlib/release" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\archivewad.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "archivewad - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEWAD_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEWAD_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\archivewad.def" /pdbtype:sept /libpath:"../../libs/cmdlib/debug" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\archivewad.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "archivewad - Win32 Release" -# Name "archivewad - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\archive.cpp -# End Source File -# Begin Source File - -SOURCE=.\archivewad.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\archive.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\wad.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/archivewad/archivewad.vcproj b/plugins/archivewad/archivewad.vcproj index 94578ffb..fda186fd 100644 --- a/plugins/archivewad/archivewad.vcproj +++ b/plugins/archivewad/archivewad.vcproj @@ -1,143 +1,201 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -146,66 +204,79 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\archive.cpp" + > + RelativePath=".\archive.h" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + RelativePath=".\wad.cpp" + > + RelativePath=".\wad.h" + > + RelativePath=".\archivewad.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> diff --git a/plugins/archivezip/archivezip.dsp b/plugins/archivezip/archivezip.dsp deleted file mode 100644 index 076c442b..00000000 --- a/plugins/archivezip/archivezip.dsp +++ /dev/null @@ -1,154 +0,0 @@ -# Microsoft Developer Studio Project File - Name="archivezip" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=archivezip - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "archivezip.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "archivezip.mak" CFG="archivezip - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "archivezip - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "archivezip - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "archivezip" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "archivezip - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEZIP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEZIP_EXPORTS" /D "ZLIB_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib zlib.lib /nologo /dll /machine:I386 /def:".\archivezip.def" /libpath:"..\..\libs\cmdlib\release" /libpath:"..\..\..\gtk2-win32\lib" /libpath:"..\..\..\libpng\projects\msvc\zlib___Win32_Release" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\archivezip.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "archivezip - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEZIP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ARCHIVEZIP_EXPORTS" /D "ZLIB_DLL" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib zlibd.lib /nologo /dll /debug /machine:I386 /def:".\archivezip.def" /pdbtype:sept /libpath:"..\..\libs\cmdlib\debug" /libpath:"..\..\..\gtk2-win32\lib" /libpath:"..\..\..\libpng\projects\msvc\zlib___Win32_Debug" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\archivezip.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "archivezip - Win32 Release" -# Name "archivezip - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\archive.cpp -# End Source File -# Begin Source File - -SOURCE=.\archivezip.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\archive.h -# End Source File -# Begin Source File - -SOURCE=.\pkzip.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\zlibstream.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/archivezip/archivezip.vcproj b/plugins/archivezip/archivezip.vcproj index 41772d7f..6f4cd990 100644 --- a/plugins/archivezip/archivezip.vcproj +++ b/plugins/archivezip/archivezip.vcproj @@ -1,148 +1,206 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -151,72 +209,87 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\archive.cpp" + > + RelativePath=".\archive.h" + > + RelativePath=".\pkzip.cpp" + > + RelativePath=".\pkzip.h" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + RelativePath=".\zlibstream.cpp" + > + RelativePath=".\zlibstream.h" + > + RelativePath=".\archivezip.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> diff --git a/plugins/entity/doom3group.cpp b/plugins/entity/doom3group.cpp index 49b38e97..66e2f924 100644 --- a/plugins/entity/doom3group.cpp +++ b/plugins/entity/doom3group.cpp @@ -203,6 +203,11 @@ private: setIsModel(!string_equal(m_modelKey.c_str(), m_name.c_str())); } +// vc 2k5 compiler fix +#if _MSC_VER >= 1400 + public: +#endif + void nameChanged(const char* value) { m_name = value; diff --git a/plugins/entity/eclassmodel.cpp b/plugins/entity/eclassmodel.cpp index 2318441f..d69fb8c8 100644 --- a/plugins/entity/eclassmodel.cpp +++ b/plugins/entity/eclassmodel.cpp @@ -97,6 +97,11 @@ class EclassModel : m_keyObservers.insert("origin", OriginKey::OriginChangedCaller(m_originKey)); } +// vc 2k5 compiler fix +#if _MSC_VER >= 1400 + public: +#endif + void updateTransform() { m_transform.localToParent() = g_matrix4_identity; @@ -524,3 +529,4 @@ scene::Node& New_EclassModel(EntityClass* eclass) return (new EclassModelNode(eclass))->node(); } + diff --git a/plugins/entity/entity.dsp b/plugins/entity/entity.dsp deleted file mode 100644 index 487de10e..00000000 --- a/plugins/entity/entity.dsp +++ /dev/null @@ -1,230 +0,0 @@ -# Microsoft Developer Studio Project File - Name="entity" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=entity - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "entity.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "entity.mak" CFG="entity - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "entity - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "entity - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "entity" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "entity - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\libxml2\include\\" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\entity.def" /libpath:"..\..\libs\mathlib\release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\entity.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "entity - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\shared" /I "..\..\..\libxml2\include" /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\entity.def" /pdbtype:sept /libpath:"..\..\libs\mathlib\debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\entity.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "entity - Win32 Release" -# Name "entity - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\eclassmodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\entity.cpp -# End Source File -# Begin Source File - -SOURCE=.\entity.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\generic.cpp -# End Source File -# Begin Source File - -SOURCE=.\group.cpp -# End Source File -# Begin Source File - -SOURCE=.\light.cpp -# End Source File -# Begin Source File - -SOURCE=.\miscmodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\targetable.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\igl.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\imodel.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ishaders.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\isurface.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\angle.h -# End Source File -# Begin Source File - -SOURCE=.\angles.h -# End Source File -# Begin Source File - -SOURCE=.\colour.h -# End Source File -# Begin Source File - -SOURCE=.\entity.h -# End Source File -# Begin Source File - -SOURCE=.\light.h -# End Source File -# Begin Source File - -SOURCE=.\model.h -# End Source File -# Begin Source File - -SOURCE=.\origin.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\scale.h -# End Source File -# Begin Source File - -SOURCE=.\targetable.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/entity/entityq3.vcproj b/plugins/entity/entityq3.vcproj index 9da18268..0fd4d0ef 100644 --- a/plugins/entity/entityq3.vcproj +++ b/plugins/entity/entityq3.vcproj @@ -1,144 +1,202 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -146,198 +204,250 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + > + RelativePath=".\doom3group.cpp" + > + RelativePath=".\doom3group.h" + > + RelativePath=".\eclassmodel.cpp" + > + RelativePath=".\eclassmodel.h" + > + RelativePath=".\generic.cpp" + > + RelativePath=".\generic.h" + > + RelativePath=".\group.cpp" + > + RelativePath=".\group.h" + > + RelativePath=".\light.cpp" + > + RelativePath=".\light.h" + > + RelativePath=".\miscmodel.cpp" + > + RelativePath=".\miscmodel.h" + > + > + RelativePath=".\entity.cpp" + > + RelativePath=".\entity.h" + > + RelativePath=".\skincache.cpp" + > + RelativePath=".\skincache.h" + > + > + RelativePath=".\angle.cpp" + > + RelativePath=".\angle.h" + > + RelativePath=".\angles.cpp" + > + RelativePath=".\angles.h" + > + RelativePath=".\colour.cpp" + > + RelativePath=".\colour.h" + > + RelativePath=".\curve.cpp" + > + RelativePath=".\curve.h" + > + RelativePath=".\filters.cpp" + > + RelativePath=".\filters.h" + > + RelativePath=".\keyobservers.cpp" + > + RelativePath=".\keyobservers.h" + > + RelativePath=".\model.cpp" + > + RelativePath=".\model.h" + > + RelativePath=".\modelskinkey.cpp" + > + RelativePath=".\modelskinkey.h" + > + RelativePath=".\namedentity.cpp" + > + RelativePath=".\namedentity.h" + > + RelativePath=".\namekeys.cpp" + > + RelativePath=".\namekeys.h" + > + RelativePath=".\origin.cpp" + > + RelativePath=".\origin.h" + > + RelativePath=".\rotation.cpp" + > + RelativePath=".\rotation.h" + > + RelativePath=".\scale.cpp" + > + RelativePath=".\scale.h" + > + RelativePath=".\targetable.cpp" + > + RelativePath=".\targetable.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\entityq3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/entity/generic.cpp b/plugins/entity/generic.cpp index 8b5b3270..bc8a6b7c 100644 --- a/plugins/entity/generic.cpp +++ b/plugins/entity/generic.cpp @@ -116,6 +116,11 @@ class GenericEntity : m_keyObservers.insert("origin", OriginKey::OriginChangedCaller(m_originKey)); } +// vc 2k5 compiler fix +#if _MSC_VER >= 1400 + public: +#endif + void updateTransform() { m_transform.localToParent() = g_matrix4_identity; diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp index 5fbbafc4..667b38b7 100644 --- a/plugins/entity/light.cpp +++ b/plugins/entity/light.cpp @@ -908,6 +908,11 @@ class Light : m_traverse.detach(&m_traverseObservers); } } + +// vc 2k5 compiler fix +#if _MSC_VER >= 1400 + public: +#endif void updateOrigin() { diff --git a/plugins/entity/miscmodel.cpp b/plugins/entity/miscmodel.cpp index 32b93c65..c23075fe 100644 --- a/plugins/entity/miscmodel.cpp +++ b/plugins/entity/miscmodel.cpp @@ -93,6 +93,12 @@ class MiscModel : matrix4_transform_by_euler_xyz_degrees(m_transform.localToParent(), m_origin, m_angles, m_scale); m_transformChanged(); } + +// vc 2k5 compiler fix +#if _MSC_VER >= 1400 + public: +#endif + void originChanged() { m_origin = m_originKey.m_origin; diff --git a/plugins/image/image.dsp b/plugins/image/image.dsp deleted file mode 100644 index b25a37ba..00000000 --- a/plugins/image/image.dsp +++ /dev/null @@ -1,166 +0,0 @@ -# Microsoft Developer Studio Project File - Name="image" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=image - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "image.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "image.mak" CFG="image - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "image - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "image - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "image" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "image - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\jpeg6" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib jpeg6.lib /nologo /dll /machine:I386 /def:".\image.def" /libpath:"../../libs/jpeg6/release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\image.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "image - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\jpeg6" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib jpeg6.lib /nologo /dll /debug /machine:I386 /def:".\image.def" /pdbtype:sept /libpath:"../../libs/jpeg6/debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\image.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "image - Win32 Release" -# Name "image - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\bmp.cpp -# End Source File -# Begin Source File - -SOURCE=.\image.cpp -# End Source File -# Begin Source File - -SOURCE=.\image.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\jpeg.cpp -# End Source File -# Begin Source File - -SOURCE=.\pcx.cpp -# End Source File -# Begin Source File - -SOURCE=.\tga.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\bmp.h -# End Source File -# Begin Source File - -SOURCE=.\image.h -# End Source File -# Begin Source File - -SOURCE=.\jpeg.h -# End Source File -# Begin Source File - -SOURCE=.\pcx.h -# End Source File -# Begin Source File - -SOURCE=.\tga.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/plugins/image/imageq3.vcproj b/plugins/image/imageq3.vcproj index 8c98b743..fed7e865 100644 --- a/plugins/image/imageq3.vcproj +++ b/plugins/image/imageq3.vcproj @@ -1,145 +1,203 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -147,89 +205,108 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + > + RelativePath=".\image.cpp" + > + RelativePath=".\image.h" + > + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\bmp.cpp" + > + RelativePath=".\bmp.h" + > + RelativePath=".\dds.cpp" + > + RelativePath=".\dds.h" + > + RelativePath=".\jpeg.cpp" + > + RelativePath=".\jpeg.h" + > + RelativePath=".\pcx.cpp" + > + RelativePath=".\pcx.h" + > + RelativePath=".\tga.cpp" + > + RelativePath=".\tga.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\imageq3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/imagehl/imagehl.dsp b/plugins/imagehl/imagehl.dsp deleted file mode 100644 index dcd35ff8..00000000 --- a/plugins/imagehl/imagehl.dsp +++ /dev/null @@ -1,174 +0,0 @@ -# Microsoft Developer Studio Project File - Name="imagehl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=imagehl - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "imagehl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "imagehl.mak" CFG="imagehl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "imagehl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "imagehl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "imagehl" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "imagehl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /machine:I386 /def:".\imagehl.def" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\imagehl.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "imagehl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGE_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\imagehl.def" /pdbtype:sept /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\imagehl.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "imagehl - Win32 Release" -# Name "imagehl - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\hlw.cpp -# End Source File -# Begin Source File - -SOURCE=.\imagehl.cpp -# End Source File -# Begin Source File - -SOURCE=.\imagehl.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\mip.cpp -# End Source File -# Begin Source File - -SOURCE=.\sprite.cpp -# End Source File -# Begin Source File - -SOURCE=.\wal.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\hlw.h -# End Source File -# Begin Source File - -SOURCE=.\imagehl.h -# End Source File -# Begin Source File - -SOURCE=.\mip.h -# End Source File -# Begin Source File - -SOURCE=.\sprite.h -# End Source File -# Begin Source File - -SOURCE=.\wal.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;txt" -# Begin Source File - -SOURCE=.\imagehl.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/imagehl/imagehl.vcproj b/plugins/imagehl/imagehl.vcproj index ffd0a7a8..719db79c 100644 --- a/plugins/imagehl/imagehl.vcproj +++ b/plugins/imagehl/imagehl.vcproj @@ -1,145 +1,203 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules\" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules\" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules\" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules\" " + /> @@ -147,77 +205,92 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + > + RelativePath=".\imagehl.cpp" + > + RelativePath=".\imagehl.h" + > + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\hlw.cpp" + > + RelativePath=".\hlw.h" + > + RelativePath=".\mip.cpp" + > + RelativePath=".\mip.h" + > + RelativePath=".\sprite.cpp" + > + RelativePath=".\sprite.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\imagehl.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/imagepng/imagepng.dsp b/plugins/imagepng/imagepng.dsp deleted file mode 100644 index 45e16791..00000000 --- a/plugins/imagepng/imagepng.dsp +++ /dev/null @@ -1,120 +0,0 @@ -# Microsoft Developer Studio Project File - Name="imagepng" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=imagepng - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "imagepng.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "imagepng.mak" CFG="imagepng - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "imagepng - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "imagepng - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "imagepng" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "imagepng - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGEPNG_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\libs" /I "..\..\..\libpng" /I "..\..\..\zlib" /I "..\..\..\libxml2\include" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGEPNG_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib synapse.lib /nologo /dll /machine:I386 /def:".\imagepng.def" /libpath:"../../libs/synapse/release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "imagepng - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGEPNG_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\libs" /I "..\..\..\libpng" /I "..\..\..\zlib" /I "..\..\..\libxml2\include" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IMAGEPNG_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib synapse.lib /nologo /dll /debug /machine:I386 /def:".\imagepng.def" /pdbtype:sept /libpath:"../../libs/synapse/debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "imagepng - Win32 Release" -# Name "imagepng - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\imagepng.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/plugins/imagepng/imagepng.vcproj b/plugins/imagepng/imagepng.vcproj index 70a34a73..cde6cc53 100644 --- a/plugins/imagepng/imagepng.vcproj +++ b/plugins/imagepng/imagepng.vcproj @@ -1,147 +1,205 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -150,54 +208,63 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC837F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\imagepng.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/imageq2/imageq2.vcproj b/plugins/imageq2/imageq2.vcproj index 5997a601..79439a13 100644 --- a/plugins/imageq2/imageq2.vcproj +++ b/plugins/imageq2/imageq2.vcproj @@ -1,145 +1,203 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -147,71 +205,84 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + > + RelativePath=".\imageq2.cpp" + > + RelativePath=".\imageq2.h" + > + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\wal.cpp" + > + RelativePath=".\wal.h" + > + RelativePath=".\wal32.cpp" + > + RelativePath=".\wal32.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\imageq2.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/mapq3/mapq3.dsp b/plugins/mapq3/mapq3.dsp deleted file mode 100644 index dfd621b8..00000000 --- a/plugins/mapq3/mapq3.dsp +++ /dev/null @@ -1,166 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mapq3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mapq3 - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mapq3.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mapq3.mak" CFG="mapq3 - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mapq3 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mapq3 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "mapq3" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mapq3 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\mapq3.def" /libpath:"../../libs/cmdlib/release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\mapq3.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "mapq3 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\mapq3.def" /pdbtype:sept /libpath:"../../libs/cmdlib/debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\mapq3.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "mapq3 - Win32 Release" -# Name "mapq3 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\mapq3.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\parse.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\write.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ipatch.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\iscriplib.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/mapq3/mapq3.vcproj b/plugins/mapq3/mapq3.vcproj index 92b6a77e..54f2aea0 100644 --- a/plugins/mapq3/mapq3.vcproj +++ b/plugins/mapq3/mapq3.vcproj @@ -1,142 +1,200 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -145,70 +203,83 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + > + RelativePath=".\parse.cpp" + > + RelativePath=".\parse.h" + > + RelativePath=".\write.cpp" + > + RelativePath=".\write.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\mapq3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/mapxml/mapxml.dsp b/plugins/mapxml/mapxml.dsp deleted file mode 100644 index 8107ef8d..00000000 --- a/plugins/mapxml/mapxml.dsp +++ /dev/null @@ -1,167 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mapxml" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mapxml - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mapxml.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mapxml.mak" CFG="mapxml - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mapxml - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mapxml - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "mapxml" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mapxml - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\libxml2\include\\" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /dll /machine:I386 -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\mapxml.def" /libpath:"../../libs/cmdlib/release" /libpath:"..\..\..\libxml2\win32\libxml2\release_so" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\mapxml.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "mapxml - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\libxml2\include" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\libxml2\include" /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 cmdlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\mapxml.def" /pdbtype:sept /libpath:"../../libs/cmdlib/debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\mapxml.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "mapxml - Win32 Release" -# Name "mapxml - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\mapxml.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\xmlparse.cpp -# End Source File -# Begin Source File - -SOURCE=.\xmlwrite.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "*.h" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ipatch.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\iscriplib.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/mapxml/mapxml.vcproj b/plugins/mapxml/mapxml.vcproj index 6578b860..30a43e2c 100644 --- a/plugins/mapxml/mapxml.vcproj +++ b/plugins/mapxml/mapxml.vcproj @@ -1,147 +1,205 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -150,71 +208,85 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\xmlparse.cpp" + > + RelativePath=".\xmlparse.h" + > + RelativePath=".\xmlwrite.cpp" + > + RelativePath=".\xmlwrite.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\mapxml.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/md3model/md3model.dsp b/plugins/md3model/md3model.dsp deleted file mode 100644 index de8a19db..00000000 --- a/plugins/md3model/md3model.dsp +++ /dev/null @@ -1,218 +0,0 @@ -# Microsoft Developer Studio Project File - Name="md3model" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=md3model - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "md3model.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "md3model.mak" CFG="md3model - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "md3model - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "md3model - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "md3model" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "md3model - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\..\libxml2\include\\" /I "..\..\..\STLPort\stlport" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib /nologo /dll /machine:I386 /def:".\md3model.def" /libpath:"..\..\libs\mathlib\release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\md3model.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "md3model - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\shared" /I "..\common" /I "..\..\libs" /I "..\..\..\libxml2\include" /I "..\..\..\STLPort\stlport" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "../../../gtk2-win32/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\md3model.def" /pdbtype:sept /libpath:"..\..\libs\mathlib\debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\md3model.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "md3model - Win32 Release" -# Name "md3model - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\md2.cpp -# End Source File -# Begin Source File - -SOURCE=.\md3.cpp -# End Source File -# Begin Source File - -SOURCE=.\md3model.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\mdc.cpp -# End Source File -# Begin Source File - -SOURCE=.\mdl.cpp -# End Source File -# Begin Source File - -SOURCE=.\mdlimage.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\igl.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\imodel.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ishaders.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\isurface.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ident.h -# End Source File -# Begin Source File - -SOURCE=.\md2.h -# End Source File -# Begin Source File - -SOURCE=.\md3.h -# End Source File -# Begin Source File - -SOURCE=.\md3normals.h -# End Source File -# Begin Source File - -SOURCE=.\mdc.h -# End Source File -# Begin Source File - -SOURCE=.\mdl.h -# End Source File -# Begin Source File - -SOURCE=.\mdlnormals.h -# End Source File -# Begin Source File - -SOURCE=.\model.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/md3model/modelmd3.vcproj b/plugins/md3model/modelmd3.vcproj index dff7eb21..41ec921b 100644 --- a/plugins/md3model/modelmd3.vcproj +++ b/plugins/md3model/modelmd3.vcproj @@ -1,149 +1,207 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -152,125 +210,155 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + > + RelativePath=".\md2.cpp" + > + RelativePath=".\md2.h" + > + RelativePath=".\md3.cpp" + > + RelativePath=".\md3.h" + > + RelativePath=".\md5.cpp" + > + RelativePath=".\md5.h" + > + RelativePath=".\mdc.cpp" + > + RelativePath=".\mdc.h" + > + RelativePath=".\mdl.cpp" + > + RelativePath=".\mdl.h" + > + RelativePath=".\mdlimage.cpp" + > + RelativePath=".\mdlimage.h" + > + > + RelativePath=".\ident.h" + > + RelativePath=".\md3normals.cpp" + > + RelativePath=".\md3normals.h" + > + RelativePath=".\mdlformat.cpp" + > + RelativePath=".\mdlformat.h" + > + RelativePath=".\mdlnormals.cpp" + > + RelativePath=".\mdlnormals.h" + > + RelativePath=".\model.cpp" + > + RelativePath=".\model.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\modelmd3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/model/model.dsp b/plugins/model/model.dsp deleted file mode 100644 index c24a1506..00000000 --- a/plugins/model/model.dsp +++ /dev/null @@ -1,178 +0,0 @@ -# Microsoft Developer Studio Project File - Name="model" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=model - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "model.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "model.mak" CFG="model - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "model - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "model - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "model" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "model - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\libxml2\include\\" /I "..\..\libs\nvtristrip" /I "..\..\..\stlport\stlport" /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /def:".\model.def" /libpath:"..\..\libs\mathlib\release" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\model.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "model - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\shared" /I "..\..\..\libxml2\include" /I "..\..\..\stlport\stlport\\" /I "..\..\include" /I "..\..\libs" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /def:".\model.def" /pdbtype:sept /libpath:"..\..\libs\mathlib\debug" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\model.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "model - Win32 Release" -# Name "model - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\cpicomodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\cpicosurface.cpp -# End Source File -# Begin Source File - -SOURCE=.\model.cpp -# End Source File -# Begin Source File - -SOURCE=.\model.def -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\igl.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\imodel.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ishaders.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\isurface.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/model/modelpico.vcproj b/plugins/model/modelpico.vcproj index 0e1e4d8f..828fd23d 100644 --- a/plugins/model/modelpico.vcproj +++ b/plugins/model/modelpico.vcproj @@ -1,146 +1,204 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -149,65 +207,77 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\model.cpp" + > + RelativePath=".\model.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\modelpico.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/sample/sample.vcproj b/plugins/sample/sample.vcproj index 38d9322f..f4e10f8c 100644 --- a/plugins/sample/sample.vcproj +++ b/plugins/sample/sample.vcproj @@ -1,139 +1,201 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins"" + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\plugins"" + /> @@ -142,54 +204,63 @@ + UniqueIdentifier="{22F2852C-8177-45D5-94D0-C5255C199F7F}" + > + RelativePath=".\sample.cpp" + > + RelativePath=".\sample.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\sample.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/shaders/shaders.dsp b/plugins/shaders/shaders.dsp deleted file mode 100644 index e1f3e83e..00000000 --- a/plugins/shaders/shaders.dsp +++ /dev/null @@ -1,142 +0,0 @@ -# Microsoft Developer Studio Project File - Name="shaders" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=shaders - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "shaders.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "shaders.mak" CFG="shaders - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "shaders - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "shaders - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "shaders" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "shaders - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHADERS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHADERS_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /map /machine:I386 /def:".\shaders.def" /libpath:"..\..\libs\mathlib\Release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\shaders.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "shaders - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /include:"Debug/" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHADERS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHADERS_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\shaders.def" /pdbtype:sept /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\shaders.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "shaders - Win32 Release" -# Name "shaders - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\shaders.cpp -# End Source File -# Begin Source File - -SOURCE=.\shaders.def -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\shaders.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/plugins/shaders/shadersq3.vcproj b/plugins/shaders/shadersq3.vcproj index e4853747..709743bb 100644 --- a/plugins/shaders/shadersq3.vcproj +++ b/plugins/shaders/shadersq3.vcproj @@ -1,147 +1,205 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -150,64 +208,75 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\plugin.cpp" + > + RelativePath=".\plugin.h" + > + > + RelativePath=".\shaders.cpp" + > + RelativePath=".\shaders.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\shadersq3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/plugins/spritemodel/spritemodel.dsp b/plugins/spritemodel/spritemodel.dsp deleted file mode 100644 index 74b41753..00000000 --- a/plugins/spritemodel/spritemodel.dsp +++ /dev/null @@ -1,160 +0,0 @@ -# Microsoft Developer Studio Project File - Name="spritemodel" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=spritemodel - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "spritemodel.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "spritemodel.mak" CFG="spritemodel - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "spritemodel - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "spritemodel - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "spritemodel" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "spritemodel - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\libxml2\include\\" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib synapse.lib /nologo /dll /machine:I386 /def:".\spritemodel.def" /libpath:"..\..\libs\mathlib\release" /libpath:"..\..\libs\synapse\release" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "spritemodel - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\shared" /I "..\..\..\libxml2\include" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\include" /I "..\common" /I "..\..\libs" /I "..\..\libs\nvtristrip" /I "..\..\..\STLPort\stlport" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MAP_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 mathlib.lib glib-2.0.lib synapse.lib /nologo /dll /debug /machine:I386 /def:".\spritemodel.def" /pdbtype:sept /libpath:"..\..\libs\mathlib\debug" /libpath:"..\..\libs\synapse\debug" /libpath:"..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "spritemodel - Win32 Release" -# Name "spritemodel - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\spritemodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\spritemodel.def -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "API" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\igl.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\imodel.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\ishaders.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\qertypes.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\spritemodel.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\Conscript -# End Source File -# End Target -# End Project diff --git a/plugins/textool/TexTool.dsp b/plugins/textool/TexTool.dsp deleted file mode 100644 index 55cf2d8d..00000000 --- a/plugins/textool/TexTool.dsp +++ /dev/null @@ -1,174 +0,0 @@ -# Microsoft Developer Studio Project File - Name="TexTool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=TexTool - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "TexTool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "TexTool.mak" CFG="TexTool - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "TexTool - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "TexTool - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "TexTool" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "TexTool - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEXTOOL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\libs" /I "..\common" /I "..\..\include" /I "..\..\..\src-2.0\include\glib-2.0" /I "..\..\..\src-2.0\lib\glib-2.0\include" /I "..\..\..\src-2.0\lib\gtk-2.0\include" /I "..\..\..\src-2.0\include\gtk-2.0" /I "..\..\..\src-2.0\include\gtk-2.0\gdk" /I "..\..\..\src-2.0\include\pango-1.0" /I "..\..\..\src-2.0\include\atk-1.0" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEXTOOL_EXPORTS" /D "GTK_PLUGIN" /Yu"stdafx.h" /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 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:"..\..\..\src-2.0\lib\\" /libpath:"../../libs/mathlib/Release" - -!ELSEIF "$(CFG)" == "TexTool - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /include:"Debug/" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEXTOOL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\libs" /I "..\common" /I "..\..\include" /I "..\..\..\src-2.0\include\glib-2.0" /I "..\..\..\src-2.0\lib\glib-2.0\include" /I "..\..\..\src-2.0\lib\gtk-2.0\include" /I "..\..\..\src-2.0\include\gtk-2.0" /I "..\..\..\src-2.0\include\gtk-2.0\gdk" /I "..\..\..\src-2.0\include\pango-1.0" /I "..\..\..\src-2.0\include\atk-1.0" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEXTOOL_EXPORTS" /D "GTK_PLUGIN" /FR /Yu"stdafx.h" /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "_DEBUG" -# ADD RSC /l 0x40c /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib mathlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\src-2.0\lib\\" /libpath:"../../libs/mathlib/Debug" - -!ENDIF - -# Begin Target - -# Name "TexTool - Win32 Release" -# Name "TexTool - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\2DView.cpp -# End Source File -# Begin Source File - -SOURCE=.\ControlPointsManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" -# End Source File -# Begin Source File - -SOURCE=.\TexTool.cpp -# End Source File -# Begin Source File - -SOURCE=.\TexTool.def -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "interfaces" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\Q3Radiant\igl.h -# End Source File -# Begin Source File - -SOURCE=..\..\Q3Radiant\ISelectedFace.h -# End Source File -# Begin Source File - -SOURCE=..\..\Q3Radiant\isurfaceplugin.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\2DView.h -# End Source File -# Begin Source File - -SOURCE=.\ControlPointsManager.h -# End Source File -# Begin Source File - -SOURCE=..\common\mathlib.h -# End Source File -# Begin Source File - -SOURCE=..\..\Q3Radiant\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\..\Q3Radiant\QERTYPES.H -# End Source File -# Begin Source File - -SOURCE=.\stdafx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# Begin Source File - -SOURCE=.\TexTool.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/plugins/vfspk3/vfspk3.dsp b/plugins/vfspk3/vfspk3.dsp deleted file mode 100644 index dd786afa..00000000 --- a/plugins/vfspk3/vfspk3.dsp +++ /dev/null @@ -1,146 +0,0 @@ -# Microsoft Developer Studio Project File - Name="vfspk3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=vfspk3 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "vfspk3.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "vfspk3.mak" CFG="vfspk3 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "vfspk3 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "vfspk3 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "vfspk3" -# PROP Scc_LocalPath "." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "vfspk3 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD F90 /compile_only /include:"Release/" /libs:dll /nologo /warn:nofileopt /dll -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VFSPK3_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VFSPK3_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /machine:I386 /def:".\vfspk3.def" /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\vfspk3.dll "../../install/modules" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "vfspk3 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD F90 /check:bounds /compile_only /debug:full /include:"Debug/" /libs:dll /nologo /warn:argument_checking /warn:nofileopt /dll -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VFSPK3_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\include" /I "..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\common" /I "..\..\libs" /I "..\..\..\STLPort\stlport" /I "..\..\..\libxml2\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VFSPK3_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# ADD LINK32 glib-2.0.lib /nologo /dll /debug /machine:I386 /def:".\vfspk3.def" /pdbtype:sept /libpath:"..\..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\vfspk3.dll "../../install/modules" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "vfspk3 - Win32 Release" -# Name "vfspk3 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp" -# Begin Source File - -SOURCE=.\archive.cpp -# End Source File -# Begin Source File - -SOURCE=.\vfs.cpp -# End Source File -# Begin Source File - -SOURCE=.\vfspk3.cpp -# End Source File -# Begin Source File - -SOURCE=.\vfspk3.def -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\vfs.h -# End Source File -# Begin Source File - -SOURCE=.\vfspk3.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/plugins/vfspk3/vfsq3.vcproj b/plugins/vfspk3/vfsq3.vcproj index 35a3b122..b85edae1 100644 --- a/plugins/vfspk3/vfsq3.vcproj +++ b/plugins/vfspk3/vfsq3.vcproj @@ -1,147 +1,205 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127" + /> + Name="VCManagedResourceCompilerTool" + /> + + - + FixedBaseAddress="0" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install\modules" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modules" " + /> @@ -150,73 +208,87 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install\modul + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\vfspk3.cpp" + > + RelativePath=".\vfspk3.h" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\archive.cpp" + > + RelativePath=".\archive.h" + > + RelativePath=".\vfs.cpp" + > + RelativePath=".\vfs.h" + > + RelativePath="..\..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath=".\vfsq3.def" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/radiant.dsw b/radiant.dsw deleted file mode 100644 index ee18fc29..00000000 --- a/radiant.dsw +++ /dev/null @@ -1,1080 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "GtkRadiant"=.\radiant\GtkRadiant.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .. - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name archivepak - End Project Dependency - Begin Project Dependency - Project_Dep_Name archivewad - End Project Dependency - Begin Project Dependency - Project_Dep_Name archivezip - End Project Dependency - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name ea3model - End Project Dependency - Begin Project Dependency - Project_Dep_Name entity - End Project Dependency - Begin Project Dependency - Project_Dep_Name gen - End Project Dependency - Begin Project Dependency - Project_Dep_Name hpentity - End Project Dependency - Begin Project Dependency - Project_Dep_Name image - End Project Dependency - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name maphp - End Project Dependency - Begin Project Dependency - Project_Dep_Name mapq3 - End Project Dependency - Begin Project Dependency - Project_Dep_Name mapxml - End Project Dependency - Begin Project Dependency - Project_Dep_Name mapxod - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name md3model - End Project Dependency - Begin Project Dependency - Project_Dep_Name q3data - End Project Dependency - Begin Project Dependency - Project_Dep_Name q3map2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name shaders - End Project Dependency - Begin Project Dependency - Project_Dep_Name vfspk3 - End Project Dependency - Begin Project Dependency - Project_Dep_Name imagehl - End Project Dependency - Begin Project Dependency - Project_Dep_Name vfspak - End Project Dependency - Begin Project Dependency - Project_Dep_Name q2map - End Project Dependency - Begin Project Dependency - Project_Dep_Name qdata3 - End Project Dependency - Begin Project Dependency - Project_Dep_Name qdata3_heretic2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name model - End Project Dependency -}}} - -############################################################################### - -Project: "PrtView"=.\contrib\prtview\PrtView.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\contrib\prtview - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "Splines"=.\libs\splines\Splines.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs\splines - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "TexTool"=.\plugins\textool\TexTool.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "archivepak"=.\plugins\archivepak\archivepak.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\archivepak - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency -}}} - -############################################################################### - -Project: "archivewad"=.\plugins\archivewad\archivewad.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\archivewad - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency -}}} - -############################################################################### - -Project: "archivezip"=.\plugins\archivezip\archivezip.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\archivezip - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency -}}} - -############################################################################### - -Project: "bobToolz_gtk"=.\contrib\bobtoolz\bobToolz_gtk.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - - -Project: "camera"=.\contrib\camera\camera.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\contrib\camera - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name Splines - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "cmdlib"=.\libs\cmdlib\cmdlib.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ddslib"=.\libs\ddslib\ddslib.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "ea3model"=.\plugins\ea3model\ea3model.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "entity"=.\plugins\entity\entity.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "fgd"=.\plugins\eclassfgd\fgd.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\eclassfgd - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "gen"=.\gen.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "gtkgensurf"=.\contrib\gtkgensurf\gtkgensurf.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\contrib\gtkgensurf - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "hpentity"=.\plugins\hpentity\hpentity.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "hydratoolz"=.\contrib\hydratoolz\hydratoolz.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\contrib\hydratoolz - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "image"=.\plugins\image\image.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name jpeg6 - End Project Dependency -}}} - -############################################################################### - -Project: "imagehl"=.\plugins\imagehl\imagehl.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "imagem8"=.\PLUGINS\IMAGEM8\imagem8.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\imagem8 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "imagepng"=.\PLUGINS\imagepng\imagepng.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\imagepng - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "imagewal"=.\plugins\imagewal\imagewal.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "jpeg6"=.\libs\jpeg6\jpeg6.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs\jpeg6 - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "l_net"=.\libs\l_net\l_net.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs\l_net - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libpng"=..\libpng\projects\msvc\libpng.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - ..\libpng\projects\msvc - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libxml2"=..\libxml2\win32\dsp\libxml2.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - ..\libxml2 - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "maphp"=.\plugins\maphp\maphp.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "mapq3"=.\plugins\mapq3\mapq3.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2_so - End Project Dependency - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency -}}} - -############################################################################### - -Project: "mapxml"=.\plugins\mapxml\mapxml.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cmdlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "mapxod"=.\plugins\mapxod\mapxod.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "mathlib"=.\LIBS\MATHLIB\mathlib.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "md3model"=.\plugins\md3model\md3model.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "md5lib"=.\libs\md5lib\md5lib.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "model"=.\plugins\model\model.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name picomodel - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "picomodel"=.\libs\picomodel\picomodel.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\libs - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "q2map"=.\tools\quake2\q2map\q2map.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\tools\quake3 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency -}}} - -############################################################################### - -Project: "q3data"=.\tools\quake3\q3data\q3data.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\tools\quake3 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name picomodel - End Project Dependency -}}} - -############################################################################### - -Project: "q3map2"=.\tools\quake3\q3map2\q3map2.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\tools\quake2 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name md5lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name ddslib - End Project Dependency - Begin Project Dependency - Project_Dep_Name jpeg6 - End Project Dependency - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name picomodel - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "qdata3"=.\tools\quake2\qdata\qdata3.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\tools\quake2 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "qdata3_heretic2"=.\tools\quake2\qdata_heretic2\qdata3_heretic2.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\tools\heretic2 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency -}}} - -############################################################################### - -Project: "shaders"=.\plugins\shaders\shaders.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "spritemodel"=.\plugins\spritemodel\spritemodel.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "surface"=.\plugins\surface\surface.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "surface_heretic2"=.\PLUGINS\SURFACE_HERETIC2\surface_heretic2.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\surface_heretic2 - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "surface_quake2"=.\plugins\surface_quake2\surface_quake2.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name synapse - End Project Dependency -}}} - -############################################################################### - -Project: "vfspk3"=.\plugins\vfspk3\vfspk3.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - .\plugins\vfspk3 - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "zlib"=..\libpng\projects\msvc\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - Perforce Project - ..\libpng\projects\msvc - end source code control -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/radiant/GtkRadiant.dsp b/radiant/GtkRadiant.dsp deleted file mode 100644 index 30c65591..00000000 --- a/radiant/GtkRadiant.dsp +++ /dev/null @@ -1,1082 +0,0 @@ -# Microsoft Developer Studio Project File - Name="GtkRadiant" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=GtkRadiant - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "GtkRadiant.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GtkRadiant.mak" CFG="GtkRadiant - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GtkRadiant - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "GtkRadiant - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "Perforce Project" -# PROP Scc_LocalPath "..\.." -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GtkRadiant - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /browser /include:"Release/" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /Zd /O2 /Op /Ob2 /I "..\..\STLport\stlport" /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 "..\..\gtk2-win32\include\gtkglext-1.0" /I "..\..\gtk2-win32\lib\gtkglext-1.0\include" /I "..\libs" /I "..\..\libxml2\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WIN32" /D "QUAKE3" /Fr /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 opengl32.lib kernel32.lib winspool.lib ole32.lib oleaut32.lib uuid.lib advapi32.lib comdlg32.lib user32.lib gdi32.lib shell32.lib 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 jpeg6.lib l_net.lib cmdlib.lib mathlib.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /map /debug /machine:I386 /libpath:"../libs/mathlib/release" /libpath:"../libs/pak/release" /libpath:"../libs/cmdlib/release" /libpath:"../libs/jpeg6/release" /libpath:"../libs/l_net/release" /libpath:"..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none /incremental:yes -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Release\GtkRadiant.exe "../install" -# End Special Build Tool - -!ELSEIF "$(CFG)" == "GtkRadiant - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /browser /include:"Debug/" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\STLport\stlport" /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 "..\..\gtk2-win32\include\gtkglext-1.0" /I "..\..\gtk2-win32\lib\gtkglext-1.0\include" /I "..\libs" /I "..\..\libxml2\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WIN32" /D "QUAKE3" /D "GNOME_DISABLE_DEPRECATED" /FR /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 opengl32.lib advapi32.lib comdlg32.lib user32.lib gdi32.lib shell32.lib Wsock32.lib glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib gdk_pixbuf-2.0.lib gtkglext-win32-1.0.lib gdkglext-win32-1.0.lib pango-1.0.lib jpeg6.lib l_net.lib cmdlib.lib mathlib.lib /nologo /entry:"mainCRTStartup" /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../libs/mathlib/debug" /libpath:"../libs/pak/debug" /libpath:"../libs/cmdlib/debug" /libpath:"../libs/jpeg6/debug" /libpath:"..\libs\l_net\debug" /libpath:"..\..\gtk2-win32\lib" -# SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Copy to dir... -PostBuild_Cmds=copy Debug\GtkRadiant.exe "../install" -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "GtkRadiant - Win32 Release" -# Name "GtkRadiant - Win32 Debug" -# Begin Group "Headers" - -# PROP Default_Filter "" -# Begin Group "Interface" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\cullable.h -# End Source File -# Begin Source File - -SOURCE=..\include\editable.h -# End Source File -# Begin Source File - -SOURCE=..\include\iarchive.h -# End Source File -# Begin Source File - -SOURCE=..\include\ibrush.h -# End Source File -# Begin Source File - -SOURCE=..\include\ibspfrontend.h -# End Source File -# Begin Source File - -SOURCE=..\include\icamera.h -# End Source File -# Begin Source File - -SOURCE=..\include\icharstream.h -# End Source File -# Begin Source File - -SOURCE=..\include\idatastream.h -# End Source File -# Begin Source File - -SOURCE=..\include\ieclass.h -# End Source File -# Begin Source File - -SOURCE=..\include\ientity.h -# End Source File -# Begin Source File - -SOURCE=..\include\ifilesystem.h -# End Source File -# Begin Source File - -SOURCE=..\include\ifiletypes.h -# End Source File -# Begin Source File - -SOURCE=..\include\ifilter.h -# End Source File -# Begin Source File - -SOURCE=..\include\igl.h -# End Source File -# Begin Source File - -SOURCE=..\include\iimage.h -# End Source File -# Begin Source File - -SOURCE=..\include\imap.h -# End Source File -# Begin Source File - -SOURCE=..\include\imodel.h -# End Source File -# Begin Source File - -SOURCE=..\include\ipatch.h -# End Source File -# Begin Source File - -SOURCE=..\include\iplugin.h -# End Source File -# Begin Source File - -SOURCE=..\include\irefcount.h -# End Source File -# Begin Source File - -SOURCE=..\include\ireference.h -# End Source File -# Begin Source File - -SOURCE=..\include\irender.h -# End Source File -# Begin Source File - -SOURCE=..\include\iscenegraph.h -# End Source File -# Begin Source File - -SOURCE=..\include\iscriplib.h -# End Source File -# Begin Source File - -SOURCE=..\include\iselection.h -# End Source File -# Begin Source File - -SOURCE=..\include\ishaders.h -# End Source File -# Begin Source File - -SOURCE=..\include\itexdef.h -# End Source File -# Begin Source File - -SOURCE=..\include\itextures.h -# End Source File -# Begin Source File - -SOURCE=..\include\itoolbar.h -# End Source File -# Begin Source File - -SOURCE=..\include\iUI.h -# End Source File -# Begin Source File - -SOURCE=..\include\iUI_gtk.h -# End Source File -# Begin Source File - -SOURCE=..\include\iundo.h -# End Source File -# Begin Source File - -SOURCE=..\include\modules.h -# End Source File -# Begin Source File - -SOURCE=..\include\nameable.h -# End Source File -# Begin Source File - -SOURCE=..\include\qerplugin.h -# End Source File -# Begin Source File - -SOURCE=..\include\qertypes.h -# End Source File -# Begin Source File - -SOURCE=..\include\qsysprintf.h -# End Source File -# Begin Source File - -SOURCE=..\include\renderable.h -# End Source File -# Begin Source File - -SOURCE=..\include\selectable.h -# End Source File -# Begin Source File - -SOURCE=..\include\window.h -# End Source File -# End Group -# Begin Group "libs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\libs\aabb.h -# End Source File -# Begin Source File - -SOURCE=..\libs\aabblib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\cache.h -# End Source File -# Begin Source File - -SOURCE=..\libs\chardatastream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\charstream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\cmdlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\const_reference.h -# End Source File -# Begin Source File - -SOURCE=..\libs\eclasslib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\entitylib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\entityxml.h -# End Source File -# Begin Source File - -SOURCE=..\libs\expression.h -# End Source File -# Begin Source File - -SOURCE=..\libs\filestream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\fs_filesystem.h -# End Source File -# Begin Source File - -SOURCE=..\libs\fs_path.h -# End Source File -# Begin Source File - -SOURCE=..\libs\function.h -# End Source File -# Begin Source File - -SOURCE=..\libs\hashfunc.h -# End Source File -# Begin Source File - -SOURCE=..\libs\hashtable.h -# End Source File -# Begin Source File - -SOURCE=..\libs\instancelib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\jpeg6\Jconfig.h -# End Source File -# Begin Source File - -SOURCE=..\libs\jpeg6\Jmorecfg.h -# End Source File -# Begin Source File - -SOURCE=..\libs\jpeglib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\l_net\l_net.h -# End Source File -# Begin Source File - -SOURCE=..\libs\maplib.h -# End Source File -# Begin Source File - -SOURCE=..\LIBS\mathlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\matrixlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\memstream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\missing.h -# End Source File -# Begin Source File - -SOURCE=..\libs\modulesmap.h -# End Source File -# Begin Source File - -SOURCE=..\libs\picomodel.h -# End Source File -# Begin Source File - -SOURCE=..\libs\radiant_assert.h -# End Source File -# Begin Source File - -SOURCE=..\libs\refcounted_ptr.h -# End Source File -# Begin Source File - -SOURCE=..\libs\render.h -# End Source File -# Begin Source File - -SOURCE=..\libs\scenelib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\selectionlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\shaderlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\singletonmodule.h -# End Source File -# Begin Source File - -SOURCE=..\libs\str.h -# End Source File -# Begin Source File - -SOURCE=..\libs\stringio.h -# End Source File -# Begin Source File - -SOURCE=..\libs\stringlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\stringstream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\textfilestream.h -# End Source File -# Begin Source File - -SOURCE=..\libs\texturelib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\transformlib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\traverselib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\undolib.h -# End Source File -# Begin Source File - -SOURCE=..\libs\xml.h -# End Source File -# Begin Source File - -SOURCE=..\libs\xmlio.h -# End Source File -# Begin Source File - -SOURCE=..\libs\xmlparser.h -# End Source File -# Begin Source File - -SOURCE=..\libs\xmlwriter.h -# End Source File -# End Group -# Begin Group "stl" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\gtkr_list.h -# End Source File -# Begin Source File - -SOURCE=..\include\gtkr_vector.h -# End Source File -# Begin Source File - -SOURCE=..\include\stl_check.h -# End Source File -# Begin Source File - -SOURCE=..\include\stl_warnings.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\bp_dlg.h -# End Source File -# Begin Source File - -SOURCE=.\brush.h -# End Source File -# Begin Source File - -SOURCE=.\brush_primit.h -# End Source File -# Begin Source File - -SOURCE=.\brushwrapper.h -# End Source File -# Begin Source File - -SOURCE=.\camwindow.h -# End Source File -# Begin Source File - -SOURCE=.\csg.h -# End Source File -# Begin Source File - -SOURCE=.\dialog.h -# End Source File -# Begin Source File - -SOURCE=.\eclass.h -# End Source File -# Begin Source File - -SOURCE=.\eclass_def.h -# End Source File -# Begin Source File - -SOURCE=.\entityinspector.h -# End Source File -# Begin Source File - -SOURCE=.\error.h -# End Source File -# Begin Source File - -SOURCE=.\feedback.h -# End Source File -# Begin Source File - -SOURCE=.\file.h -# End Source File -# Begin Source File - -SOURCE=.\filetypes.h -# End Source File -# Begin Source File - -SOURCE=.\filters.h -# End Source File -# Begin Source File - -SOURCE=.\findtexturedialog.h -# End Source File -# Begin Source File - -SOURCE=.\glinterface.h -# End Source File -# Begin Source File - -SOURCE=.\glwidget.h -# End Source File -# Begin Source File - -SOURCE=.\glwindow.h -# End Source File -# Begin Source File - -SOURCE=.\groupdialog.h -# End Source File -# Begin Source File - -SOURCE=.\gtkdlgs.h -# End Source File -# Begin Source File - -SOURCE=.\gtkmisc.h -# End Source File -# Begin Source File - -SOURCE=.\image.h -# End Source File -# Begin Source File - -SOURCE=.\main.h -# End Source File -# Begin Source File - -SOURCE=.\mainframe.h -# End Source File -# Begin Source File - -SOURCE=.\map.h -# End Source File -# Begin Source File - -SOURCE=.\multimon.h -# End Source File -# Begin Source File - -SOURCE=.\nullmodel.h -# End Source File -# Begin Source File - -SOURCE=.\parse.h -# End Source File -# Begin Source File - -SOURCE=.\patch.h -# End Source File -# Begin Source File - -SOURCE=.\patchdialog.h -# End Source File -# Begin Source File - -SOURCE=.\patchmanip.h -# End Source File -# Begin Source File - -SOURCE=.\plugin.h -# End Source File -# Begin Source File - -SOURCE=.\pluginapi.h -# End Source File -# Begin Source File - -SOURCE=.\pluginmanager.h -# End Source File -# Begin Source File - -SOURCE=.\points.h -# End Source File -# Begin Source File - -SOURCE=.\preferencedictionary.h -# End Source File -# Begin Source File - -SOURCE=.\preferences.h -# End Source File -# Begin Source File - -SOURCE=.\preferencesystem.h -# End Source File -# Begin Source File - -SOURCE=.\profile.h -# End Source File -# Begin Source File - -SOURCE=.\qe3.h -# End Source File -# Begin Source File - -SOURCE=.\qfiles.h -# End Source File -# Begin Source File - -SOURCE=.\qgl.h -# End Source File -# Begin Source File - -SOURCE=.\referencecache.h -# End Source File -# Begin Source File - -SOURCE=.\renderer.h -# End Source File -# Begin Source File - -SOURCE=.\renderstate.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\scenegraph.h -# End Source File -# Begin Source File - -SOURCE=.\select.h -# End Source File -# Begin Source File - -SOURCE=.\selection.h -# End Source File -# Begin Source File - -SOURCE=.\selectionmanager.h -# End Source File -# Begin Source File - -SOURCE=.\server.h -# End Source File -# Begin Source File - -SOURCE=.\shaderinfo.h -# End Source File -# Begin Source File - -SOURCE=.\surfacedialog.h -# End Source File -# Begin Source File - -SOURCE=.\targetname.h -# End Source File -# Begin Source File - -SOURCE=.\texmanip.h -# End Source File -# Begin Source File - -SOURCE=.\textures.h -# End Source File -# Begin Source File - -SOURCE=.\texwindow.h -# End Source File -# Begin Source File - -SOURCE=.\timer.h -# End Source File -# Begin Source File - -SOURCE=.\treemodel.h -# End Source File -# Begin Source File - -SOURCE=.\ui.h -# End Source File -# Begin Source File - -SOURCE=.\undo.h -# End Source File -# Begin Source File - -SOURCE=..\include\version.h -# End Source File -# Begin Source File - -SOURCE=.\view.h -# End Source File -# Begin Source File - -SOURCE=.\watchbsp.h -# End Source File -# Begin Source File - -SOURCE=.\winding.h -# End Source File -# Begin Source File - -SOURCE=.\xmlstuff.h -# End Source File -# Begin Source File - -SOURCE=.\xorrectangle.h -# End Source File -# Begin Source File - -SOURCE=.\xywindow.h -# End Source File -# Begin Source File - -SOURCE=.\z.h -# End Source File -# Begin Source File - -SOURCE=.\zwindow.h -# End Source File -# End Group -# Begin Group "Code" - -# PROP Default_Filter "" -# Begin Group "BSP monitoring" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\feedback.cpp -# End Source File -# Begin Source File - -SOURCE=.\watchbsp.cpp -# End Source File -# End Group -# Begin Source File - -SOURCE=.\bp_dlg.cpp -# End Source File -# Begin Source File - -SOURCE=.\brush.cpp -# End Source File -# Begin Source File - -SOURCE=.\brush_primit.cpp -# End Source File -# Begin Source File - -SOURCE=.\brushwrapper.cpp -# End Source File -# Begin Source File - -SOURCE=.\camwindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\csg.cpp -# End Source File -# Begin Source File - -SOURCE=.\dialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\eclass.cpp -# End Source File -# Begin Source File - -SOURCE=.\eclass_def.cpp -# End Source File -# Begin Source File - -SOURCE=.\entityinspector.cpp -# End Source File -# Begin Source File - -SOURCE=.\error.cpp -# End Source File -# Begin Source File - -SOURCE=.\expression.cpp -# End Source File -# Begin Source File - -SOURCE=.\file.cpp -# End Source File -# Begin Source File - -SOURCE=.\filetypes.cpp -# End Source File -# Begin Source File - -SOURCE=.\filters.cpp -# End Source File -# Begin Source File - -SOURCE=.\findtexturedialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\function.cpp -# End Source File -# Begin Source File - -SOURCE=.\glinterface.cpp -# End Source File -# Begin Source File - -SOURCE=.\glwidget.cpp -# End Source File -# Begin Source File - -SOURCE=.\glwindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\groupdialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\gtkdlgs.cpp -# End Source File -# Begin Source File - -SOURCE=.\gtkmisc.cpp -# End Source File -# Begin Source File - -SOURCE=.\image.cpp -# End Source File -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# Begin Source File - -SOURCE=.\mainframe.cpp -# End Source File -# Begin Source File - -SOURCE=.\map.cpp -# End Source File -# Begin Source File - -SOURCE=.\multimon.cpp -# End Source File -# Begin Source File - -SOURCE=.\nullmodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\parse.cpp -# End Source File -# Begin Source File - -SOURCE=.\patch.cpp -# End Source File -# Begin Source File - -SOURCE=.\patchdialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\patchmanip.cpp -# End Source File -# Begin Source File - -SOURCE=.\plugin.cpp -# End Source File -# Begin Source File - -SOURCE=.\pluginapi.cpp -# End Source File -# Begin Source File - -SOURCE=.\pluginentities.cpp -# End Source File -# Begin Source File - -SOURCE=.\pluginmanager.cpp -# End Source File -# Begin Source File - -SOURCE=.\POINTS.cpp -# End Source File -# Begin Source File - -SOURCE=.\preferences.cpp -# End Source File -# Begin Source File - -SOURCE=.\PROFILE.cpp -# End Source File -# Begin Source File - -SOURCE=.\qe3.cpp -# End Source File -# Begin Source File - -SOURCE=.\qgl.cpp -# End Source File -# Begin Source File - -SOURCE=.\qgl_ext.cpp -# End Source File -# Begin Source File - -SOURCE=.\referencecache.cpp -# End Source File -# Begin Source File - -SOURCE=.\renderstate.cpp -# End Source File -# Begin Source File - -SOURCE=.\scenegraph.cpp -# End Source File -# Begin Source File - -SOURCE=.\select.cpp -# End Source File -# Begin Source File - -SOURCE=.\selection.cpp -# End Source File -# Begin Source File - -SOURCE=.\server.cpp - -!IF "$(CFG)" == "GtkRadiant - Win32 Release" - -# ADD CPP /Ob2 - -!ELSEIF "$(CFG)" == "GtkRadiant - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\surfacedialog.cpp -# End Source File -# Begin Source File - -SOURCE=.\targetname.cpp -# End Source File -# Begin Source File - -SOURCE=.\texmanip.cpp -# End Source File -# Begin Source File - -SOURCE=.\textures.cpp -# End Source File -# Begin Source File - -SOURCE=.\texwindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\timer.cpp -# End Source File -# Begin Source File - -SOURCE=.\treemodel.cpp -# End Source File -# Begin Source File - -SOURCE=.\ui.cpp -# End Source File -# Begin Source File - -SOURCE=.\undo.cpp -# End Source File -# Begin Source File - -SOURCE=.\view.cpp -# End Source File -# Begin Source File - -SOURCE=.\winding.cpp -# End Source File -# Begin Source File - -SOURCE=.\write.cpp -# End Source File -# Begin Source File - -SOURCE=.\xywindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\z.cpp -# End Source File -# Begin Source File - -SOURCE=.\zwindow.cpp -# End Source File -# End Group -# Begin Source File - -SOURCE=..\setup\changelog.txt -# End Source File -# Begin Source File - -SOURCE=..\docs\developer\CHANGES -# End Source File -# Begin Source File - -SOURCE=.\radiant.ico -# End Source File -# Begin Source File - -SOURCE=.\radiant.rc -# End Source File -# Begin Source File - -SOURCE=..\SConscript -# End Source File -# End Target -# End Project diff --git a/radiant/GtkRadiant.vcproj b/radiant/GtkRadiant.vcproj index b8a849e0..985e6bf3 100644 --- a/radiant/GtkRadiant.vcproj +++ b/radiant/GtkRadiant.vcproj @@ -1,123 +1,179 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="0" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + Name="VCManagedResourceCompilerTool" + /> + + + FixedBaseAddress="1" + /> - + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> - + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install" " + /> + WholeProgramOptimization="1" + > + + + + + + DisableSpecificWarnings="4610;4510;4512;4505;4100;4127;4996" + /> + + Name="VCResourceCompilerTool" + Culture="1033" + /> + + FixedBaseAddress="0" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install" copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install" " + /> @@ -158,564 +216,743 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)install" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\autosave.cpp" + > + RelativePath=".\autosave.h" + > + RelativePath="..\radiant\brush.cpp" + > + RelativePath="..\radiant\brush.h" + > + RelativePath="..\radiant\brush_primit.cpp" + > + RelativePath="..\radiant\brush_primit.h" + > + RelativePath=".\brushmanip.cpp" + > + RelativePath=".\brushmanip.h" + > + RelativePath=".\brushmodule.cpp" + > + RelativePath=".\brushmodule.h" + > + RelativePath=".\brushnode.cpp" + > + RelativePath=".\brushnode.h" + > + RelativePath=".\brushtokens.cpp" + > + RelativePath=".\brushtokens.h" + > + RelativePath=".\brushxml.cpp" + > + RelativePath=".\brushxml.h" + > + RelativePath=".\build.cpp" + > + RelativePath=".\build.h" + > + RelativePath="..\radiant\camwindow.cpp" + > + RelativePath="..\radiant\camwindow.h" + > + RelativePath=".\clippertool.cpp" + > + RelativePath=".\clippertool.h" + > + RelativePath=".\commands.cpp" + > + RelativePath=".\commands.h" + > + RelativePath=".\console.cpp" + > + RelativePath=".\console.h" + > + RelativePath="..\radiant\csg.cpp" + > + RelativePath="..\radiant\csg.h" + > + RelativePath="..\radiant\dialog.cpp" + > + RelativePath="..\radiant\dialog.h" + > + RelativePath="..\radiant\eclass.cpp" + > + RelativePath="..\radiant\eclass.h" + > + RelativePath="..\radiant\eclass_def.cpp" + > + RelativePath="..\radiant\eclass_def.h" + > + RelativePath=".\eclass_doom3.cpp" + > + RelativePath=".\eclass_doom3.h" + > + RelativePath=".\eclass_fgd.cpp" + > + RelativePath=".\eclass_fgd.h" + > + RelativePath=".\eclass_xml.cpp" + > + RelativePath=".\eclass_xml.h" + > + RelativePath=".\entity.cpp" + > + RelativePath=".\entity.h" + > + RelativePath="..\radiant\entityinspector.cpp" + > + RelativePath="..\radiant\entityinspector.h" + > + RelativePath=".\entitylist.cpp" + > + RelativePath=".\entitylist.h" + > + RelativePath=".\environment.cpp" + > + RelativePath=".\environment.h" + > + RelativePath="..\radiant\error.cpp" + > + RelativePath="..\radiant\error.h" + > + RelativePath="..\radiant\feedback.cpp" + > + RelativePath="..\radiant\feedback.h" + > + RelativePath="..\radiant\filetypes.cpp" + > + RelativePath="..\radiant\filetypes.h" + > + RelativePath="..\radiant\filters.cpp" + > + RelativePath="..\radiant\filters.h" + > + RelativePath="..\radiant\findtexturedialog.cpp" + > + RelativePath="..\radiant\findtexturedialog.h" + > + RelativePath="..\radiant\glwidget.cpp" + > + RelativePath="..\radiant\glwidget.h" + > + RelativePath=".\grid.cpp" + > + RelativePath=".\grid.h" + > + RelativePath="..\radiant\groupdialog.cpp" + > + RelativePath="..\radiant\groupdialog.h" + > + RelativePath="..\radiant\gtkdlgs.cpp" + > + RelativePath="..\radiant\gtkdlgs.h" + > + RelativePath="..\radiant\gtkmisc.cpp" + > + RelativePath="..\radiant\gtkmisc.h" + > + RelativePath=".\help.cpp" + > + RelativePath=".\help.h" + > + RelativePath="..\radiant\image.cpp" + > + RelativePath="..\radiant\image.h" + > + RelativePath="..\radiant\main.cpp" + > + RelativePath="..\radiant\main.h" + > + RelativePath="..\radiant\mainframe.cpp" + > + RelativePath="..\radiant\mainframe.h" + > + RelativePath="..\radiant\map.cpp" + > + RelativePath="..\radiant\map.h" + > + RelativePath=".\mru.cpp" + > + RelativePath=".\mru.h" + > + RelativePath="..\radiant\multimon.cpp" + > + RelativePath="..\radiant\multimon.h" + > + RelativePath="..\radiant\nullmodel.cpp" + > + RelativePath="..\radiant\nullmodel.h" + > + RelativePath="..\radiant\parse.cpp" + > + RelativePath="..\radiant\parse.h" + > + RelativePath="..\radiant\patch.cpp" + > + RelativePath="..\radiant\patch.h" + > + RelativePath="..\radiant\patchdialog.cpp" + > + RelativePath="..\radiant\patchdialog.h" + > + RelativePath="..\radiant\patchmanip.cpp" + > + RelativePath="..\radiant\patchmanip.h" + > + RelativePath=".\patchmodule.cpp" + > + RelativePath=".\patchmodule.h" + > + RelativePath="..\radiant\plugin.cpp" + > + RelativePath="..\radiant\plugin.h" + > + RelativePath="..\radiant\pluginapi.cpp" + > + RelativePath="..\radiant\pluginapi.h" + > + RelativePath="..\radiant\pluginmanager.cpp" + > + RelativePath="..\radiant\pluginmanager.h" + > + RelativePath=".\pluginmenu.cpp" + > + RelativePath=".\pluginmenu.h" + > + RelativePath=".\plugintoolbar.cpp" + > + RelativePath=".\plugintoolbar.h" + > + RelativePath="..\radiant\points.cpp" + > + RelativePath="..\radiant\points.h" + > + RelativePath=".\preferencedictionary.cpp" + > + RelativePath="..\radiant\preferencedictionary.h" + > + RelativePath="..\radiant\preferences.cpp" + > + RelativePath="..\radiant\preferences.h" + > + RelativePath="..\radiant\qe3.cpp" + > + RelativePath="..\radiant\qe3.h" + > + RelativePath="..\radiant\qgl.cpp" + > + RelativePath="..\radiant\qgl.h" + > + RelativePath="..\radiant\referencecache.cpp" + > + RelativePath="..\radiant\referencecache.h" + > + RelativePath=".\renderer.cpp" + > + RelativePath="..\radiant\renderer.h" + > + RelativePath="..\radiant\renderstate.cpp" + > + RelativePath="..\radiant\renderstate.h" + > + RelativePath="..\radiant\scenegraph.cpp" + > + RelativePath="..\radiant\scenegraph.h" + > + RelativePath="..\radiant\select.cpp" + > + RelativePath="..\radiant\select.h" + > + RelativePath="..\radiant\selection.cpp" + > + RelativePath="..\radiant\selection.h" + > + RelativePath="..\radiant\server.cpp" + > + RelativePath="..\radiant\server.h" + > + RelativePath=".\shaders.cpp" + > + RelativePath=".\shaders.h" + > + RelativePath=".\sockets.cpp" + > + RelativePath=".\sockets.h" + > + RelativePath=".\stacktrace.cpp" + > + RelativePath=".\stacktrace.h" + > + RelativePath="..\radiant\surfacedialog.cpp" + > + RelativePath="..\radiant\surfacedialog.h" + > + RelativePath="..\radiant\texmanip.cpp" + > + RelativePath="..\radiant\texmanip.h" + > + RelativePath=".\textureentry.cpp" + > + RelativePath=".\textureentry.h" + > + RelativePath="..\radiant\textures.cpp" + > + RelativePath="..\radiant\textures.h" + > + RelativePath="..\radiant\texwindow.cpp" + > + RelativePath="..\radiant\texwindow.h" + > + RelativePath="..\radiant\timer.cpp" + > + RelativePath="..\radiant\timer.h" + > + RelativePath="..\radiant\treemodel.cpp" + > + RelativePath="..\radiant\treemodel.h" + > + RelativePath="..\radiant\undo.cpp" + > + RelativePath="..\radiant\undo.h" + > + RelativePath=".\url.cpp" + > + RelativePath=".\url.h" + > + RelativePath="..\radiant\view.cpp" + > + RelativePath="..\radiant\view.h" + > + RelativePath="..\radiant\watchbsp.cpp" + > + RelativePath="..\radiant\watchbsp.h" + > + RelativePath="..\radiant\winding.cpp" + > + RelativePath="..\radiant\winding.h" + > + RelativePath=".\windowobservers.cpp" + > + RelativePath=".\windowobservers.h" + > + RelativePath=".\xmlstuff.cpp" + > + RelativePath="..\radiant\xmlstuff.h" + > + RelativePath="..\radiant\xywindow.cpp" + > + RelativePath="..\radiant\xywindow.h" + > + RelativePath="..\Changes" + > + RelativePath="..\debug.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetDir)$(TargetName).pdb"" + /> + RelativePath="..\install.py" + > + RelativePath=".\radiant.ico" + > + RelativePath=".\radiant.rc" + > + RelativePath="..\radiant\resource.h" + > + RelativePath="..\SConscript" + > + RelativePath="..\SConstruct" + > + RelativePath="..\Todo" + > + RelativePath="..\touch.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 61d4a6ee..38693611 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -72,7 +72,6 @@ void Global_constructPreferences(PreferencesPage& page) void Interface_constructPreferences(PreferencesPage& page) { #ifdef WIN32 - page.appendCheckBox("", "Native File-Chooser", g_FileChooser_nativeGUI); page.appendCheckBox("", "Default Text Editor", g_TextEditor_useWin32Editor); #else { @@ -1039,12 +1038,6 @@ typedef FreeCaller1 GameMode void RegisterPreferences(PreferenceSystem& preferences) { - -#ifdef WIN32 - preferences.registerPreference("NativeGUI", BoolImportStringCaller(g_FileChooser_nativeGUI), BoolExportStringCaller(g_FileChooser_nativeGUI)); -#endif - - #ifdef WIN32 preferences.registerPreference("UseCustomShaderEditor", BoolImportStringCaller(g_TextEditor_useWin32Editor), BoolExportStringCaller(g_TextEditor_useWin32Editor)); #else diff --git a/tools/quake2/q2map/q2map.dsp b/tools/quake2/q2map/q2map.dsp deleted file mode 100644 index 50310fc0..00000000 --- a/tools/quake2/q2map/q2map.dsp +++ /dev/null @@ -1,290 +0,0 @@ -# Microsoft Developer Studio Project File - Name="q2map" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=q2map - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "q2map.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "q2map.mak" CFG="q2map - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "q2map - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "q2map - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "q2map - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX- /Zi /O2 /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /stack:0x400000 /subsystem:console /map /machine:I386 /libpath:"..\..\..\libs\mathlib\Release" /libpath:"..\..\..\libs\l_net\Release" /libpath:"..\..\..\..\libxml2\win32\libxml2\release_so" - -!ELSEIF "$(CFG)" == "q2map - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /I "..\..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\..\gtk2-win32\lib\glib-2.0\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /stack:0x400000 /subsystem:console /profile /map /debug /machine:I386 /nodefaultlib:"libcd" /libpath:"..\..\..\libs\mathlib\Debug" /libpath:"..\..\..\libs\l_net\Debug" /libpath:"..\..\..\..\libxml2\win32\libxml2\debug_so" - -!ENDIF - -# Begin Target - -# Name "q2map - Win32 Release" -# Name "q2map - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\brushbsp.c -# End Source File -# Begin Source File - -SOURCE=..\common\bspfile.c -# End Source File -# Begin Source File - -SOURCE=..\common\cmdlib.c -# End Source File -# Begin Source File - -SOURCE=.\csg.c -# End Source File -# Begin Source File - -SOURCE=.\faces.c -# End Source File -# Begin Source File - -SOURCE=.\flow.c -# End Source File -# Begin Source File - -SOURCE=.\glfile.c -# End Source File -# Begin Source File - -SOURCE=..\common\inout.c -# End Source File -# Begin Source File - -SOURCE=..\common\l3dslib.c -# End Source File -# Begin Source File - -SOURCE=..\common\lbmlib.c -# End Source File -# Begin Source File - -SOURCE=.\leakfile.c -# End Source File -# Begin Source File - -SOURCE=.\lightmap.c -# End Source File -# Begin Source File - -SOURCE=.\main.c -# End Source File -# Begin Source File - -SOURCE=.\map.c -# End Source File -# Begin Source File - -SOURCE=..\common\mathlib.c -# End Source File -# Begin Source File - -SOURCE=..\common\md4.c -# End Source File -# Begin Source File - -SOURCE=.\nodraw.c -# End Source File -# Begin Source File - -SOURCE=.\patches.c -# End Source File -# Begin Source File - -SOURCE=..\common\path_init.c -# End Source File -# Begin Source File - -SOURCE=..\common\polylib.c -# End Source File -# Begin Source File - -SOURCE=.\portals.c -# End Source File -# Begin Source File - -SOURCE=.\prtfile.c -# End Source File -# Begin Source File - -SOURCE=.\qbsp.c -# End Source File -# Begin Source File - -SOURCE=.\qrad.c -# End Source File -# Begin Source File - -SOURCE=.\qvis.c -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.c -# End Source File -# Begin Source File - -SOURCE=.\textures.c -# End Source File -# Begin Source File - -SOURCE=..\common\threads.c -# End Source File -# Begin Source File - -SOURCE=.\trace.c -# End Source File -# Begin Source File - -SOURCE=.\tree.c -# End Source File -# Begin Source File - -SOURCE=..\common\trilib.c -# End Source File -# Begin Source File - -SOURCE=.\writebsp.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\common\bspfile.h -# End Source File -# Begin Source File - -SOURCE=..\common\cmdlib.h -# End Source File -# Begin Source File - -SOURCE=..\common\inout.h -# End Source File -# Begin Source File - -SOURCE=..\common\l3dslib.h -# End Source File -# Begin Source File - -SOURCE=..\common\lbmlib.h -# End Source File -# Begin Source File - -SOURCE=..\common\mathlib.h -# End Source File -# Begin Source File - -SOURCE=..\common\polylib.h -# End Source File -# Begin Source File - -SOURCE=..\common\q2_threads.h -# End Source File -# Begin Source File - -SOURCE=.\q2map.h -# End Source File -# Begin Source File - -SOURCE=.\qbsp.h -# End Source File -# Begin Source File - -SOURCE=..\common\qfiles.h -# End Source File -# Begin Source File - -SOURCE=.\qrad.h -# End Source File -# Begin Source File - -SOURCE=.\qvis.h -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.h -# End Source File -# Begin Source File - -SOURCE=..\common\trilib.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/tools/quake2/q2map/q2map.vcproj b/tools/quake2/q2map/q2map.vcproj index 50e48ef0..d698675d 100644 --- a/tools/quake2/q2map/q2map.vcproj +++ b/tools/quake2/q2map/q2map.vcproj @@ -1,158 +1,219 @@ + RootNamespace="q2map" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> + StackReserveSize="4194304" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy to dir..." + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install"" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> + StackReserveSize="4194304" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy to dir..." + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install"" + /> @@ -160,168 +221,218 @@ + > + RelativePath=".\brushbsp.c" + > + RelativePath="..\common\bspfile.c" + > + RelativePath="..\common\bspfile.h" + > + RelativePath="..\common\cmdlib.c" + > + RelativePath="..\common\cmdlib.h" + > + RelativePath=".\csg.c" + > + RelativePath=".\faces.c" + > + RelativePath=".\flow.c" + > + RelativePath=".\glfile.c" + > + RelativePath="..\common\inout.c" + > + RelativePath="..\common\inout.h" + > + RelativePath="..\common\l3dslib.c" + > + RelativePath="..\common\l3dslib.h" + > + RelativePath="..\common\lbmlib.c" + > + RelativePath="..\common\lbmlib.h" + > + RelativePath=".\leakfile.c" + > + RelativePath=".\lightmap.c" + > + RelativePath=".\main.c" + > + RelativePath=".\map.c" + > + RelativePath="..\common\mathlib.c" + > + RelativePath="..\common\mathlib.h" + > + RelativePath="..\common\md4.c" + > + RelativePath=".\nodraw.c" + > + RelativePath=".\patches.c" + > + RelativePath="..\common\path_init.c" + > + RelativePath="..\common\polylib.c" + > + RelativePath="..\common\polylib.h" + > + RelativePath=".\portals.c" + > + RelativePath=".\prtfile.c" + > + RelativePath="..\common\q2_threads.h" + > + RelativePath=".\q2map.h" + > + RelativePath=".\qbsp.c" + > + RelativePath=".\qbsp.h" + > + RelativePath="..\common\qfiles.h" + > + RelativePath=".\qrad.c" + > + RelativePath=".\qrad.h" + > + RelativePath=".\qvis.c" + > + RelativePath=".\qvis.h" + > + RelativePath="..\common\scriplib.c" + > + RelativePath="..\common\scriplib.h" + > + RelativePath=".\textures.c" + > + RelativePath="..\common\threads.c" + > + RelativePath=".\trace.c" + > + RelativePath=".\tree.c" + > + RelativePath="..\common\trilib.c" + > + RelativePath="..\common\trilib.h" + > + RelativePath=".\writebsp.c" + > + RelativePath="..\..\..\touch.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> diff --git a/tools/quake2/qdata/qdata3.dsp b/tools/quake2/qdata/qdata3.dsp deleted file mode 100644 index dcebd4ca..00000000 --- a/tools/quake2/qdata/qdata3.dsp +++ /dev/null @@ -1,218 +0,0 @@ -# Microsoft Developer Studio Project File - Name="qdata3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=qdata3 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "qdata3.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "qdata3.mak" CFG="qdata3 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "qdata3 - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "qdata3 - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "qdata3 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX- /Zi /O2 /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /subsystem:console /map /machine:I386 /libpath:"..\..\..\libs\mathlib\Release" /libpath:"..\..\..\libs\l_net\Release" /libpath:"..\..\..\..\libxml2\win32\libxml2\release_so" - -!ELSEIF "$(CFG)" == "qdata3 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /subsystem:console /profile /map /debug /machine:I386 /libpath:"..\..\..\libs\mathlib\Debug" /libpath:"..\..\..\libs\l_net\Debug" /libpath:"..\..\..\..\libxml2\win32\libxml2\debug_so" - -!ENDIF - -# Begin Target - -# Name "qdata3 - Win32 Release" -# Name "qdata3 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\common\bspfile.c -# End Source File -# Begin Source File - -SOURCE=..\common\cmdlib.c -# End Source File -# Begin Source File - -SOURCE=.\images.c -# End Source File -# Begin Source File - -SOURCE=..\common\inout.c -# End Source File -# Begin Source File - -SOURCE=..\common\l3dslib.c -# End Source File -# Begin Source File - -SOURCE=..\common\lbmlib.c -# End Source File -# Begin Source File - -SOURCE=..\common\mathlib.c -# End Source File -# Begin Source File - -SOURCE=..\common\md4.c -# End Source File -# Begin Source File - -SOURCE=.\models.c -# End Source File -# Begin Source File - -SOURCE=..\common\path_init.c -# End Source File -# Begin Source File - -SOURCE=.\qdata.c -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.c -# End Source File -# Begin Source File - -SOURCE=.\sprites.c -# End Source File -# Begin Source File - -SOURCE=.\tables.c -# End Source File -# Begin Source File - -SOURCE=..\common\threads.c -# End Source File -# Begin Source File - -SOURCE=..\common\trilib.c -# End Source File -# Begin Source File - -SOURCE=.\video.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\anorms.h -# End Source File -# Begin Source File - -SOURCE=..\common\bspfile.h -# End Source File -# Begin Source File - -SOURCE=..\common\cmdlib.h -# End Source File -# Begin Source File - -SOURCE=..\common\inout.h -# End Source File -# Begin Source File - -SOURCE=..\common\l3dslib.h -# End Source File -# Begin Source File - -SOURCE=..\common\lbmlib.h -# End Source File -# Begin Source File - -SOURCE=..\common\mathlib.h -# End Source File -# Begin Source File - -SOURCE=.\qdata.h -# End Source File -# Begin Source File - -SOURCE=..\common\qfiles.h -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.h -# End Source File -# Begin Source File - -SOURCE=..\common\threads.h -# End Source File -# Begin Source File - -SOURCE=..\common\trilib.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/tools/quake2/qdata_heretic2/qdata3_heretic2.dsp b/tools/quake2/qdata_heretic2/qdata3_heretic2.dsp deleted file mode 100644 index 67d818d3..00000000 --- a/tools/quake2/qdata_heretic2/qdata3_heretic2.dsp +++ /dev/null @@ -1,314 +0,0 @@ -# Microsoft Developer Studio Project File - Name="qdata3_heretic2" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=qdata3_heretic2 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "qdata3_heretic2.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "qdata3_heretic2.mak" CFG="qdata3_heretic2 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "qdata3_heretic2 - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "qdata3_heretic2 - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "qdata3_heretic2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX- /Zi /O2 /I "./common" /I "./qcommon" /I "." /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /subsystem:console /map /machine:I386 /out:"Release/qdata3.exe" /libpath:"..\..\..\libs\l_net\release" /libpath:"..\..\..\..\libxml2\win32\libxml2\release_so" /libpath:"..\..\..\libs\mathlib\release" - -!ELSEIF "$(CFG)" == "qdata3_heretic2 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX- /ZI /Od /I "./common" /I "./qcommon" /I "." /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib l_net.lib mathlib.lib /nologo /subsystem:console /profile /map /debug /machine:I386 /out:"Debug/qdata3.exe" /libpath:"..\..\..\libs\l_net\debug" /libpath:"..\..\..\..\libxml2\win32\libxml2\debug_so" /libpath:"..\..\..\libs\mathlib\debug" - -!ENDIF - -# Begin Target - -# Name "qdata3_heretic2 - Win32 Release" -# Name "qdata3_heretic2 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\animcomp.c -# End Source File -# Begin Source File - -SOURCE=.\book.c -# End Source File -# Begin Source File - -SOURCE=.\common\bspfile.c -# End Source File -# Begin Source File - -SOURCE=.\common\cmdlib.c -# End Source File -# Begin Source File - -SOURCE=.\fmodels.c -# End Source File -# Begin Source File - -SOURCE=.\images.c -# End Source File -# Begin Source File - -SOURCE=.\common\inout.c -# End Source File -# Begin Source File - -SOURCE=.\jointed.c -# End Source File -# Begin Source File - -SOURCE=.\common\l3dslib.c -# End Source File -# Begin Source File - -SOURCE=.\common\lbmlib.c -# End Source File -# Begin Source File - -SOURCE=.\common\mathlib.c -# End Source File -# Begin Source File - -SOURCE=.\common\md4.c -# End Source File -# Begin Source File - -SOURCE=.\models.c -# End Source File -# Begin Source File - -SOURCE=.\common\path_init.c -# End Source File -# Begin Source File - -SOURCE=.\pics.c -# End Source File -# Begin Source File - -SOURCE=.\qd_skeletons.c -# End Source File -# Begin Source File - -SOURCE=.\qdata.c -# End Source File -# Begin Source File - -SOURCE=.\common\qfiles.c -# End Source File -# Begin Source File - -SOURCE=.\qcommon\reference.c -# End Source File -# Begin Source File - -SOURCE=.\qcommon\resourcemanager.c -# End Source File -# Begin Source File - -SOURCE=.\common\scriplib.c -# End Source File -# Begin Source File - -SOURCE=.\qcommon\skeletons.c -# End Source File -# Begin Source File - -SOURCE=.\sprites.c -# End Source File -# Begin Source File - -SOURCE=.\svdcmp.c -# End Source File -# Begin Source File - -SOURCE=.\tables.c -# End Source File -# Begin Source File - -SOURCE=.\common\threads.c -# End Source File -# Begin Source File - -SOURCE=.\tmix.c -# End Source File -# Begin Source File - -SOURCE=.\common\token.c -# End Source File -# Begin Source File - -SOURCE=.\common\trilib.c -# End Source File -# Begin Source File - -SOURCE=.\video.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\adpcm.h -# End Source File -# Begin Source File - -SOURCE=.\animcomp.h -# End Source File -# Begin Source File - -SOURCE=.\anorms.h -# End Source File -# Begin Source File - -SOURCE=.\common\bspfile.h -# End Source File -# Begin Source File - -SOURCE=.\common\cmdlib.h -# End Source File -# Begin Source File - -SOURCE=.\common\her2_threads.h -# End Source File -# Begin Source File - -SOURCE=.\common\inout.h -# End Source File -# Begin Source File - -SOURCE=.\jointed.h -# End Source File -# Begin Source File - -SOURCE=.\joints.h -# End Source File -# Begin Source File - -SOURCE=.\common\l3dslib.h -# End Source File -# Begin Source File - -SOURCE=.\common\lbmlib.h -# End Source File -# Begin Source File - -SOURCE=.\common\mathlib.h -# End Source File -# Begin Source File - -SOURCE=.\qd_fmodel.h -# End Source File -# Begin Source File - -SOURCE=.\qd_skeletons.h -# End Source File -# Begin Source File - -SOURCE=.\qdata.h -# End Source File -# Begin Source File - -SOURCE=.\common\qfiles.h -# End Source File -# Begin Source File - -SOURCE=.\qcommon\reference.h -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=.\qcommon\resourcemanager.h -# End Source File -# Begin Source File - -SOURCE=.\common\scriplib.h -# End Source File -# Begin Source File - -SOURCE=.\qcommon\skeletons.h -# End Source File -# Begin Source File - -SOURCE=.\common\token.h -# End Source File -# Begin Source File - -SOURCE=.\common\trilib.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/tools/quake3/q3data/q3data.dsp b/tools/quake3/q3data/q3data.dsp deleted file mode 100644 index 88dcaf28..00000000 --- a/tools/quake3/q3data/q3data.dsp +++ /dev/null @@ -1,200 +0,0 @@ -# Microsoft Developer Studio Project File - Name="q3data" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=q3data - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "q3data.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "q3data.mak" CFG="q3data - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "q3data - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "q3data - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "q3data" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "q3data - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 /subsystem:console /machine:I386 -# ADD LINK32 glib-2.0.lib l_net.lib wsock32.lib 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 /stack:0xf42400 /subsystem:console /debug /machine:I386 /libpath:"..\..\..\libs\pak\release" /libpath:"..\..\..\libs\l_net\release" /libpath:"..\..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "q3data - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\common" /I "..\..\..\..\libxml2\include" /I "..\..\..\libs" /I "..\..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\..\gtk2-win32\lib\glib-2.0\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glib-2.0.lib l_net.lib wsock32.lib 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 /stack:0xf42400 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\l_net\Debug" /libpath:"..\..\..\libs\pak\Debug" /libpath:"..\..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "q3data - Win32 Release" -# Name "q3data - Win32 Debug" -# Begin Source File - -SOURCE=.\3dslib.c -# End Source File -# Begin Source File - -SOURCE=.\3dslib.h -# End Source File -# Begin Source File - -SOURCE=..\common\aselib.c -# End Source File -# Begin Source File - -SOURCE=..\common\aselib.h -# End Source File -# Begin Source File - -SOURCE=..\common\bspfile.c -# End Source File -# Begin Source File - -SOURCE=..\common\cmdlib.c -# End Source File -# Begin Source File - -SOURCE=.\compress.c -# End Source File -# Begin Source File - -SOURCE=..\common\imagelib.c -# End Source File -# Begin Source File - -SOURCE=.\images.c -# End Source File -# Begin Source File - -SOURCE=..\common\inout.c -# End Source File -# Begin Source File - -SOURCE=.\md3lib.c -# End Source File -# Begin Source File - -SOURCE=.\md3lib.h -# End Source File -# Begin Source File - -SOURCE=..\common\md4.c -# End Source File -# Begin Source File - -SOURCE=.\models.c -# End Source File -# Begin Source File - -SOURCE=.\p3dlib.c -# End Source File -# Begin Source File - -SOURCE=.\p3dlib.h -# End Source File -# Begin Source File - -SOURCE=.\polyset.c -# End Source File -# Begin Source File - -SOURCE=..\common\polyset.h -# End Source File -# Begin Source File - -SOURCE=.\q3data.c -# End Source File -# Begin Source File - -SOURCE=.\q3data.h -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.c -# End Source File -# Begin Source File - -SOURCE=.\stripper.c -# End Source File -# Begin Source File - -SOURCE=..\common\trilib.c -# End Source File -# Begin Source File - -SOURCE=..\common\unzip.c -# End Source File -# Begin Source File - -SOURCE=..\common\unzip.h -# End Source File -# Begin Source File - -SOURCE=..\common\vfs.c -# End Source File -# Begin Source File - -SOURCE=.\video.c -# End Source File -# End Target -# End Project diff --git a/tools/quake3/q3map2/q3map2.dsp b/tools/quake3/q3map2/q3map2.dsp deleted file mode 100644 index b125edcb..00000000 --- a/tools/quake3/q3map2/q3map2.dsp +++ /dev/null @@ -1,378 +0,0 @@ -# Microsoft Developer Studio Project File - Name="q3map2" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Q3MAP2 - WIN32 RELEASE -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "q3map2.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "q3map2.mak" CFG="Q3MAP2 - WIN32 RELEASE" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "q3map2 - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "q3map2 - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "q3map2" -# PROP Scc_LocalPath ".." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "q3map2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Release/" -# ADD F90 /include:"Release/" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\..\..\include" /I "..\common" /I "..\..\..\libs" /I "..\..\..\..\libxml2\include" /I "..\q3map2" /I "..\..\..\..\libpng" /I "..\..\..\..\zlib" /I "..\..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\..\gtk2-win32\lib\glib-2.0\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /WX /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 /subsystem:console /machine:I386 -# ADD LINK32 glib-2.0.lib wsock32.lib jpeg6.lib l_net.lib mathlib.lib md5lib.lib zlib.lib libpng12.lib picomodel.lib ddslib.lib /nologo /stack:0x400000 /subsystem:console /map /machine:I386 /libpath:"..\..\..\libs\ddslib\release" /libpath:"..\..\..\libs\md5lib\release" /libpath:"..\..\..\libs\mathlib\release" /libpath:"..\..\..\libs\pak\release" /libpath:"..\..\..\libs\jpeg6\release" /libpath:"..\..\..\libs\l_net\release" /libpath:"..\..\..\..\libxml2\win32\libxml2\release_so" /libpath:"..\..\..\..\libpng\projects\msvc\libpng___Win32_Release" /libpath:"..\..\..\..\libpng\projects\msvc\zlib___Win32_Release" /libpath:"../../../libs/picomodel/release" /libpath:"..\..\..\..\gtk2-win32\lib\\" -# SUBTRACT LINK32 /pdb:none /debug -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Python post build -PostBuild_Cmds=cd ..\..\.. && run_python.bat win32_install.py release Q3Map2 -# End Special Build Tool - -!ELSEIF "$(CFG)" == "q3map2 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -F90=df.exe -# ADD BASE F90 /include:"Debug/" -# ADD F90 /browser /include:"Debug/" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\include" /I "..\common" /I "..\..\..\libs" /I "..\..\..\..\libxml2\include" /I "..\..\..\..\libpng" /I "..\..\..\..\zlib" /I "..\..\..\..\gtk2-win32\include\glib-2.0" /I "..\..\..\..\gtk2-win32\lib\glib-2.0\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glib-2.0.lib wsock32.lib jpeg6.lib l_net.lib mathlib.lib md5lib.lib zlibd.lib libpng12d.lib picomodel.lib ddslib.lib /nologo /stack:0x400000 /subsystem:console /profile /map /debug /machine:I386 /nodefaultlib:"libcd" /libpath:"..\..\..\libs\ddslib\Debug" /libpath:"..\..\..\libs\md5lib\Debug" /libpath:"..\..\..\libs\mathlib\Debug" /libpath:"..\..\..\libs\pak\Debug" /libpath:"..\..\..\libs\jpeg6\Debug" /libpath:"..\..\..\libs\l_net\Debug" /libpath:"..\..\..\..\libxml2\win32\libxml2\debug_so" /libpath:"..\..\..\..\lpng\projects\msvc\win32\libpng___Win32_Debug" /libpath:"..\..\..\libs\jpeg6\release" /libpath:"..\..\..\libs\l_net\release" /libpath:"..\..\..\..\libxml2\win32\libxml2\release_so" /libpath:"..\..\..\..\libpng\projects\msvc\libpng___Win32_Debug" /libpath:"..\..\..\..\libpng\projects\msvc\zlib___Win32_Debug" /libpath:"../../../libs/picomodel/debug" /libpath:"..\..\..\..\gtk2-win32\lib\\" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Python post build -PostBuild_Cmds=cd ..\..\.. && run_python.bat win32_install.py Q3Map2 -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "q3map2 - Win32 Release" -# Name "q3map2 - Win32 Debug" -# Begin Group "src" - -# PROP Default_Filter "c;cpp;cxx;cc;C" -# Begin Group "common" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=..\common\cmdlib.c -# End Source File -# Begin Source File - -SOURCE=..\common\imagelib.c -# End Source File -# Begin Source File - -SOURCE=..\common\inout.c -# End Source File -# Begin Source File - -SOURCE=..\common\mutex.c -# End Source File -# Begin Source File - -SOURCE=..\common\polylib.c -# End Source File -# Begin Source File - -SOURCE=..\common\scriplib.c -# End Source File -# Begin Source File - -SOURCE=..\common\threads.c -# End Source File -# Begin Source File - -SOURCE=..\common\unzip.c -# End Source File -# Begin Source File - -SOURCE=..\common\vfs.c - -!IF "$(CFG)" == "q3map2 - Win32 Release" - -!ELSEIF "$(CFG)" == "q3map2 - Win32 Debug" - -# ADD CPP /I "..\..\..\..\src\glib" - -!ENDIF - -# End Source File -# End Group -# Begin Group "bsp" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\brush.c -# End Source File -# Begin Source File - -SOURCE=.\brush_primit.c -# End Source File -# Begin Source File - -SOURCE=.\bsp.c -# End Source File -# Begin Source File - -SOURCE=.\decals.c -# End Source File -# Begin Source File - -SOURCE=.\facebsp.c -# End Source File -# Begin Source File - -SOURCE=.\fog.c -# End Source File -# Begin Source File - -SOURCE=.\leakfile.c -# End Source File -# Begin Source File - -SOURCE=.\map.c -# End Source File -# Begin Source File - -SOURCE=.\patch.c -# End Source File -# Begin Source File - -SOURCE=.\portals.c -# End Source File -# Begin Source File - -SOURCE=.\prtfile.c -# End Source File -# Begin Source File - -SOURCE=.\surface.c -# End Source File -# Begin Source File - -SOURCE=.\surface_foliage.c -# End Source File -# Begin Source File - -SOURCE=.\surface_fur.c -# End Source File -# Begin Source File - -SOURCE=.\surface_meta.c -# End Source File -# Begin Source File - -SOURCE=.\tjunction.c -# End Source File -# Begin Source File - -SOURCE=.\tree.c -# End Source File -# Begin Source File - -SOURCE=.\writebsp.c -# End Source File -# End Group -# Begin Group "light" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\light.c -# End Source File -# Begin Source File - -SOURCE=.\light_bounce.c -# End Source File -# Begin Source File - -SOURCE=.\light_trace.c -# End Source File -# Begin Source File - -SOURCE=.\light_ydnar.c -# End Source File -# Begin Source File - -SOURCE=.\lightmaps_ydnar.c -# End Source File -# End Group -# Begin Group "vis" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\vis.c -# End Source File -# Begin Source File - -SOURCE=.\visflow.c -# End Source File -# End Group -# Begin Group "convert" - -# PROP Default_Filter ".c" -# Begin Source File - -SOURCE=.\convert_ase.c -# End Source File -# Begin Source File - -SOURCE=.\convert_map.c -# End Source File -# End Group -# Begin Source File - -SOURCE=.\bspfile_abstract.c -# End Source File -# Begin Source File - -SOURCE=.\bspfile_ibsp.c -# End Source File -# Begin Source File - -SOURCE=.\bspfile_rbsp.c -# End Source File -# Begin Source File - -SOURCE=.\image.c -# End Source File -# Begin Source File - -SOURCE=.\main.c -# End Source File -# Begin Source File - -SOURCE=.\mesh.c -# End Source File -# Begin Source File - -SOURCE=.\model.c -# End Source File -# Begin Source File - -SOURCE=.\path_init.c -# End Source File -# Begin Source File - -SOURCE=.\shaders.c -# End Source File -# Begin Source File - -SOURCE=.\surface_extra.c -# End Source File -# End Group -# Begin Group "include" - -# PROP Default_Filter "h" -# Begin Source File - -SOURCE=.\game_ef.h -# End Source File -# Begin Source File - -SOURCE=.\game_ja.h -# End Source File -# Begin Source File - -SOURCE=.\game_jk2.h -# End Source File -# Begin Source File - -SOURCE=.\game_quake3.h -# End Source File -# Begin Source File - -SOURCE=.\game_sof2.h -# End Source File -# Begin Source File - -SOURCE=.\game_wolf.h -# End Source File -# Begin Source File - -SOURCE=.\game_wolfet.h -# End Source File -# Begin Source File - -SOURCE=.\q3map2.h -# End Source File -# End Group -# Begin Group "doc" - -# PROP Default_Filter "*.txt" -# Begin Source File - -SOURCE=.\changelog.q3map2.txt -# End Source File -# End Group -# Begin Group "rc" - -# PROP Default_Filter ".rc;.ico" -# Begin Source File - -SOURCE=.\q3map2.ico -# End Source File -# Begin Source File - -SOURCE=.\q3map2.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/tools/quake3/q3map2/q3map2.dsw b/tools/quake3/q3map2/q3map2.dsw deleted file mode 100644 index 35b4fd9e..00000000 --- a/tools/quake3/q3map2/q3map2.dsw +++ /dev/null @@ -1,167 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "ddslib"=.\ddslib\ddslib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "jpeg6"=..\..\..\libs\jpeg6\jpeg6.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "l_net"=..\..\..\libs\l_net\l_net.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libpng"=..\..\..\..\libpng\projects\msvc\libpng.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libxml2"=..\..\..\..\libxml2\win32\dsp\libxml2.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "mathlib"=..\..\..\libs\mathlib\mathlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "md5lib"=..\..\..\libs\md5lib\md5lib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "picomodel"=..\..\..\libs\picomodel\picomodel.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "q3map2"=.\q3map2.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxml2 - End Project Dependency - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name picomodel - End Project Dependency - Begin Project Dependency - Project_Dep_Name jpeg6 - End Project Dependency - Begin Project Dependency - Project_Dep_Name l_net - End Project Dependency - Begin Project Dependency - Project_Dep_Name mathlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name md5lib - End Project Dependency - Begin Project Dependency - Project_Dep_Name ddslib - End Project Dependency -}}} - -############################################################################### - -Project: "zlib"=..\..\..\..\libpng\projects\msvc\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/tools/quake3/q3map2/q3map2.vcproj b/tools/quake3/q3map2/q3map2.vcproj index 8ac9bdea..c9a481e6 100644 --- a/tools/quake3/q3map2/q3map2.vcproj +++ b/tools/quake3/q3map2/q3map2.vcproj @@ -1,158 +1,219 @@ + RootNamespace="q3map2" + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> + StackReserveSize="4194304" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy to dir..." + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install"" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> + StackReserveSize="4194304" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + Description="Copy to dir..." + CommandLine="copy "$(TargetPath)" "$(SolutionDir)install"" + /> @@ -160,236 +221,307 @@ + Filter="c;cpp;cxx;cc;C" + > + RelativePath=".\bspfile_abstract.c" + > + RelativePath=".\bspfile_ibsp.c" + > + RelativePath=".\bspfile_rbsp.c" + > + RelativePath=".\image.c" + > + RelativePath=".\main.c" + > + RelativePath=".\mesh.c" + > + RelativePath=".\model.c" + > + RelativePath=".\path_init.c" + > + RelativePath=".\shaders.c" + > + RelativePath=".\surface_extra.c" + > + Filter=".c" + > + RelativePath="..\common\cmdlib.c" + > + RelativePath="..\common\imagelib.c" + > + RelativePath="..\common\inout.c" + > + RelativePath="..\common\mutex.c" + > + RelativePath="..\common\polylib.c" + > + RelativePath="..\common\scriplib.c" + > + RelativePath="..\common\threads.c" + > + RelativePath="..\common\unzip.c" + > + RelativePath="..\common\vfs.c" + > + Filter=".c" + > + RelativePath=".\brush.c" + > + RelativePath=".\brush_primit.c" + > + RelativePath=".\bsp.c" + > + RelativePath=".\decals.c" + > + RelativePath=".\facebsp.c" + > + RelativePath=".\fog.c" + > + RelativePath=".\leakfile.c" + > + RelativePath=".\map.c" + > + RelativePath=".\patch.c" + > + RelativePath=".\portals.c" + > + RelativePath=".\prtfile.c" + > + RelativePath=".\surface.c" + > + RelativePath=".\surface_foliage.c" + > + RelativePath=".\surface_fur.c" + > + RelativePath=".\surface_meta.c" + > + RelativePath=".\tjunction.c" + > + RelativePath=".\tree.c" + > + RelativePath=".\writebsp.c" + > + Filter=".c" + > + RelativePath=".\light.c" + > + RelativePath=".\light_bounce.c" + > + RelativePath=".\light_trace.c" + > + RelativePath=".\light_ydnar.c" + > + RelativePath=".\lightmaps_ydnar.c" + > + Filter=".c" + > + RelativePath=".\vis.c" + > + RelativePath=".\visflow.c" + > + Filter=".c" + > + RelativePath=".\convert_ase.c" + > + RelativePath=".\convert_map.c" + > + Filter="h" + > + RelativePath=".\game_ef.h" + > + RelativePath=".\game_etut.h" + > + RelativePath=".\game_ja.h" + > + RelativePath=".\game_jk2.h" + > + RelativePath=".\game_quake3.h" + > + RelativePath=".\game_sof2.h" + > + RelativePath=".\game_tenebrae.h" + > + RelativePath=".\game_wolf.h" + > + RelativePath=".\game_wolfet.h" + > + RelativePath=".\q3map2.h" + > + Filter="*.txt" + > + RelativePath=".\changelog.q3map2.txt" + > + Filter=".rc;.ico" + > + RelativePath=".\q3map2.ico" + > + RelativePath=".\q3map2.rc" + > + RelativePath="..\..\..\touch.py" + > + Name="Debug|Win32" + > + Outputs=""$(TargetPath)"" + /> + Name="Release|Win32" + > + Outputs=""$(TargetPath)"" + /> -- 2.39.2