From 6b7896cf93d93a55be11ea6b4db891a91d455525 Mon Sep 17 00:00:00 2001 From: squall-leonhart Date: Tue, 22 Jan 2013 19:10:18 +0000 Subject: [PATCH] replaces all instances of >un7z_and_touch.bat with >call un7z_and_touch.bat to make VS2010 and 2012 builds compile first time instead of having to run the build 2-3 times to extract all libs. --- desmume/src/windows/DeSmuME_2010.vcxproj | 48 ++++++++++---------- desmume/src/windows/DeSmuME_2012.vcxproj | 56 ++++++++++++------------ 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj index fba537e52..06ad18c55 100644 --- a/desmume/src/windows/DeSmuME_2010.vcxproj +++ b/desmume/src/windows/DeSmuME_2010.vcxproj @@ -1,4 +1,4 @@ - + @@ -923,68 +923,68 @@ - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag .libs\lua.tag; .libs\lua.tag; .libs\lua.tag; @@ -993,22 +993,22 @@ 7z.exe;un7z_and_touch.bat - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) diff --git a/desmume/src/windows/DeSmuME_2012.vcxproj b/desmume/src/windows/DeSmuME_2012.vcxproj index aa8090cae..e6ba23159 100644 --- a/desmume/src/windows/DeSmuME_2012.vcxproj +++ b/desmume/src/windows/DeSmuME_2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -797,118 +797,118 @@ - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat directx\directx.7z .libs\directx* + call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* + call un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\glib-vc8.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* + call un7z_and_touch.bat libelf_libdwarf\libelf_libdwarf.7z .libs\libelf_libdwarf* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\libelf_libdwarf.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\lua.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\lua.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\lua.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag .libs\lua.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\lua.tag;%(Outputs) - un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag + call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\lua.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs) - un7z_and_touch.bat wx\wx.7z .libs\wx* + call un7z_and_touch.bat wx\wx.7z .libs\wx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\wx.tag;%(Outputs)