diff --git a/config.py b/config.py index bb70ddfe..f9f7b8fa 100644 --- a/config.py +++ b/config.py @@ -96,7 +96,8 @@ class Config: VariantDir( build_dir, '.', duplicate = 0 ) shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) - for project in [ 'plugins/vfspk3/vfspk3.vcproj', + for project in [ 'plugins/vfsqlpk3/vfsqlpk3.vcproj', + 'plugins/vfspk3/vfspk3.vcproj', 'plugins/vfspak/vfspak.vcproj', 'plugins/vfswad/vfswad.vcproj', 'plugins/eclassfgd/fgd.vcproj', diff --git a/radiant.sln b/radiant.sln index 4a3a6b50..8488667b 100644 --- a/radiant.sln +++ b/radiant.sln @@ -3,20 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant.vcproj", "{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectSection(ProjectDependencies) = postProject - {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B} {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}" ProjectSection(ProjectDependencies) = postProject - {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16} - {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798} - {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B} - {DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E} + {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798} + {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16} {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} = {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} + {DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3-common", "tools\quake3\common\quake3-common.vcproj", "{B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}" @@ -45,8 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\ca EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entity", "plugins\entity\entity.vcproj", "{17DD38AA-4842-45BC-9304-2ADC1A12B4F4}" ProjectSection(ProjectDependencies) = postProject - {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "plugins\image\image.vcproj", "{1F9977F6-216F-4AE1-9928-59B72CF31C46}" @@ -61,8 +61,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagepng", "plugins\imagepn EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map", "plugins\map\map.vcproj", "{1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}" ProjectSection(ProjectDependencies) = postProject - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapxml", "plugins\mapxml\mapxml.vcproj", "{DDBF170A-42DF-4836-9006-816422E08493}" @@ -161,9 +161,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hydratoolz", "contrib\hydra EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{302086A7-5C73-42A4-8591-F5C9336EC911}" ProjectSection(ProjectDependencies) = postProject + {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} - {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkgensurf", "contrib\gtkgensurf\gtkgensurf.vcproj", "{E37A9846-84FC-48F8-9880-954C5D9F8ED0}" @@ -182,6 +182,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bkgrnd2d", "contrib\bkgrnd2 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfsqlpk3", "plugins\vfsqlpk3\vfsqlpk3.vcproj", "{9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution