From a7e270b3bc5f216209c8b279244e97adfa41d9b8 Mon Sep 17 00:00:00 2001 From: thomas65g Date: Thu, 2 Aug 2018 12:06:45 +0200 Subject: [PATCH 1/3] extend the intermediate folder with libname_prefix+lib_modifier old: object for debug and release are mixed, because they have the same name [project_top]\output\vc9_int\VC9_agg\x86 -agg_arc.obj -agg_arrowhead.obj new: strictly separated [project_top]\output\vc9_int\VC9_agg_s\x86 -agg_arc.obj -agg_arrowhead.obj ... [project_top]\output\vc9_int\VC9_agg_sd\x86 -agg_arc.obj -agg_arrowhead.obj ... --- templates/vc8.mpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/vc8.mpd b/templates/vc8.mpd index a7ad5263b..d380f43e0 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -23,7 +23,7 @@ <%endif%><%else%><%if(windows_style)%><%output_dir("Debug")%><%else%><%output_dir(".")%><%endif%><%endif%><%endif%><%endif%>" - IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%><%if(output_subdir)%>\<%output_subdir%><%endif%>" + IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%>_<%libname_prefix%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(output_subdir)%>\<%output_subdir%><%endif%>" <%if(type_is_static && staticname)%> ConfigurationType="4" <%else%> From 7a806355de4d2ca8de4a481c3c42b83732e3d1c3 Mon Sep 17 00:00:00 2001 From: thomas65g Date: Fri, 3 Aug 2018 12:50:09 +0200 Subject: [PATCH 2/3] removed from IntermediateDirectory folder add underscore in case of use_lib_modifier as cosmetic feature --- templates/vc8.mpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/vc8.mpd b/templates/vc8.mpd index d380f43e0..806d8da0d 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -23,7 +23,7 @@ <%endif%><%else%><%if(windows_style)%><%output_dir("Debug")%><%else%><%output_dir(".")%><%endif%><%endif%><%endif%><%endif%>" - IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%>_<%libname_prefix%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(output_subdir)%>\<%output_subdir%><%endif%>" + IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%><%if(use_lib_modifier)%>_<%lib_modifier%><%endif%><%if(output_subdir)%>\<%output_subdir%><%endif%>" <%if(type_is_static && staticname)%> ConfigurationType="4" <%else%> From 3537d9aee528b9fbafdb6062f70f39c4289e014f Mon Sep 17 00:00:00 2001 From: thomas65g Date: Fri, 3 Aug 2018 14:59:43 +0200 Subject: [PATCH 3/3] adds the <%output_subdir%> if available into the path of OutputFile, AdditionalLibraryDirectories, ImportLibrary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it provides folder structure as below ├───vc9 │ ├───AMD64 │ └───I386 ├───vc9_int │ ├───VC9_calc_ │ │ ├───AMD64 │ │ └───I386 │ ├───VC9_calc_d │ │ ├───AMD64 │ │ └───I386 │ ├───VC9_main_ │ │ ├───AMD64 │ │ └───I386 │ └───VC9_main_d │ ├───AMD64 │ └───I386 └───vc9_lib ├───AMD64 └───I386 additional parameters are: -name_modifier VC9_* output_dir = $(PROJ_TOP)\..\output\vc9 libname_prefix = --- templates/vc8.mpd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/vc8.mpd b/templates/vc8.mpd index 806d8da0d..5359f5b6e 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -290,7 +290,7 @@ <%if(type_is_static)%> Name="VCLibrarianTool" <%if(staticname)%> - OutputFile="<%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" + OutputFile="<%libout%>\<%libname_prefix%><%if(output_subdir)%><%output_subdir%>\<%endif%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" <%endif%> <%if(lib_options)%> AdditionalOptions="<%lib_options%>" @@ -323,14 +323,14 @@ AdditionalDependencies="<%foreach(reverse(libs))%><%fornotfirst(" ")%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endfor%><%foreach(reverse(lit_libs))%> <%lit_lib%>.lib<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%><%endfor%>" <%endif%> <%if(exename || sharedname || staticname)%> - OutputFile="$(OutDir)\<%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>" + OutputFile="$(OutDir)\<%if(output_subdir)%><%output_subdir%>\<%endif%><%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>" <%endif%> <%if(win_version)%> Version="<%win_version%>" <%endif%> LinkIncremental="<%LinkIncremental("2")%>" SuppressStartupBanner="<%SuppressStartupBanner("true")%>" - AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%>" + AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%if(output_subdir)%>\<%output_subdir%><%endif%><%fornotlast(";")%><%endfor%>" <%if(ShowProgress)%> ShowProgress="<%ShowProgress%>" <%endif%> @@ -469,7 +469,7 @@ ImportLibrary="<%ImportLibrary%>" <%else%> <%if(type_is_dynamic && sharedname)%> - ImportLibrary="<%libout%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" + ImportLibrary="<%libout%>\<%if(output_subdir)%><%output_subdir%><%endif%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" <%endif%> <%endif%> <%if(SupportUnloadOfDelayLoadedDLL)%>