From 1da42321387ae3e262f364b93dbcb53b6295bd5b Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Fri, 17 Jul 2015 23:12:40 +0100 Subject: [PATCH] Fix wxWidgets3.0 and libpng build file pathnames This puts the wxWidgets3.0 and libpng generated library files into the deps folder, and puts the other builds files in a subdirectory from where the project files are located. This is consistent with all the other 3rdparty projects. The output libraries for Devel builds are also suffixed with -dev instead of -dbg now. --- .../projects/vstudio/libpng/libpng_vs2012.vcxproj | 8 ++++---- .../projects/vstudio/libpng/libpng_vs2013.vcxproj | 8 ++++---- 3rdparty/wxwidgets3.0/build/msw/Common.props | 1 + .../wxwidgets3.0/build/msw/wx30_adv_vs2012.vcxproj | 10 ++-------- .../wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj | 10 ++-------- .../wxwidgets3.0/build/msw/wx30_base_vs2012.vcxproj | 10 ++-------- .../wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj | 10 ++-------- .../wxwidgets3.0/build/msw/wx30_core_vs2012.vcxproj | 10 ++-------- .../wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj | 10 ++-------- 9 files changed, 21 insertions(+), 56 deletions(-) diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj index 42b48a81dc..7e9dfdc208 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj @@ -54,23 +54,26 @@ - + false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ @@ -81,7 +84,6 @@ true false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) @@ -105,7 +107,6 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) @@ -131,7 +132,6 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj index 5efcfd2bd4..55fc1da402 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj @@ -54,23 +54,26 @@ - + false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ false + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ @@ -81,7 +84,6 @@ true false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) @@ -105,7 +107,6 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) @@ -131,7 +132,6 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false pngpriv.h - true CompileAsC 4996;4127 $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) diff --git a/3rdparty/wxwidgets3.0/build/msw/Common.props b/3rdparty/wxwidgets3.0/build/msw/Common.props index b9d9bf28fd..1a786396ef 100644 --- a/3rdparty/wxwidgets3.0/build/msw/Common.props +++ b/3rdparty/wxwidgets3.0/build/msw/Common.props @@ -7,6 +7,7 @@ <_ProjectFileVersion>10.0.30128.1 <_PropertySheetDisplayName>wxCommon $(PlatformName)\$(Configuration)\$(ProjectName)\ + $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2012.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2012.vcxproj index 3303ab17f8..c96bbb81d6 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2012.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2012.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -181,7 +179,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true AnySuitable @@ -213,7 +210,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true AnySuitable @@ -245,7 +241,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -277,7 +272,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj index 13317c6ac5..9b39d1100c 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv_vs2013.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -181,7 +179,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true AnySuitable @@ -213,7 +210,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true AnySuitable @@ -245,7 +241,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -277,7 +272,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2012.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2012.vcxproj index fc01afe70e..1887900d5f 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2012.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2012.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -188,7 +186,6 @@ AnySuitable true Speed - $(OutDir)$(TargetName).pdb _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -221,7 +218,6 @@ AnySuitable true Speed - $(OutDir)$(TargetName).pdb _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -248,7 +244,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -281,7 +276,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj index 591cf8e818..6dad23ad49 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base_vs2013.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -188,7 +186,6 @@ AnySuitable true Speed - $(OutDir)$(TargetName).pdb _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -221,7 +218,6 @@ AnySuitable true Speed - $(OutDir)$(TargetName).pdb _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) @@ -248,7 +244,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -281,7 +276,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2012.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2012.vcxproj index 6f5dd12f6a..11785110dc 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2012.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2012.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -182,7 +180,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -215,7 +212,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -247,7 +243,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -280,7 +275,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj index a8cfa397df..e75b926f5b 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj @@ -82,8 +82,8 @@ - + @@ -93,8 +93,8 @@ - + @@ -123,7 +123,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -152,7 +151,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -182,7 +180,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -215,7 +212,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -248,7 +244,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase @@ -281,7 +276,6 @@ Use wx/wxprec.h $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb Level4 true ProgramDatabase