From 0a62ce8c8e1ec0e8dafc7bfef715bbb77580d7f4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 2 May 2014 14:19:56 +0000 Subject: [PATCH] Add dependency of wxregex on wx/setup.h in MSVS projects. Modified regex library code uses wx headers, so build _custom_build project creating wx/setup.h before it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/msw/wx_vc11.sln | 3 +++ build/msw/wx_vc12.sln | 3 +++ 2 files changed, 6 insertions(+) diff --git a/build/msw/wx_vc11.sln b/build/msw/wx_vc11.sln index 8ade8092d3..305b0feadb 100644 --- a/build/msw/wx_vc11.sln +++ b/build/msw/wx_vc11.sln @@ -3,6 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_vc11_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc11_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" + ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc11_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" EndProject diff --git a/build/msw/wx_vc12.sln b/build/msw/wx_vc12.sln index 683867ddc0..c856d2fa4c 100644 --- a/build/msw/wx_vc12.sln +++ b/build/msw/wx_vc12.sln @@ -3,6 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_vc12_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc12_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" + ProjectSection(ProjectDependencies) = postProject + {01F4CE10-2CFB-41A8-B41F-E54337868A1D} = {01F4CE10-2CFB-41A8-B41F-E54337868A1D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc12_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" EndProject