From 73282c2d6cc2d0f44abfd94ccc6090785a64b623 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 3 Oct 2012 15:49:06 +0200 Subject: Fix libxml2 path according to VS downgrade --- win32/deps/libxml2/release-x64.bat | 17 ++++++++++------- win32/deps/libxml2/release-x86.bat | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'win32/deps/libxml2') diff --git a/win32/deps/libxml2/release-x64.bat b/win32/deps/libxml2/release-x64.bat index cee4fa66..b741cc40 100644 --- a/win32/deps/libxml2/release-x64.bat +++ b/win32/deps/libxml2/release-x64.bat @@ -3,8 +3,8 @@ SET PACKAGE_NAME=libxml2-2.9.0 -copy win32\vc11\x64\Release\runsuite.exe . -set PATH=%PATH%;..\build\x64\bin;win32\vc11\x64\Release +copy win32\vc10\x64\Release\runsuite.exe . +set PATH=%PATH%;..\build\x64\bin;win32\vc10\x64\Release runsuite.exe del runsuite.exe set LIBXML_SRC=%cd% @@ -18,14 +18,17 @@ mkdir %LIBXML_DEST%\bin mkdir %LIBXML_DEST%\include mkdir %LIBXML_DEST%\include\libxml mkdir %LIBXML_DEST%\lib -copy win32\vc11\x64\Release\libxml2.dll %LIBXML_DEST%\bin -copy win32\vc11\x64\Release\runsuite.exe %LIBXML_DEST%\bin -copy win32\vc11\x64\Release\libxml2.exp %LIBXML_DEST%\lib -copy win32\vc11\x64\Release\libxml2.lib %LIBXML_DEST%\lib +mkdir %LIBXML_DEST%\share +mkdir %LIBXML_DEST%\share\doc +mkdir %LIBXML_DEST%\share\doc\libxml2 +copy win32\vc10\x64\Release\libxml2.dll %LIBXML_DEST%\bin +copy win32\vc10\x64\Release\runsuite.exe %LIBXML_DEST%\bin +copy win32\vc10\x64\Release\libxml2.exp %LIBXML_DEST%\lib +copy win32\vc10\x64\Release\libxml2.lib %LIBXML_DEST%\lib copy include\win32config.h %LIBXML_DEST%\include copy include\wsockcompat.h %LIBXML_DEST%\include xcopy /s include\libxml\*.h %LIBXML_DEST%\include\libxml\ -copy COPYING %LIBXML_DEST%\LICENSE.LIBXML2 +copy COPYING %LIBXML_DEST%\share\doc\libxml2 cd %LIBXML_DEST% set PATH=%PATH%;%ProgramFiles%\7-zip diff --git a/win32/deps/libxml2/release-x86.bat b/win32/deps/libxml2/release-x86.bat index 2a210685..70b91c60 100644 --- a/win32/deps/libxml2/release-x86.bat +++ b/win32/deps/libxml2/release-x86.bat @@ -3,8 +3,8 @@ SET PACKAGE_NAME=libxml2-2.9.0 -copy win32\vc11\Release\runsuite.exe . -set PATH=%PATH%;..\build\Win32\bin;win32\vc11\Release +copy win32\vc10\Release\runsuite.exe . +set PATH=%PATH%;..\build\Win32\bin;win32\vc10\Release runsuite.exe del runsuite.exe set LIBXML_SRC=%cd% @@ -18,14 +18,17 @@ mkdir %LIBXML_DEST%\bin mkdir %LIBXML_DEST%\include mkdir %LIBXML_DEST%\include\libxml mkdir %LIBXML_DEST%\lib -copy win32\vc11\Release\libxml2.dll %LIBXML_DEST%\bin -copy win32\vc11\Release\runsuite.exe %LIBXML_DEST%\bin -copy win32\vc11\Release\libxml2.exp %LIBXML_DEST%\lib -copy win32\vc11\Release\libxml2.lib %LIBXML_DEST%\lib +mkdir %LIBXML_DEST%\share +mkdir %LIBXML_DEST%\share\doc +mkdir %LIBXML_DEST%\share\doc\libxml2 +copy win32\vc10\Release\libxml2.dll %LIBXML_DEST%\bin +copy win32\vc10\Release\runsuite.exe %LIBXML_DEST%\bin +copy win32\vc10\Release\libxml2.exp %LIBXML_DEST%\lib +copy win32\vc10\Release\libxml2.lib %LIBXML_DEST%\lib copy include\win32config.h %LIBXML_DEST%\include copy include\wsockcompat.h %LIBXML_DEST%\include xcopy /s include\libxml\*.h %LIBXML_DEST%\include\libxml\ -copy COPYING %LIBXML_DEST%\LICENSE.LIBXML2 +copy COPYING %LIBXML_DEST%\share\doc\libxml2 cd %LIBXML_DEST% set PATH=%PATH%;%ProgramFiles%\7-zip -- cgit 1.4.1