From 8879866b323f430cfc0b6ba881720b7ce9f7f6ab Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 24 Jul 2015 00:34:04 +0100 Subject: [PATCH] wxWidgets3.0: use relative paths for wxConfig30 This lets wxWidgets3.0 build even when the full pathname has non ASCII characters or spaces in it. Note that pcsx2 and some of the plugins that rely on custom build commands still fail. --- .../build/msw/wx30_config_vs2012.vcxproj | 84 +++++++++---------- .../build/msw/wx30_config_vs2013.vcxproj | 84 +++++++++---------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2012.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2012.vcxproj index b809e57dcc..efc36afdd1 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2012.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2012.vcxproj @@ -110,50 +110,50 @@ - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj index bf4dafe507..4034da3d52 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config_vs2013.vcxproj @@ -110,50 +110,50 @@ - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - Creating $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - copy "%(FullPath)" $(ProjectRootDir)\include\wx\setup.h - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) - $(ProjectRootDir)\include\wx\setup.h;%(Outputs) + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + Creating ..\..\include\wx\setup.h + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + copy "%(Identity)" "..\..\include\wx\setup.h" + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) + ..\..\include\wx\setup.h;%(Outputs) - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - Creating $(ProjectRootDir)\include\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(ProjectRootDir)\include\wx\msw\rcdefs.h" - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw\rcdefs.h;%(Outputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) - $(ProjectRootDir)\include\wx\msw;%(AdditionalInputs) + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + Creating ..\..\include\wx\msw\rcdefs.h + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + cl /EP /nologo "%(Identity)" > "..\..\include\wx\msw\rcdefs.h" + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw\rcdefs.h;%(Outputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs) + ..\..\include\wx\msw;%(AdditionalInputs="")