diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:53:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:53:35 +0300 |
| commit | aba9bd1b4d802567add14f2b06a70b57ee4064bf (patch) | |
| tree | 918f353fd91f0bba37ea5866c35fe1df4457ef7a /Source | |
| parent | 748be565b8df535ef558e74b38cd0f4d615f8a21 (diff) | |
| parent | ba96ca289d6038275f890e8eff77912a16ddbaf1 (diff) | |
Merge branch 'master' of https://github.com/Linktothepast/dolphin into gameinis
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/VSProps/QtCompile.props | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index 9a21863036..3b602c0a5d 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> - <QTDIRDefault>$(ExternalsDir)Qt\Qt5.4.0\5.4\msvc2013_64_opengl\</QTDIRDefault> - <QTDIR Condition="Exists('$(QTDIRDefault)') And '$(QTDIR)'==''">$(QTDIRDefault)</QTDIR> + <QTDIRDefault>$(ExternalsDir)Qt\Qt5.5.0\5.5\msvc2015_64_opengl\</QTDIRDefault> + <QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR> <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR> <QtDirValid>false</QtDirValid> <QtDirValid Condition="Exists('$(QTDIR)')">true</QtDirValid> @@ -36,7 +36,7 @@ --> </Link> </ItemDefinitionGroup> - + <!--Passes all .qrc files to rcc and puts output in the build directory--> <ItemGroup> <ResFiles Include="$(MSBuildProjectDirectory)\**\*.qrc" /> @@ -51,11 +51,11 @@ <MakeDir Directories="$(QtToolOutDir)" /> <Exec Command=""$(QtBinDir)rcc.exe" "%(ResFiles.FullPath)" -o "$(QtToolOutDir)qrc_%(ResFiles.Filename).h"" /> </Target> - + <Target Name="QtResourceClean"> <Delete Files="@(ResFiles->'$(QtToolOutDir)qrc_%(Filename).h')" /> </Target> - + <!--Passes all .ui files to uic and puts output in the build directory--> <ItemGroup> <UiFiles Include="$(MSBuildProjectDirectory)\**\*.ui" /> @@ -70,11 +70,11 @@ <MakeDir Directories="$(QtToolOutDir)" /> <Exec Command=""$(QtBinDir)uic.exe" "%(UiFiles.FullPath)" -o "$(QtToolOutDir)ui_%(UiFiles.Filename).h"" /> </Target> - + <Target Name="QtUiClean"> <Delete Files="@(UiFiles->'$(QtToolOutDir)ui_%(Filename).h')" /> </Target> - + <!--Compile files needed to MOC and output in the build directory--> <!--TODO find a way to autocreate from ClCompile settings--> <PropertyGroup> @@ -101,14 +101,14 @@ <MakeDir Directories="$(QtToolOutDir)" /> <Exec Command=""$(QtBinDir)moc.exe" "%(QtMoc.FullPath)" -o "$(QtToolOutDir)moc_%(QtMoc.Filename).cpp" -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" /> </Target> - + <ItemGroup> <MocOutputs Include="$(QtToolOutDir)moc_*.cpp" /> </ItemGroup> <Target Name="QtMocClean"> <Delete Files="@(MocOutputs)" /> </Target> - + <!--Expose the new targets to VS--> <ItemGroup> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" /> @@ -122,11 +122,10 @@ <Targets>QtMoc</Targets> </AvailableItemName> </ItemGroup> - + <!--Copy the needed dlls--> <ItemGroup> - <IcuDlls Include="icudt53;icuin53;icuuc53" /> - <QtLibNames Include="@(IcuDlls);Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" /> + <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" /> <QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" /> <!--Filter plugins to copy based on the observation that all debug versions end in "d"--> <QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" /> |