diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index 8824ed767..54cbfddbc 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -1,8 +1,11 @@ #include #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma warning(push) +#pragma warning(disable:4100) #include #pragma GCC diagnostic pop +#pragma warning(pop) #include #include #include @@ -1002,15 +1005,7 @@ void Main::updateDebugger() #define QTLIB(x) x".lib" #endif -#pragma comment(lib, QTLIB("Qt5PlatformSupport")) -#pragma comment(lib, QTLIB("Qt5Core")) -#pragma comment(lib, QTLIB("Qt5GUI")) -#pragma comment(lib, QTLIB("Qt5Widgets")) -#pragma comment(lib, QTLIB("Qt5Network")) -#pragma comment(lib, QTLIB("qwindows")) -#pragma comment(lib, "Imm32.lib") -#pragma comment(lib, "opengl32.lib") -#pragma comment(lib, "winmm.lib") - +#pragma comment(lib, QTLIB("Qt5Webkit")) +#pragma comment(lib, QTLIB("Qt5WebkitWidgets")) #endif diff --git a/boost/process/detail/pipe.hpp b/boost/process/detail/pipe.hpp index 201ec5963..3c839c228 100644 --- a/boost/process/detail/pipe.hpp +++ b/boost/process/detail/pipe.hpp @@ -96,16 +96,16 @@ public: std::string pipe = "\\\\.\\pipe\\boost_process_" + boost::lexical_cast(::GetCurrentProcessId()) + "_" + boost::lexical_cast(nextid++); hs[0] = ::CreateNamedPipeA(pipe.c_str(), PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, 0, 1, 8192, 8192, 0, &sa); if (hs[0] == INVALID_HANDLE_VALUE) - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: CreateNamedPipe failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: CreateNamedPipe failed")); hs[1] = ::CreateFileA(pipe.c_str(), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); if (hs[1] == INVALID_HANDLE_VALUE) - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: CreateFile failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: CreateFile failed")); OVERLAPPED overlapped; ZeroMemory(&overlapped, sizeof(overlapped)); overlapped.hEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL); if (!overlapped.hEvent) - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: CreateEvent failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: CreateEvent failed")); BOOL b = ::ConnectNamedPipe(hs[0], &overlapped); if (!b) { @@ -114,19 +114,19 @@ public: if (::WaitForSingleObject(overlapped.hEvent, INFINITE) == WAIT_FAILED) { ::CloseHandle(overlapped.hEvent); - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: WaitForSingleObject failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: WaitForSingleObject failed")); } } else if (::GetLastError() != ERROR_PIPE_CONNECTED) { ::CloseHandle(overlapped.hEvent); - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: ConnectNamedPipe failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: ConnectNamedPipe failed")); } } ::CloseHandle(overlapped.hEvent); # else if (!::CreatePipe(&hs[0], &hs[1], &sa, 0)) - boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category, "boost::process::detail::pipe::pipe: CreatePipe failed")); + boost::throw_exception(boost::system::system_error(::GetLastError(), boost::system::system_category(), "boost::process::detail::pipe::pipe: CreatePipe failed")); # endif #endif diff --git a/libqethereum/QEthereum.cpp b/libqethereum/QEthereum.cpp index f8bab8a86..6456eb566 100644 --- a/libqethereum/QEthereum.cpp +++ b/libqethereum/QEthereum.cpp @@ -5,7 +5,6 @@ #include #include #include -#include "BuildInfo.h" #include "QEthereum.h" using namespace std; @@ -317,3 +316,25 @@ void QEthereum::transact(QVariant _secret, QVariant _amount, QVariant _dest, QBy { client()->transact(to(_secret), to(_amount), to
(_dest), bytes(_data.data(), _data.data() + _data.size()), to(_gas), to(_gasPrice)); } + +// extra bits needed to link on VS +#ifdef _MSC_VER + +// include moc file, ofuscated to hide from automoc +#include\ +"moc_QEthereum.cpp" + +// specify library dependencies, it's easier to do here than in the project since we can control the "d" debug suffix +#ifdef _DEBUG +#define QTLIB(x) x"d.lib" +#else +#define QTLIB(x) x".lib" +#endif + +#pragma comment(lib, QTLIB("Qt5PlatformSupport")) +#pragma comment(lib, QTLIB("Qt5Core")) +#pragma comment(lib, QTLIB("Qt5GUI")) +#pragma comment(lib, QTLIB("Qt5Widgets")) +#pragma comment(lib, QTLIB("Qt5Network")) + +#endif diff --git a/test/main.cpp b/test/main.cpp index 4205c6a44..97f32cced 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -44,8 +44,7 @@ BOOST_AUTO_TEST_CASE(basic_tests) std::cout << toHex(s.out()) << std::endl; std::cout << sha3(s.out()) << std::endl;*/ - int r = 0; - +// int r = 0; // r += daggerTest(); // r += stateTest(); // r += peerTest(argc, argv); diff --git a/walleth/MainWin.cpp b/walleth/MainWin.cpp index a35ff4063..3c498fdad 100644 --- a/walleth/MainWin.cpp +++ b/walleth/MainWin.cpp @@ -303,18 +303,7 @@ void Main::on_create_triggered() #define QTLIB(x) x".lib" #endif -#pragma comment(lib, QTLIB("Qt5PlatformSupport")) -#pragma comment(lib, QTLIB("Qt5Core")) -#pragma comment(lib, QTLIB("Qt5GUI")) -#pragma comment(lib, QTLIB("Qt5Widgets")) -#pragma comment(lib, QTLIB("Qt5Network")) #pragma comment(lib, QTLIB("Qt5Quick")) -#pragma comment(lib, QTLIB("Qt5Declarative")) #pragma comment(lib, QTLIB("Qt5Qml")) -#pragma comment(lib, QTLIB("qwindows")) -#pragma comment(lib, "Imm32.lib") -#pragma comment(lib, "opengl32.lib") -#pragma comment(lib, "winmm.lib") - #endif diff --git a/windows/Alethzero.vcxproj b/windows/Alethzero.vcxproj index 69f65fab1..c671079d0 100644 --- a/windows/Alethzero.vcxproj +++ b/windows/Alethzero.vcxproj @@ -38,13 +38,11 @@ Application false - true v120 Application false - true v120 @@ -53,24 +51,28 @@ - + + - + + + + - + + - @@ -88,7 +90,7 @@ Use Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true stdafx.h @@ -97,13 +99,32 @@ true true + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + Use Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true stdafx.h @@ -111,6 +132,25 @@ Windows true + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + @@ -119,7 +159,7 @@ true true WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable stdafx.h @@ -131,6 +171,25 @@ true true + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + @@ -139,7 +198,7 @@ true true WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable stdafx.h @@ -150,16 +209,34 @@ true true + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + - - {826e68cb-d3ee-4a8a-b540-59a8c3f38d4f} + + {df3c5b07-a1a2-4f16-b37f-a27333622cdd} - Create Create diff --git a/windows/Alethzero.vcxproj.filters b/windows/Alethzero.vcxproj.filters index 6a1228b36..e1095cf3b 100644 --- a/windows/Alethzero.vcxproj.filters +++ b/windows/Alethzero.vcxproj.filters @@ -9,7 +9,6 @@ Windows - diff --git a/windows/CopyBinary.props b/windows/CopyBinary.props index 3f94f615a..838add31d 100644 --- a/windows/CopyBinary.props +++ b/windows/CopyBinary.props @@ -5,7 +5,8 @@ - xcopy /F /Y $(OutDir)$(TargetName)$(TargetExt) ..\..\_binaries\$(Platform)\ + xcopy /D /Y $(OutDir)$(TargetName)$(TargetExt) ..\..\_binaries\$(Platform)\ > nul +xcopy /D $(OutDir)*.dll ..\..\_binaries\$(Platform)\ > nul diff --git a/windows/Ethereum.sln b/windows/Ethereum.sln index f2d148a47..b00610258 100644 --- a/windows/Ethereum.sln +++ b/windows/Ethereum.sln @@ -27,6 +27,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AlethZero", "Alethzero.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Walleth", "Walleth.vcxproj", "{326EF470-463F-4751-A22A-48BBAAD8B143}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibQEthereum", "LibQEthereum.vcxproj", "{DF3C5B07-A1A2-4F16-B37F-A27333622CDD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -115,6 +117,14 @@ Global {326EF470-463F-4751-A22A-48BBAAD8B143}.Release|Win32.Build.0 = Release|Win32 {326EF470-463F-4751-A22A-48BBAAD8B143}.Release|x64.ActiveCfg = Release|x64 {326EF470-463F-4751-A22A-48BBAAD8B143}.Release|x64.Build.0 = Release|x64 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Debug|Win32.Build.0 = Debug|Win32 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Debug|x64.ActiveCfg = Debug|x64 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Debug|x64.Build.0 = Debug|x64 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|Win32.ActiveCfg = Release|Win32 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|Win32.Build.0 = Release|Win32 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|x64.ActiveCfg = Release|x64 + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -125,6 +135,7 @@ Global {1E1175BB-C4A9-41D8-B2D1-9022F71D3CEA} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560} {1CC213A4-3482-4211-B47B-172E90DAC7DE} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560} {1B1CA20E-39C3-4D9B-AC37-3783048E6672} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560} + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD} = {988F2383-FA1D-408B-BCF6-C0EE7AB0A560} {3BF049F8-AF7E-4E1C-9627-3E94C887AF24} = {6838FA95-01BF-4FF7-914C-FC209B81406E} {3F3E389B-88DE-41D5-A73B-4F6036E18B36} = {6838FA95-01BF-4FF7-914C-FC209B81406E} EndGlobalSection diff --git a/windows/Ethereum.vcxproj b/windows/Ethereum.vcxproj index 7b36e9d53..024a1fbeb 100644 --- a/windows/Ethereum.vcxproj +++ b/windows/Ethereum.vcxproj @@ -38,13 +38,11 @@ Application false - true v120 Application false - true v120 @@ -53,19 +51,23 @@ + + + + @@ -90,7 +92,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -105,7 +107,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true @@ -121,7 +123,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable @@ -141,7 +143,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable diff --git a/windows/LibCryptoPP.vcxproj b/windows/LibCryptoPP.vcxproj index bfbdcc7e4..51e509a45 100644 --- a/windows/LibCryptoPP.vcxproj +++ b/windows/LibCryptoPP.vcxproj @@ -77,13 +77,11 @@ StaticLibrary false - true v120 StaticLibrary false - true v120 @@ -115,7 +113,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL 4100;4189;4244;%(DisableSpecificWarnings) @@ -128,7 +126,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL 4100;4189;4244;%(DisableSpecificWarnings) @@ -143,7 +141,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL 4100;4189;4244;%(DisableSpecificWarnings) @@ -160,7 +158,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL 4100;4189;4244;%(DisableSpecificWarnings) diff --git a/windows/LibEthereum.props b/windows/LibEthereum.props index b8216c8ae..5b709e9c4 100644 --- a/windows/LibEthereum.props +++ b/windows/LibEthereum.props @@ -11,7 +11,7 @@ - 4068;4127;4258;4505;4512;4706;4714 + 4068;4127;4258;4244;4267;4505;4512;4706;4714 Level4 true false diff --git a/windows/LibEthereum.vcxproj b/windows/LibEthereum.vcxproj index 40a30be12..1cafcdf07 100644 --- a/windows/LibEthereum.vcxproj +++ b/windows/LibEthereum.vcxproj @@ -19,12 +19,7 @@ - - true - true - true - true - + @@ -134,13 +129,11 @@ StaticLibrary false - true v120 StaticLibrary false - true v120 @@ -149,18 +142,22 @@ + + + + @@ -172,7 +169,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) false - MultiThreadedDebug + MultiThreadedDebugDLL Use stdafx.h @@ -186,7 +183,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) false - MultiThreadedDebug + MultiThreadedDebugDLL stdafx.h Use @@ -204,7 +201,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL Use stdafx.h @@ -222,7 +219,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL Use stdafx.h diff --git a/windows/LibEthereum_Debug.props b/windows/LibEthereum_Debug.props new file mode 100644 index 000000000..c5f6ebe52 --- /dev/null +++ b/windows/LibEthereum_Debug.props @@ -0,0 +1,14 @@ + + + + + d + + + + + + $(DebugSuffix) + + + \ No newline at end of file diff --git a/windows/LibEthereum_Release.props b/windows/LibEthereum_Release.props new file mode 100644 index 000000000..8f0436f61 --- /dev/null +++ b/windows/LibEthereum_Release.props @@ -0,0 +1,14 @@ + + + + + + + + + + + $(DebugSuffix) + + + \ No newline at end of file diff --git a/windows/LibLevelDB.vcxproj b/windows/LibLevelDB.vcxproj index b97502c01..3e2407da6 100644 --- a/windows/LibLevelDB.vcxproj +++ b/windows/LibLevelDB.vcxproj @@ -116,13 +116,11 @@ StaticLibrary false - true v120 StaticLibrary false - true v120 @@ -154,7 +152,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) @@ -169,7 +167,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) @@ -186,7 +184,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) @@ -205,7 +203,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL %(AdditionalIncludeDirectories);../../leveldb _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4018;4100;4244;4267;4389;4702;4722;4800;4996;%(DisableSpecificWarnings) diff --git a/windows/LibMiniUPnPc.vcxproj b/windows/LibMiniUPnPc.vcxproj index f45b412f4..865b6c74d 100644 --- a/windows/LibMiniUPnPc.vcxproj +++ b/windows/LibMiniUPnPc.vcxproj @@ -69,13 +69,11 @@ StaticLibrary false - true v120 StaticLibrary false - true v120 @@ -107,7 +105,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) @@ -124,7 +122,7 @@ Disabled - MultiThreadedDebug + MultiThreadedDebugDLL _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) @@ -143,7 +141,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) @@ -164,7 +162,7 @@ MaxSpeed true true - MultiThreaded + MultiThreadedDLL _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) 4100;4244;4245;4267;4389;%(DisableSpecificWarnings) diff --git a/windows/UseQt.props b/windows/LibQEthereum.props similarity index 74% rename from windows/UseQt.props rename to windows/LibQEthereum.props index 2e6efc488..9158ec9f6 100644 --- a/windows/UseQt.props +++ b/windows/LibQEthereum.props @@ -4,18 +4,25 @@ ../../Qt/$(Platform) $(QtDir)/qtbase/bin - $(QtDir)/qtbase/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include - $(QtDir)/qtbase/lib;$(QtDir)/qtbase/plugins/platforms + $(QtDir)/qtbase/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include + $(QtDir)/qtbase/lib;$(QtDir)/qtbase/plugins/platforms;../../icu/lib64 + + + <_PropertySheetDisplayName>LibQEthereum - ..;$(QtInclude);%(AdditionalIncludeDirectories) + 4718;%(DisableSpecificWarnings) $(QtLib);%(AdditionalLibraryDirectories) + + + + diff --git a/windows/LibQEthereum.vcxproj b/windows/LibQEthereum.vcxproj new file mode 100644 index 000000000..24b0643a6 --- /dev/null +++ b/windows/LibQEthereum.vcxproj @@ -0,0 +1,185 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + {826e68cb-d3ee-4a8a-b540-59a8c3f38d4f} + + + + + + Create + Create + Create + Create + + + + + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + $(Lua) moc.lua "$(QtBin)/moc" "$(IntDir)moc_%(FileName).cpp" "@(ClCompile->'%(AdditionalIncludeDirectories)');$(IncludePath)" "@(ClCompile->'%(PreprocessorDefinitions)');_MSC_VER=1800" "%(FullPath)" + + + $(IntDir)moc_%(FileName).cpp + + + $(IntDir)moc_%(FileName).cpp + + + $(IntDir)moc_%(FileName).cpp + + + $(IntDir)moc_%(FileName).cpp + + + + + + + Win32Proj + LibQEthereum + {DF3C5B07-A1A2-4F16-B37F-A27333622CDD} + + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + Use + stdafx.h + + + Windows + true + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + stdafx.h + Use + + + Windows + true + + + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + + + Windows + true + true + true + + + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/windows/LibQEthereum.vcxproj.filters b/windows/LibQEthereum.vcxproj.filters new file mode 100644 index 000000000..b3ef93314 --- /dev/null +++ b/windows/LibQEthereum.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {516a3655-70df-49f7-af1f-008cf4acf934} + + + + + Windows + + + + + + Windows + + + + + + \ No newline at end of file diff --git a/windows/LibSecp256k1.vcxproj b/windows/LibSecp256k1.vcxproj index cccf0e014..37df3b3b6 100644 --- a/windows/LibSecp256k1.vcxproj +++ b/windows/LibSecp256k1.vcxproj @@ -78,13 +78,11 @@ StaticLibrary false - true v120 StaticLibrary false - true v120 @@ -118,7 +116,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL 4189;4244;4267;%(DisableSpecificWarnings) @@ -133,7 +131,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL 4189;4244;4267;%(DisableSpecificWarnings) @@ -150,7 +148,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL 4189;4244;4267;%(DisableSpecificWarnings) @@ -169,7 +167,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL 4189;4244;4267;%(DisableSpecificWarnings) diff --git a/windows/TestEthereum.vcxproj b/windows/TestEthereum.vcxproj index 009b0616f..172e6be86 100644 --- a/windows/TestEthereum.vcxproj +++ b/windows/TestEthereum.vcxproj @@ -38,13 +38,11 @@ Application false - true v120 Application false - true v120 @@ -84,7 +82,7 @@ Use Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true true stdafx.h @@ -101,7 +99,7 @@ Use Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true stdafx.h Async @@ -118,7 +116,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable true @@ -140,7 +138,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable true @@ -163,12 +161,15 @@ + + + @@ -183,6 +184,7 @@ + diff --git a/windows/TestEthereum.vcxproj.filters b/windows/TestEthereum.vcxproj.filters index 6dc3a95eb..4be707aec 100644 --- a/windows/TestEthereum.vcxproj.filters +++ b/windows/TestEthereum.vcxproj.filters @@ -17,6 +17,9 @@ + + + @@ -30,5 +33,6 @@ + \ No newline at end of file diff --git a/windows/TestSecp256k1.vcxproj b/windows/TestSecp256k1.vcxproj index f363f4706..d2c113d4c 100644 --- a/windows/TestSecp256k1.vcxproj +++ b/windows/TestSecp256k1.vcxproj @@ -51,13 +51,11 @@ Application false - true v120 Application false - true v120 @@ -98,7 +96,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true true 4189;4244;4267;%(DisableSpecificWarnings) @@ -115,7 +113,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true 4189;4244;4267;%(DisableSpecificWarnings) @@ -132,7 +130,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable true @@ -154,7 +152,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable true diff --git a/windows/Walleth.vcxproj b/windows/Walleth.vcxproj index 4f15a87f7..3eed8091f 100644 --- a/windows/Walleth.vcxproj +++ b/windows/Walleth.vcxproj @@ -38,13 +38,11 @@ Application false - true v120 Application false - true v120 @@ -53,24 +51,28 @@ - + + - + + + + - + + - @@ -88,7 +90,7 @@ Use Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true stdafx.h @@ -97,13 +99,29 @@ true true + + + + + + + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + Use Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL true stdafx.h @@ -111,6 +129,23 @@ Windows true + + + + + + + + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + @@ -119,7 +154,7 @@ true true WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable stdafx.h @@ -131,6 +166,22 @@ true true + + + + + + + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + @@ -139,7 +190,7 @@ true true WIN32;NDEBUG;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL true AnySuitable stdafx.h @@ -150,16 +201,27 @@ true true + + + + + + + + + xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) > nul +xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) > nul + + - - - {826e68cb-d3ee-4a8a-b540-59a8c3f38d4f} - - - Create Create @@ -231,6 +293,11 @@ ../.git/index + + + {df3c5b07-a1a2-4f16-b37f-a27333622cdd} + + diff --git a/windows/Walleth.vcxproj.filters b/windows/Walleth.vcxproj.filters index 5c362b917..cc783ee27 100644 --- a/windows/Walleth.vcxproj.filters +++ b/windows/Walleth.vcxproj.filters @@ -3,7 +3,6 @@ - Windows diff --git a/windows/bootstrap.sh b/windows/bootstrap.sh index 5eba01806..f384e6d32 100644 --- a/windows/bootstrap.sh +++ b/windows/bootstrap.sh @@ -5,14 +5,23 @@ # Script to fetch and compile depdencies for building Ethereum using Visual Studio Express 2013. # Prerequisites: # - Visual Studio Express 2013 for Desktop -# - On PATH: bash, git, git-svn, curl, sed, 7z +# - On PATH: bash, git, git-svn, curl, 7z, perl, ruby, python + +# put /bin, /usr/bin and /usr/local/bin at end of PATH (want to ensure non Git/MSys/Git perl takes priority) +PATH=${PATH/#\/bin:/:/} +PATH=${PATH/#\/usr\/bin:/:/} +PATH=${PATH/#\/usr\/local\/bin:/:/} +PATH=${PATH//:\/bin:/:/} +PATH=${PATH//:\/usr\/bin:/:/} +PATH=${PATH//:\/usr\/local\/bin:/:/} +PATH=$PATH:/bin:/usr/bin:/usr/local/bin error_exit() { echo $1 1>&2 exit 1 } -for i in python perl curl git sed 7z; do +for i in ruby python perl curl git 7z; do which $i &>/dev/null || error_exit "Could not find $i on PATH" done @@ -65,6 +74,15 @@ if [[ ! $@ ]] || [ $1 == "fetch" ]; then echo fi + # fetch and unpack icu + if [ ! -d icu ]; then + git svn clone -rHEAD http://source.icu-project.org/repos/icu/icu/tags/release-52-1 icu + cd icu + # patch for VS2013 and Windows Qt build + git am --3way --ignore-space-change -s ../cpp-ethereum/windows/patches/icu/0*.patch + cd .. + fi + # fetch and unpack Qt 5.1.2 source if [ ! -d Qt ]; then if [ ! -f _download/qt-everywhere-opensource-src-5.2.1.zip ]; then @@ -75,8 +93,6 @@ if [[ ! $@ ]] || [ $1 == "fetch" ]; then cd Qt (set -x; 7z x ../_download/qt-everywhere-opensource-src-5.2.1.zip) (set -x; mv qt-everywhere-opensource-src-5.2.1 Src) - # patch qmake.conf to use the static CRT - (set -x; sed -i -e 's/-MD/-MT/g' Src/qtbase/mkspecs/win32-msvc2013/qmake.conf) cd .. echo fi @@ -119,7 +135,7 @@ compile_boost() if [ ! -d "stage/$platform" ]; then targets="--with-filesystem --with-system --with-thread --with-date_time --with-regex --with-test" - (set -x; ./b2 -j4 --build-type=complete link=static runtime-link=static variant=debug,release threading=multi $addressModel $targets stage) + (set -x; ./b2 -j4 --build-type=complete link=static runtime-link=shared variant=debug,release threading=multi $addressModel $targets stage) (set -x; mv stage/lib stage/$platform) fi } @@ -138,10 +154,42 @@ if [[ ! $@ ]] || [ $1 == "compile-boost" ]; then echo fi +compile_icu() +{ + if [ ! -d lib_$platform ] || [ ! -d bin_$platform ]; then + (set -x; cmd.exe /c "..\\cpp-ethereum\\windows\\compile_icu.bat $platform") + if [ $platform == "x64" ]; then + icu_suff="64" + else + icu_suff="" + fi + rm -rf lib_$platform + rm -rf bin_$platform + mv lib$icu_suff lib_$platform + mv bin$icu_suff bin_$platform + fi +} + +if [[ ! $@ ]] || [ $1 == "compile-icu" ]; then + cd icu + platform="x64"; compile_icu + platform="Win32"; compile_icu + cd .. +fi + compile_qt() { if [ ! -d $platform ]; then - (set -x; cmd.exe /c "..\\cpp-ethereum\\windows\\compile_qt.bat $platform") + ( + set -x + + # copy icu dlls to Qt bin folder (this is so the Qt tools work without global adjustment to PATH) + mkdir -p $platform/qtbase/bin + cp -a ../icu/bin_$platform/*.dll $platform/qtbase/bin/ + + # compile qt + cmd.exe /c "..\\cpp-ethereum\\windows\\compile_qt.bat $platform" + ) fi } diff --git a/windows/compile_ethereum.bat b/windows/compile_ethereum.bat index ee51f0a89..6aa93b155 100644 --- a/windows/compile_ethereum.bat +++ b/windows/compile_ethereum.bat @@ -1,5 +1,5 @@ @echo off -rem @file compileqt.bat +rem @file compile_ethereum.bat rem @author Tim Hughes rem @date 2014 echo on diff --git a/windows/compile_icu.bat b/windows/compile_icu.bat new file mode 100644 index 000000000..93bd21976 --- /dev/null +++ b/windows/compile_icu.bat @@ -0,0 +1,11 @@ +@echo off +rem @file compile_icu.bat +rem @author Tim Hughes +rem @date 2014 +echo on + +rem : import VC environment +call "%VS120COMNTOOLS%\VsDevCmd.bat" + +rem : build for platform +msbuild /maxcpucount /p:Configuration=Release;Platform=%1% source/allinone/icu.sln diff --git a/windows/compile_qt.bat b/windows/compile_qt.bat index 8f813c081..4555347f4 100644 --- a/windows/compile_qt.bat +++ b/windows/compile_qt.bat @@ -11,7 +11,7 @@ rem : echo commands so we can see what's going on echo on rem : select platform and toolset from first argument -IF %1%==x64 (set PLATFORM=x64&set TOOLSET=x86_amd64) ELSE (set PLATFORM=Win32&set TOOLSET=x86) +IF %1%==x64 (set PLATFORM=x64&set TOOLSET=x86_amd64&set) ELSE (set PLATFORM=Win32&set TOOLSET=x86=) rem : import VC environment vars call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %TOOLSET% @@ -19,6 +19,8 @@ call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %TOOLSET% rem : assume our root Qt dir is the current dir set QT=%CD% +set PATH=%QT%\Src\gnuwin32\bin;%PATH% + rem : create the build folder and add the qtbase/bin folder to the PATH if not exist %QT%\%PLATFORM% ( set DO_CONFIGURE=1 @@ -31,17 +33,17 @@ if %USE_PREFIX%==1 ( if not exist %QT%\%PLATFORM%\qtbase mkdir %QT%\%PLATFORM%\qtbase cd %QT%\%PLATFORM%-Build set QT_PREFIX=-prefix %Qt%\%PLATFORM%\qtbase - set QT_TARGETS=module-qtbase-install_subtargets module-qtquick1-install_subtargets + set QT_TARGETS=module-qtbase-install_subtargets module-qtquick1-install_subtargets module-qtwebkit-install_subtargets ) else ( cd %QT%\%PLATFORM% set QT_PREFIX= - set QT_TARGETS=module-qtbase module-qtquick1 + set QT_TARGETS=module-qtbase module-qtquick1 module-qtwebkit ) set PATH=%CD%\qtbase\bin;%PATH% rem : run Qt configure with desired settings if %DO_CONFIGURE%==1 ( - call %QT%\Src\configure.bat -opensource -confirm-license %QT_PREFIX% -mp -opengl desktop -static -debug-and-release -platform win32-msvc2013 -nomake examples -nomake tests + call %QT%\Src\configure.bat %QT_PREFIX% -opensource -confirm-license -debug-and-release -opengl desktop -platform win32-msvc2013 -icu -I "%QT%\..\icu\include" -L "%QT%\..\icu\lib_%PLATFORM%" -no-compile-examples -nomake tests -nomake examples -no-accessibility ) rem : compile and install module-qtbase diff --git a/windows/patches/icu/0001-Upgrade-projects-to-VS2013.patch b/windows/patches/icu/0001-Upgrade-projects-to-VS2013.patch new file mode 100644 index 000000000..53ab005f5 --- /dev/null +++ b/windows/patches/icu/0001-Upgrade-projects-to-VS2013.patch @@ -0,0 +1,2279 @@ +From f0d00332540713c5d3e3981a5a29dc0ae226d999 Mon Sep 17 00:00:00 2001 +From: Tim Hughes +Date: Mon, 21 Apr 2014 12:54:15 +0100 +Subject: [PATCH 1/3] Upgrade projects to VS2013 . + +Signed-off-by: Tim Hughes +--- + source/common/common.vcxproj | 42 ++- + source/extra/uconv/uconv.vcxproj | 8 +- + source/i18n/i18n.vcxproj | 48 +-- + source/i18n/i18n.vcxproj.filters | 3 +- + source/io/io.vcxproj | 8 +- + source/layout/layout.vcxproj | 8 +- + source/layoutex/layoutex.vcxproj | 8 +- + source/samples/cal/cal.vcxproj | 528 +++++++++++++++++---------------- + source/samples/date/date.vcxproj | 8 +- + source/stubdata/stubdata.vcxproj | 42 ++- + source/test/cintltst/cintltst.vcxproj | 8 +- + source/test/intltest/intltest.vcxproj | 38 +-- + source/test/iotest/iotest.vcxproj | 8 +- + source/test/letest/letest.vcxproj | 8 +- + source/tools/ctestfw/ctestfw.vcxproj | 8 +- + source/tools/genbrk/genbrk.vcxproj | 8 +- + source/tools/genccode/genccode.vcxproj | 8 +- + source/tools/gencfu/gencfu.vcxproj | 8 +- + source/tools/gencmn/gencmn.vcxproj | 8 +- + source/tools/gencnval/gencnval.vcxproj | 8 +- + source/tools/gendict/gendict.vcxproj | 8 +- + source/tools/gennorm2/gennorm2.vcxproj | 8 +- + source/tools/genrb/derb.vcxproj | 8 +- + source/tools/genrb/genrb.vcxproj | 8 +- + source/tools/gensprep/gensprep.vcxproj | 8 +- + source/tools/gentest/gentest.vcxproj | 8 +- + source/tools/icuinfo/icuinfo.vcxproj | 8 +- + source/tools/icuinfo/testplug.vcxproj | 8 +- + source/tools/icupkg/icupkg.vcxproj | 8 +- + source/tools/makeconv/makeconv.vcxproj | 8 +- + source/tools/pkgdata/pkgdata.vcxproj | 8 +- + source/tools/toolutil/toolutil.vcxproj | 10 +- + 32 files changed, 531 insertions(+), 380 deletions(-) + +diff --git a/source/common/common.vcxproj b/source/common/common.vcxproj +index ef0dfc1..0b1eab3 100644 +--- a/source/common/common.vcxproj ++++ b/source/common/common.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -65,17 +69,33 @@ + + <_ProjectFileVersion>10.0.30319.1 + .\..\..\lib\ +- .\x86\Release\ ++ x86\$(Configuration) + false + .\..\..\lib\ +- .\x86\Debug\ +- true ++ x86\$(Configuration) ++ false + .\x64\Release\ +- .\x64\Release\ ++ x64\$(Configuration) + false + .\x64\Debug\ +- .\x64\Debug\ +- true ++ x64\$(Configuration) ++ false ++ ++ ++ icuuc52d ++ ..\..\bin ++ ++ ++ icuuc52 ++ ..\..\bin ++ ++ ++ icuuc52d ++ ..\..\bin64 ++ ++ ++ icuuc52 ++ ..\..\bin64 + + + +@@ -104,7 +124,6 @@ + 0x0409 + + +- ..\..\bin\icuuc52.dll + true + .\..\..\lib\icuuc.pdb + true +@@ -135,7 +154,6 @@ + .\x86\Debug/ + .\x86\Debug/ + .\x86\Debug/ +- true + Level3 + true + EditAndContinue +@@ -145,7 +163,6 @@ + 0x0409 + + +- ..\..\bin\icuuc52d.dll + true + true + .\..\..\lib\icuucd.pdb +@@ -183,7 +200,6 @@ + 0x0409 + + +- ..\..\bin64\icuuc52.dll + true + .\..\..\lib64\icuuc.pdb + true +@@ -212,7 +228,6 @@ + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ +- true + Level3 + true + ProgramDatabase +@@ -222,7 +237,6 @@ + 0x0409 + + +- ..\..\bin64\icuuc52d.dll + true + true + .\..\..\lib64\icuucd.pdb +@@ -1751,4 +1765,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/extra/uconv/uconv.vcxproj b/source/extra/uconv/uconv.vcxproj +index 3ff795c..1e9829f 100644 +--- a/source/extra/uconv/uconv.vcxproj ++++ b/source/extra/uconv/uconv.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -292,4 +296,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/i18n/i18n.vcxproj b/source/i18n/i18n.vcxproj +index 3c1eebb..3f216cc 100644 +--- a/source/i18n/i18n.vcxproj ++++ b/source/i18n/i18n.vcxproj +@@ -1,5 +1,5 @@ +- +- ++ ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -64,18 +68,30 @@ + + + <_ProjectFileVersion>10.0.30319.1 +- .\..\..\lib\ +- .\x86\Release\ ++ ..\..\bin ++ x86\$(Configuration) + false +- .\..\..\lib\ +- .\x86\Debug\ +- true +- .\x64\Release\ +- .\x64\Release\ ++ ..\..\bin ++ x86\$(Configuration) ++ false ++ ..\..\bin64 ++ x64\$(Configuration) + false +- .\x64\Debug\ +- .\x64\Debug\ +- true ++ ..\..\bin64 ++ x64\$(Configuration) ++ false ++ ++ ++ icuin52d ++ ++ ++ icuin52 ++ ++ ++ icuin52d ++ ++ ++ icuin52 + + + +@@ -107,7 +123,6 @@ + ../common;%(AdditionalIncludeDirectories) + + +- ..\..\bin\icuin52.dll + true + .\..\..\lib\icuin.pdb + true +@@ -139,7 +154,6 @@ + .\x86\Debug/ + .\x86\Debug/ + .\x86\Debug/ +- true + Level3 + true + EditAndContinue +@@ -151,7 +165,6 @@ + ../common;%(AdditionalIncludeDirectories) + + +- ..\..\bin\icuin52d.dll + true + true + .\..\..\lib\icuind.pdb +@@ -192,7 +205,6 @@ + ../common;%(AdditionalIncludeDirectories) + + +- ..\..\bin64\icuin52.dll + true + .\..\..\lib64\icuin.pdb + true +@@ -222,7 +234,6 @@ + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ +- true + Level3 + true + ProgramDatabase +@@ -234,7 +245,6 @@ + ../common;%(AdditionalIncludeDirectories) + + +- ..\..\bin64\icuin52d.dll + true + true + .\..\..\lib64\icuind.pdb +@@ -1625,4 +1635,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/i18n/i18n.vcxproj.filters b/source/i18n/i18n.vcxproj.filters +index da3b9aa..554a235 100644 +--- a/source/i18n/i18n.vcxproj.filters ++++ b/source/i18n/i18n.vcxproj.filters +@@ -1050,5 +1050,6 @@ + + misc + ++ + +- ++ +\ No newline at end of file +diff --git a/source/io/io.vcxproj b/source/io/io.vcxproj +index 8944e2a..7b5e178 100644 +--- a/source/io/io.vcxproj ++++ b/source/io/io.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -319,4 +323,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/layout/layout.vcxproj b/source/layout/layout.vcxproj +index d80eb54..90a5e42 100644 +--- a/source/layout/layout.vcxproj ++++ b/source/layout/layout.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -576,4 +580,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/layoutex/layoutex.vcxproj b/source/layoutex/layoutex.vcxproj +index dac4cfe..f2c8dd8 100644 +--- a/source/layoutex/layoutex.vcxproj ++++ b/source/layoutex/layoutex.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,21 +27,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -327,4 +331,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/samples/cal/cal.vcxproj b/source/samples/cal/cal.vcxproj +index 13dae70..947e173 100644 +--- a/source/samples/cal/cal.vcxproj ++++ b/source/samples/cal/cal.vcxproj +@@ -1,264 +1,268 @@ +- +- +- +- +- Debug +- Win32 +- +- +- Debug +- x64 +- +- +- Release +- Win32 +- +- +- Release +- x64 +- +- +- +- {F7659D77-09CF-4FE9-ACEE-927287AA9509} +- +- +- +- Application +- false +- MultiByte +- +- +- Application +- false +- MultiByte +- +- +- Application +- false +- MultiByte +- +- +- Application +- false +- MultiByte +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- <_ProjectFileVersion>10.0.30319.1 +- .\x86\Release\ +- .\x86\Release\ +- false +- .\x64\Release\ +- .\x64\Release\ +- false +- .\x86\Debug\ +- .\x86\Debug\ +- true +- .\x64\Debug\ +- .\x64\Debug\ +- true +- +- +- +- .\x86\Release/cal.tlb +- +- +- OnlyExplicitInline +- ..\..\..\include;%(AdditionalIncludeDirectories) +- WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) +- true +- MultiThreadedDLL +- true +- true +- +- +- .\x86\Release/cal.pch +- .\x86\Release/ +- .\x86\Release/ +- .\x86\Release/ +- Level3 +- true +- Default +- +- +- NDEBUG;%(PreprocessorDefinitions) +- 0x0409 +- +- +- icuuc.lib;icuin.lib;%(AdditionalDependencies) +- .\x86\Release/cal.exe +- true +- ../../../lib;%(AdditionalLibraryDirectories) +- .\x86\Release/cal.pdb +- Console +- false +- +- +- +- +- +- +- X64 +- .\x64\Release/cal.tlb +- +- +- OnlyExplicitInline +- ..\..\..\include;%(AdditionalIncludeDirectories) +- WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) +- true +- MultiThreadedDLL +- true +- true +- +- +- .\x64\Release/cal.pch +- .\x64\Release/ +- .\x64\Release/ +- .\x64\Release/ +- Level3 +- true +- Default +- +- +- NDEBUG;%(PreprocessorDefinitions) +- 0x0409 +- +- +- icuuc.lib;icuin.lib;%(AdditionalDependencies) +- .\x64\Release/cal.exe +- true +- ../../../lib64;%(AdditionalLibraryDirectories) +- .\x64\Release/cal.pdb +- Console +- false +- +- +- MachineX64 +- +- +- +- +- .\x86\Debug/cal.tlb +- +- +- Disabled +- ..\..\..\include;%(AdditionalIncludeDirectories) +- WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- .\x86\Debug/cal.pch +- .\x86\Debug/ +- .\x86\Debug/ +- .\x86\Debug/ +- true +- Level3 +- true +- EditAndContinue +- Default +- +- +- _DEBUG;%(PreprocessorDefinitions) +- 0x0409 +- +- +- icuucd.lib;icuind.lib;%(AdditionalDependencies) +- .\x86\Debug/cal.exe +- true +- ../../../lib;%(AdditionalLibraryDirectories) +- true +- .\x86\Debug/cal.pdb +- Console +- false +- +- +- +- +- +- +- X64 +- .\x64\Debug/cal.tlb +- +- +- Disabled +- ..\..\..\include;%(AdditionalIncludeDirectories) +- WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) +- EnableFastChecks +- MultiThreadedDebugDLL +- true +- +- +- .\x64\Debug/cal.pch +- .\x64\Debug/ +- .\x64\Debug/ +- .\x64\Debug/ +- true +- Level3 +- true +- ProgramDatabase +- Default +- +- +- _DEBUG;%(PreprocessorDefinitions) +- 0x0409 +- +- +- icuucd.lib;icuind.lib;%(AdditionalDependencies) +- .\x64\Debug/cal.exe +- true +- ../../../lib64;%(AdditionalLibraryDirectories) +- true +- .\x64\Debug/cal.pdb +- Console +- false +- +- +- MachineX64 +- +- +- ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {F7659D77-09CF-4FE9-ACEE-927287AA9509} ++ ++ ++ ++ Application ++ false ++ MultiByte ++ v120 ++ ++ ++ Application ++ false ++ MultiByte ++ v120 ++ ++ ++ Application ++ false ++ MultiByte ++ v120 ++ ++ ++ Application ++ false ++ MultiByte ++ v120 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>10.0.30319.1 ++ .\x86\Release\ ++ .\x86\Release\ ++ false ++ .\x64\Release\ ++ .\x64\Release\ ++ false ++ .\x86\Debug\ ++ .\x86\Debug\ ++ true ++ .\x64\Debug\ ++ .\x64\Debug\ ++ true ++ ++ ++ ++ .\x86\Release/cal.tlb ++ ++ ++ OnlyExplicitInline ++ ..\..\..\include;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ ++ .\x86\Release/cal.pch ++ .\x86\Release/ ++ .\x86\Release/ ++ .\x86\Release/ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ icuuc.lib;icuin.lib;%(AdditionalDependencies) ++ .\x86\Release/cal.exe ++ true ++ ../../../lib;%(AdditionalLibraryDirectories) ++ .\x86\Release/cal.pdb ++ Console ++ false ++ ++ ++ ++ ++ ++ ++ X64 ++ .\x64\Release/cal.tlb ++ ++ ++ OnlyExplicitInline ++ ..\..\..\include;%(AdditionalIncludeDirectories) ++ WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ ++ .\x64\Release/cal.pch ++ .\x64\Release/ ++ .\x64\Release/ ++ .\x64\Release/ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ icuuc.lib;icuin.lib;%(AdditionalDependencies) ++ .\x64\Release/cal.exe ++ true ++ ../../../lib64;%(AdditionalLibraryDirectories) ++ .\x64\Release/cal.pdb ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ ++ ++ .\x86\Debug/cal.tlb ++ ++ ++ Disabled ++ ..\..\..\include;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ .\x86\Debug/cal.pch ++ .\x86\Debug/ ++ .\x86\Debug/ ++ .\x86\Debug/ ++ true ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ icuucd.lib;icuind.lib;%(AdditionalDependencies) ++ .\x86\Debug/cal.exe ++ true ++ ../../../lib;%(AdditionalLibraryDirectories) ++ true ++ .\x86\Debug/cal.pdb ++ Console ++ false ++ ++ ++ ++ ++ ++ ++ X64 ++ .\x64\Debug/cal.tlb ++ ++ ++ Disabled ++ ..\..\..\include;%(AdditionalIncludeDirectories) ++ WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ ++ .\x64\Debug/cal.pch ++ .\x64\Debug/ ++ .\x64\Debug/ ++ .\x64\Debug/ ++ true ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ icuucd.lib;icuind.lib;%(AdditionalDependencies) ++ .\x64\Debug/cal.exe ++ true ++ ../../../lib64;%(AdditionalLibraryDirectories) ++ true ++ .\x64\Debug/cal.pdb ++ Console ++ false ++ ++ ++ MachineX64 ++ ++ ++ + +- false +- ++ false ++ + +- false +- +- +- +- +- +- +- +- {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} +- false +- +- +- {0178b127-6269-407d-b112-93877bb62776} +- false +- +- +- +- +- +- ++ false ++ ++ ++ ++ ++ ++ ++ ++ {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} ++ false ++ ++ ++ {0178b127-6269-407d-b112-93877bb62776} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff --git a/source/samples/date/date.vcxproj b/source/samples/date/date.vcxproj +index 0632b3f..38d70a9 100644 +--- a/source/samples/date/date.vcxproj ++++ b/source/samples/date/date.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/stubdata/stubdata.vcxproj b/source/stubdata/stubdata.vcxproj +index ed4ca6b..541f19f 100644 +--- a/source/stubdata/stubdata.vcxproj ++++ b/source/stubdata/stubdata.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -64,21 +68,35 @@ + + + <_ProjectFileVersion>10.0.30319.1 +- .\x86\Release\ +- .\x86\Release\ ++ ..\..\bin + false + false +- .\x86\Debug\ +- .\x86\Debug\ ++ ..\..\bin + false +- .\x64\Release\ +- .\x64\Release\ ++ ..\..\bin64 + false + false +- .\x64\Debug\ +- .\x64\Debug\ ++ ..\..\bin64 + false + ++ ++ icudt52d ++ x86\$(Configuration) ++ false ++ ++ ++ icudt52d ++ x64\$(Configuration) ++ false ++ ++ ++ icudt52 ++ x86\$(Configuration) ++ ++ ++ icudt52 ++ x64\$(Configuration) ++ + + + NDEBUG;%(PreprocessorDefinitions) +@@ -113,7 +131,6 @@ + echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" + + +- ..\..\bin\icudt52.dll + true + true + .\x86\Release\icudt.pdb +@@ -160,7 +177,6 @@ + echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" + + +- ..\..\bin\icudt52.dll + true + .\x86\Debug/icudt.pdb + true +@@ -207,7 +223,6 @@ + echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" + + +- ..\..\bin64\icudt52.dll + true + true + .\x64\Release\icudt.pdb +@@ -252,7 +267,6 @@ + echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" + + +- ..\..\bin64\icudt52.dll + true + .\x64\Debug/icudt.pdb + true +@@ -277,4 +291,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/test/cintltst/cintltst.vcxproj b/source/test/cintltst/cintltst.vcxproj +index 17529b6..f04da0c 100644 +--- a/source/test/cintltst/cintltst.vcxproj ++++ b/source/test/cintltst/cintltst.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -373,4 +377,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/test/intltest/intltest.vcxproj b/source/test/intltest/intltest.vcxproj +index 8a6698e..9ee9bc7 100644 +--- a/source/test/intltest/intltest.vcxproj ++++ b/source/test/intltest/intltest.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,21 +27,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -229,7 +233,7 @@ + + + +- false ++ false + + + +@@ -260,7 +264,7 @@ + + + +- false ++ false + + + false +@@ -276,7 +280,7 @@ + + + +- false ++ false + + + +@@ -284,7 +288,7 @@ + + + +- false ++ false + + + +@@ -326,13 +330,13 @@ + + + +- false ++ false + + + + + +- false ++ false + + + false +@@ -351,7 +355,7 @@ + + + +- false ++ false + + + +@@ -360,35 +364,35 @@ + + + +- false ++ false + + +- false ++ false + + +- false ++ false + + + + + +- false ++ false + + + + +- false ++ false + + +- false ++ false + + +- false ++ false + + + + +- false ++ false + + + +@@ -561,4 +565,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/test/iotest/iotest.vcxproj b/source/test/iotest/iotest.vcxproj +index 0d39d29..5172208 100644 +--- a/source/test/iotest/iotest.vcxproj ++++ b/source/test/iotest/iotest.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -259,4 +263,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/test/letest/letest.vcxproj b/source/test/letest/letest.vcxproj +index a71d629..be01399 100644 +--- a/source/test/letest/letest.vcxproj ++++ b/source/test/letest/letest.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -274,4 +278,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/ctestfw/ctestfw.vcxproj b/source/tools/ctestfw/ctestfw.vcxproj +index 7dbdc9f..9281a1b 100644 +--- a/source/tools/ctestfw/ctestfw.vcxproj ++++ b/source/tools/ctestfw/ctestfw.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -280,4 +284,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/genbrk/genbrk.vcxproj b/source/tools/genbrk/genbrk.vcxproj +index 73e5372..8ae2620 100644 +--- a/source/tools/genbrk/genbrk.vcxproj ++++ b/source/tools/genbrk/genbrk.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/genccode/genccode.vcxproj b/source/tools/genccode/genccode.vcxproj +index f6fd59d..e1bb8fb 100644 +--- a/source/tools/genccode/genccode.vcxproj ++++ b/source/tools/genccode/genccode.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -251,4 +255,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gencfu/gencfu.vcxproj b/source/tools/gencfu/gencfu.vcxproj +index 18c63a6..315ca7b 100644 +--- a/source/tools/gencfu/gencfu.vcxproj ++++ b/source/tools/gencfu/gencfu.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,20 +27,24 @@ + Application + false + MultiByte ++ v120 + + + Application + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -238,4 +242,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gencmn/gencmn.vcxproj b/source/tools/gencmn/gencmn.vcxproj +index 6c83ef4..91f0a64 100644 +--- a/source/tools/gencmn/gencmn.vcxproj ++++ b/source/tools/gencmn/gencmn.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gencnval/gencnval.vcxproj b/source/tools/gencnval/gencnval.vcxproj +index ca12c12..474f1a2 100644 +--- a/source/tools/gencnval/gencnval.vcxproj ++++ b/source/tools/gencnval/gencnval.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gendict/gendict.vcxproj b/source/tools/gendict/gendict.vcxproj +index 6852b44..968f817 100644 +--- a/source/tools/gendict/gendict.vcxproj ++++ b/source/tools/gendict/gendict.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gennorm2/gennorm2.vcxproj b/source/tools/gennorm2/gennorm2.vcxproj +index 4245a0b..bf60570 100644 +--- a/source/tools/gennorm2/gennorm2.vcxproj ++++ b/source/tools/gennorm2/gennorm2.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,20 +27,24 @@ + + Application + Unicode ++ v120 + + + Application + Unicode + true ++ v120 + + + Application + Unicode ++ v120 + + + Application + Unicode + true ++ v120 + + + +@@ -263,4 +267,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/genrb/derb.vcxproj b/source/tools/genrb/derb.vcxproj +index b2e27e6..9c14c94 100644 +--- a/source/tools/genrb/derb.vcxproj ++++ b/source/tools/genrb/derb.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -278,4 +282,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/genrb/genrb.vcxproj b/source/tools/genrb/genrb.vcxproj +index b7f48ef..ad02f5b 100644 +--- a/source/tools/genrb/genrb.vcxproj ++++ b/source/tools/genrb/genrb.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -278,4 +282,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gensprep/gensprep.vcxproj b/source/tools/gensprep/gensprep.vcxproj +index 533b546..fad1e63 100644 +--- a/source/tools/gensprep/gensprep.vcxproj ++++ b/source/tools/gensprep/gensprep.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -257,4 +261,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/gentest/gentest.vcxproj b/source/tools/gentest/gentest.vcxproj +index f8fb903..96a8b15 100644 +--- a/source/tools/gentest/gentest.vcxproj ++++ b/source/tools/gentest/gentest.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,21 +27,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -244,4 +248,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/icuinfo/icuinfo.vcxproj b/source/tools/icuinfo/icuinfo.vcxproj +index 6da52ed..864b5e7 100644 +--- a/source/tools/icuinfo/icuinfo.vcxproj ++++ b/source/tools/icuinfo/icuinfo.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -28,21 +28,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -256,4 +260,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/icuinfo/testplug.vcxproj b/source/tools/icuinfo/testplug.vcxproj +index edf6858..cc5a0ec 100644 +--- a/source/tools/icuinfo/testplug.vcxproj ++++ b/source/tools/icuinfo/testplug.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -255,4 +259,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/icupkg/icupkg.vcxproj b/source/tools/icupkg/icupkg.vcxproj +index b3c762c..606276d 100644 +--- a/source/tools/icupkg/icupkg.vcxproj ++++ b/source/tools/icupkg/icupkg.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -27,21 +27,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -244,4 +248,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/makeconv/makeconv.vcxproj b/source/tools/makeconv/makeconv.vcxproj +index 110dee9..3d302d3 100644 +--- a/source/tools/makeconv/makeconv.vcxproj ++++ b/source/tools/makeconv/makeconv.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -260,4 +264,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/pkgdata/pkgdata.vcxproj b/source/tools/pkgdata/pkgdata.vcxproj +index 18fa39d..b2d72bd 100644 +--- a/source/tools/pkgdata/pkgdata.vcxproj ++++ b/source/tools/pkgdata/pkgdata.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + Application + false + MultiByte ++ v120 + + + +@@ -271,4 +275,4 @@ + + + +- ++ +\ No newline at end of file +diff --git a/source/tools/toolutil/toolutil.vcxproj b/source/tools/toolutil/toolutil.vcxproj +index 8cb1277..5574582 100644 +--- a/source/tools/toolutil/toolutil.vcxproj ++++ b/source/tools/toolutil/toolutil.vcxproj +@@ -1,5 +1,5 @@ +  +- ++ + + + Debug +@@ -26,21 +26,25 @@ + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + DynamicLibrary + false + MultiByte ++ v120 + + + +@@ -267,7 +271,7 @@ + + + +- false ++ false + + + false +@@ -328,4 +332,4 @@ + + + +- ++ +\ No newline at end of file +-- +1.9.0.msysgit.0 + diff --git a/windows/patches/icu/0002-Qt-requires-U_CHARSET_IS_UTF8-1.patch b/windows/patches/icu/0002-Qt-requires-U_CHARSET_IS_UTF8-1.patch new file mode 100644 index 000000000..5b9f3e959 --- /dev/null +++ b/windows/patches/icu/0002-Qt-requires-U_CHARSET_IS_UTF8-1.patch @@ -0,0 +1,26 @@ +From fca4313ae7ac54ebb5a6f3b46451306223b53aeb Mon Sep 17 00:00:00 2001 +From: Tim Hughes +Date: Mon, 21 Apr 2014 13:33:29 +0100 +Subject: [PATCH 2/3] Qt requires U_CHARSET_IS_UTF8 1 + +Signed-off-by: Tim Hughes +--- + source/common/unicode/platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/common/unicode/platform.h b/source/common/unicode/platform.h +index 1b2ab30..cca7039 100644 +--- a/source/common/unicode/platform.h ++++ b/source/common/unicode/platform.h +@@ -543,7 +543,7 @@ + #elif U_PLATFORM == U_PF_ANDROID || U_PLATFORM_IS_DARWIN_BASED + # define U_CHARSET_IS_UTF8 1 + #else +-# define U_CHARSET_IS_UTF8 0 ++# define U_CHARSET_IS_UTF8 1 + #endif + + /** @} */ +-- +1.9.0.msysgit.0 + diff --git a/windows/patches/icu/0003-Add-minimal-icu.sln.patch b/windows/patches/icu/0003-Add-minimal-icu.sln.patch new file mode 100644 index 000000000..62ce164d8 --- /dev/null +++ b/windows/patches/icu/0003-Add-minimal-icu.sln.patch @@ -0,0 +1,71 @@ +From dcb7b9172a3f7ec5d607696a86fefad69c03a400 Mon Sep 17 00:00:00 2001 +From: Tim Hughes +Date: Mon, 21 Apr 2014 13:33:59 +0100 +Subject: [PATCH 3/3] Add minimal icu.sln + +Signed-off-by: Tim Hughes +--- + source/allinone/icu.sln | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + create mode 100644 source/allinone/icu.sln + +diff --git a/source/allinone/icu.sln b/source/allinone/icu.sln +new file mode 100644 +index 0000000..b09697f +--- /dev/null ++++ b/source/allinone/icu.sln +@@ -0,0 +1,51 @@ ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio Express 2013 for Windows Desktop ++VisualStudioVersion = 12.0.21005.1 ++MinimumVisualStudioVersion = 10.0.40219.1 ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\common\common.vcxproj", "{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "i18n", "..\i18n\i18n.vcxproj", "{0178B127-6269-407D-B112-93877BB62776}" ++EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stubdata", "..\stubdata\stubdata.vcxproj", "{203EC78A-0531-43F0-A636-285439BDE025}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 ++ Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.Build.0 = Debug|Win32 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.ActiveCfg = Debug|x64 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|x64.Build.0 = Debug|x64 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.ActiveCfg = Release|Win32 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.Build.0 = Release|Win32 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.ActiveCfg = Release|x64 ++ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|x64.Build.0 = Release|x64 ++ {0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.Build.0 = Debug|Win32 ++ {0178B127-6269-407D-B112-93877BB62776}.Debug|x64.ActiveCfg = Debug|x64 ++ {0178B127-6269-407D-B112-93877BB62776}.Debug|x64.Build.0 = Debug|x64 ++ {0178B127-6269-407D-B112-93877BB62776}.Release|Win32.ActiveCfg = Release|Win32 ++ {0178B127-6269-407D-B112-93877BB62776}.Release|Win32.Build.0 = Release|Win32 ++ {0178B127-6269-407D-B112-93877BB62776}.Release|x64.ActiveCfg = Release|x64 ++ {0178B127-6269-407D-B112-93877BB62776}.Release|x64.Build.0 = Release|x64 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.ActiveCfg = Debug|Win32 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.Build.0 = Debug|Win32 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Debug|x64.ActiveCfg = Debug|x64 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Debug|x64.Build.0 = Debug|x64 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.ActiveCfg = Release|Win32 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.Build.0 = Release|Win32 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.ActiveCfg = Release|x64 ++ {203EC78A-0531-43F0-A636-285439BDE025}.Release|x64.Build.0 = Release|x64 ++ EndGlobalSection ++ GlobalSection(SolutionProperties) = preSolution ++ HideSolutionNode = FALSE ++ EndGlobalSection ++ GlobalSection(SubversionScc) = preSolution ++ Svn-Managed = True ++ Manager = AnkhSVN - Subversion Support for Visual Studio ++ EndGlobalSection ++EndGlobal +-- +1.9.0.msysgit.0 +