lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Ensure all qml files and other plugins are copied to output directory.

cl-refactor
Tim Hughes 11 years ago
parent
53481f2913
commit
028415daa9
9 changed files with 92 additions and 157 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      libqethereum/QEthereum.cpp
  2. 10
      walleth/MainWin.cpp
  3. 83
      windows/Alethzero.vcxproj
  4. 19
      windows/CopyBinary.props
  5. 11
      windows/Ethereum.vcxproj
  6. 4
      windows/LibEthereum_Debug.props
  7. 40
      windows/LibQEthereum.props
  8. 49
      windows/Walleth.vcxproj
  9. 2
      windows/Walleth.vcxproj.filters

15
libqethereum/QEthereum.cpp
View File

@ -394,19 +394,4 @@ void QEthereum::doTransact(QString _secret, QString _amount, QString _dest, QStr
#include\ #include\
"moc_QEthereum.cpp" "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("Qt5Network"))
#pragma comment(lib, QTLIB("Qt5Webkit"))
#pragma comment(lib, QTLIB("Qt5WebkitWidgets"))
#pragma comment(lib, QTLIB("Qt5Widgets"))
#endif #endif

10
walleth/MainWin.cpp
View File

@ -300,14 +300,4 @@ void Main::on_create_triggered()
#include\ #include\
"qrc_Resources.cpp" "qrc_Resources.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("Qt5Quick"))
#pragma comment(lib, QTLIB("Qt5Qml"))
#endif #endif

83
windows/Alethzero.vcxproj
View File

@ -65,14 +65,12 @@
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="LibQEthereum.props" /> <Import Project="LibQEthereum.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="LibQEthereum.props" /> <Import Project="LibQEthereum.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -100,22 +98,7 @@
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -133,22 +116,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -172,22 +140,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -210,22 +163,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -311,4 +249,17 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Target Name="AfterBuild">
<ItemGroup>
<CopyToOutDir Include="$(CopyDlls)" />
</ItemGroup>
<Copy SourceFiles="@(CopyToOutDir)" DestinationFolder="$(OutDir)\%(RecursiveDir)" />
</Target>
<PropertyGroup><BuildDependsOn>$(BuildDependsOn);FinalCopy</BuildDependsOn></PropertyGroup>
<Target Name="FinalCopy" DependsOnTargets="AfterBuild" Condition="'$(Configuration)' == 'Release'">
<ItemGroup>
<CopyToBinDir Include="$(OutDir)\**\*.dll;$(OutDir)\*.exe" />
</ItemGroup>
<Copy SourceFiles="@(CopyToBinDir)" DestinationFiles="@(CopyToBinDir->'..\..\_binaries\$(Platform)\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project> </Project>

19
windows/CopyBinary.props
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<PostBuildEvent>
<Command>xcopy /D /Y $(OutDir)$(TargetName)$(TargetExt) ..\..\_binaries\$(Platform)\ &gt; nul
xcopy /D $(OutDir)*.dll ..\..\_binaries\$(Platform)\ &gt; nul</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<PostBuildEvent>
<Message>
</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

11
windows/Ethereum.vcxproj
View File

@ -62,13 +62,11 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -190,4 +188,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<PropertyGroup>
<BuildDependsOn>$(BuildDependsOn);FinalCopy</BuildDependsOn>
</PropertyGroup>
<Target Name="FinalCopy" DependsOnTargets="AfterBuild" Condition="'$(Configuration)' == 'Release'">
<ItemGroup>
<CopyToBinDir Include="$(OutDir)\*.exe" />
</ItemGroup>
<Copy SourceFiles="@(CopyToBinDir)" DestinationFiles="@(CopyToBinDir->'..\..\_binaries\$(Platform)\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project> </Project>

4
windows/LibEthereum_Debug.props
View File

@ -3,6 +3,7 @@
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<DebugSuffix>d</DebugSuffix> <DebugSuffix>d</DebugSuffix>
<d>d</d>
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup /> <ItemDefinitionGroup />
@ -10,5 +11,8 @@
<BuildMacro Include="DebugSuffix"> <BuildMacro Include="DebugSuffix">
<Value>$(DebugSuffix)</Value> <Value>$(DebugSuffix)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="d">
<Value>$(d)</Value>
</BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>

40
windows/LibQEthereum.props
View File

@ -3,9 +3,11 @@
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<QtDir>../../Qt/$(Platform)</QtDir> <QtDir>../../Qt/$(Platform)</QtDir>
<QtBin>$(QtDir)/qtbase/bin</QtBin> <QtBase>$(QtDir)/qtbase</QtBase>
<QtInclude>$(QtDir)/qtbase/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include</QtInclude> <QtBin>$(QtBase)/bin</QtBin>
<QtLib>$(QtDir)/qtbase/lib;$(QtDir)/qtbase/plugins/platforms;../../icu/lib64</QtLib> <QtInclude>$(QtBase)/include;../../Qt/Src/qtbase/include;../../Qt/Src/qtdeclarative/include;../../Qt/Src/qtwebkit/include</QtInclude>
<QtLib>$(QtBase)/lib;$(QtBase)/plugins/platforms;../../icu/lib64</QtLib>
<CopyDlls>..\..\icu\bin_$(Platform)\icu*52.dll;$(QtBase)\lib\Qt5Core$(d).dll;$(QtBase)\lib\Qt5Gui$(d).dll;$(QtBase)\lib\Qt5Multimedia$(d).dll;$(QtBase)\lib\Qt5MultimediaWidgets$(d).dll;$(QtBase)\lib\Qt5OpenGL$(d).dll;$(QtBase)\lib\Qt5Positioning$(d).dll;$(QtBase)\lib\Qt5PrintSupport$(d).dll;$(QtBase)\lib\Qt5Network$(d).dll;$(QtBase)\lib\Qt5Qml$(d).dll;$(QtBase)\lib\Qt5Quick$(d).dll;$(QtBase)\lib\Qt5Sensors$(d).dll;$(QtBase)\lib\Qt5Sql$(d).dll;$(QtBase)\lib\Qt5Webkit$(d).dll;$(QtBase)\lib\Qt5WebkitWidgets$(d).dll;$(QtBase)\lib\Qt5Widgets$(d).dll;$(QtBase)\plugins\**\qwindows$(d).dll;$(QtBase)\plugins\**\qgenericbearer$(d).dll;$(QtBase)\plugins\**\qnativewifibearer$(d).dll;$(QtBase)\plugins\**\qgif$(d).dll;$(QtBase)\plugins\**\qico$(d).dll;$(QtBase)\plugins\**\qjpeg$(d).dll;$(QtBase)\plugins\**\qsvg$(d).dll;$(QtBase)\plugins\**\qtsensors_dummy$(d).dll</CopyDlls>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>LibQEthereum</_PropertySheetDisplayName> <_PropertySheetDisplayName>LibQEthereum</_PropertySheetDisplayName>
@ -16,18 +18,24 @@
<AdditionalIncludeDirectories>..;$(QtInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..;$(QtInclude);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4718;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link />
<AdditionalLibraryDirectories>$(QtLib);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<Lib />
<Link>
<AdditionalLibraryDirectories>$(QtLib);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>Qt5PlatformSupport$(d).lib;Qt5Core$(d).lib;Qt5GUI$(d).lib;Qt5Network$(d).lib;Qt5Quick$(d).lib;Qt5Qml$(d).lib;Qt5Webkit$(d).lib;Qt5WebkitWidgets$(d).lib;Qt5Widgets$(d).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<BuildMacro Include="QtDir"> <BuildMacro Include="QtDir">
<Value>$(QtDir)</Value> <Value>$(QtDir)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="QtBase">
<Value>$(QtBase)</Value>
</BuildMacro>
<BuildMacro Include="QtBin"> <BuildMacro Include="QtBin">
<Value>$(QtBin)</Value> <Value>$(QtBin)</Value>
</BuildMacro> </BuildMacro>
@ -37,5 +45,25 @@
<BuildMacro Include="QtLib"> <BuildMacro Include="QtLib">
<Value>$(QtLib)</Value> <Value>$(QtLib)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="CopyDlls">
<Value>$(CopyDlls)</Value>
</BuildMacro>
</ItemGroup>
<Target Name="AfterBuild">
<ItemGroup>
<CopyItems Include="&#xA; ..\..\icu\bin_$(Platform)\icu*52.dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Multimedia$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5MultimediaWidgets$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5OpenGL$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Positioning$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5PrintSupport$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sensors$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Sql$(DebugSuffix).dll&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Webkit$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5WebkitWidgets$(DebugSuffix).dll;&#xA; ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll;&#xA; " />
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(CopyItems)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
</Target>
<!--
..\..\Qt\$(Platform)\qtbase\plugins\platforms\qwindows$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\platforms\qwindows$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\bearer\qgenericbearer$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\bearer\qnativewifibearer$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\imageformats\qgif$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\imageformats\qico$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\imageformats\qjpeg$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\imageformats\qsvg$(DebugSuffix).dll
..\..\Qt\$(Platform)\qtbase\plugins\sensors\qtsensors_dummy$(DebugSuffix).dll
-->
</Project> </Project>

49
windows/Walleth.vcxproj
View File

@ -65,14 +65,12 @@
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="LibQEthereum.props" /> <Import Project="LibQEthereum.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="LibEthereum.props" /> <Import Project="LibEthereum.props" />
<Import Project="LibEthereum_Release.props" /> <Import Project="LibEthereum_Release.props" />
<Import Project="LibQEthereum.props" /> <Import Project="LibQEthereum.props" />
<Import Project="CopyBinary.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -106,13 +104,7 @@
<PostBuildEvent /> <PostBuildEvent />
<PostBuildEvent /> <PostBuildEvent />
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -137,13 +129,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<PostBuildEvent /> <PostBuildEvent />
<PostBuildEvent /> <PostBuildEvent />
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -173,13 +159,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<PostBuildEvent /> <PostBuildEvent />
<PostBuildEvent /> <PostBuildEvent />
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -209,13 +189,7 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<PostBuildEvent /> <PostBuildEvent />
<PostBuildEvent /> <PostBuildEvent />
<PreLinkEvent> <PreLinkEvent>
<Command>xcopy /D ..\..\icu\bin_$(Platform)\icu*52.dll $(OutDir) &gt; nul <Command>
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Core$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Gui$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Network$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Qml$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Quick$(DebugSuffix).dll $(OutDir) &gt; nul
xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir) &gt; nul
</Command> </Command>
</PreLinkEvent> </PreLinkEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -323,4 +297,19 @@ xcopy /D ..\..\Qt\$(Platform)\qtbase\lib\Qt5Widgets$(DebugSuffix).dll $(OutDir)
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Target Name="AfterBuild">
<ItemGroup>
<CopyToOutDir Include="$(CopyDlls)" />
</ItemGroup>
<Copy SourceFiles="@(CopyToOutDir)" DestinationFolder="$(OutDir)\%(RecursiveDir)" />
</Target>
<PropertyGroup>
<BuildDependsOn>$(BuildDependsOn);FinalCopy</BuildDependsOn>
</PropertyGroup>
<Target Name="FinalCopy" DependsOnTargets="AfterBuild" Condition="'$(Configuration)' == 'Release'">
<ItemGroup>
<CopyToBinDir Include="$(OutDir)\*.exe;$(QtBase)\qml\**\*" Exclude="$(QtBase)\qml\**\*.pdb;$(QtBase)\qml\**\*.ilk;$(QtBase)\qml\**\*.exp;$(QtBase)\qml\**\*.lib;$(QtBase)\qml\**\*d.dll"/>
</ItemGroup>
<Copy SourceFiles="@(CopyToBinDir)" DestinationFiles="@(CopyToBinDir->'..\..\_binaries\$(Platform)\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project> </Project>

2
windows/Walleth.vcxproj.filters
View File

@ -16,6 +16,7 @@
<CustomBuild Include="BuildInfo.lua"> <CustomBuild Include="BuildInfo.lua">
<Filter>Windows</Filter> <Filter>Windows</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\walleth\Resources.qrc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Windows"> <Filter Include="Windows">
@ -28,7 +29,6 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\walleth\Resources.qrc" />
<None Include="..\walleth\Simple.qml" /> <None Include="..\walleth\Simple.qml" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Write Preview
Loading…
Cancel
Save