summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-21 22:00:13 -0400
committerGravatar bunnei2014-04-21 22:00:13 -0400
commit089dff2cd495c02d2547ec203bf0183b7e5bd6c7 (patch)
tree336851d1f6cde02a64652845700a4ae6f1c32a3d
parentIgnore scm_rev.h and auto copy Qt dlls to bin folder on build. (diff)
downloadyuzu-089dff2cd495c02d2547ec203bf0183b7e5bd6c7.tar.gz
yuzu-089dff2cd495c02d2547ec203bf0183b7e5bd6c7.tar.xz
yuzu-089dff2cd495c02d2547ec203bf0183b7e5bd6c7.zip
fixed VSProps for Qt DLL copy
-rw-r--r--vsprops/qt.props4
-rw-r--r--vsprops/qt_libs_debug.props6
-rw-r--r--vsprops/qt_libs_release.props6
3 files changed, 10 insertions, 6 deletions
diff --git a/vsprops/qt.props b/vsprops/qt.props
index 484507323..f8bb44776 100644
--- a/vsprops/qt.props
+++ b/vsprops/qt.props
@@ -4,6 +4,7 @@
4 <PropertyGroup Label="UserMacros"> 4 <PropertyGroup Label="UserMacros">
5 <QtIncludeDir>$(QTDIR)\include\</QtIncludeDir> 5 <QtIncludeDir>$(QTDIR)\include\</QtIncludeDir>
6 <QtLibraryDir>$(QTDIR)\lib\</QtLibraryDir> 6 <QtLibraryDir>$(QTDIR)\lib\</QtLibraryDir>
7 <QtBinaryDir>$(QTDIR)\bin\</QtBinaryDir>
7 </PropertyGroup> 8 </PropertyGroup>
8 <PropertyGroup> 9 <PropertyGroup>
9 <IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(IncludePath)</IncludePath> 10 <IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(IncludePath)</IncludePath>
@@ -31,5 +32,8 @@
31 <BuildMacro Include="QtLibraryDir"> 32 <BuildMacro Include="QtLibraryDir">
32 <Value>$(QtLibraryDir)</Value> 33 <Value>$(QtLibraryDir)</Value>
33 </BuildMacro> 34 </BuildMacro>
35 <BuildMacro Include="QtBinaryDir">
36 <Value>$(QtBinaryDir)</Value>
37 </BuildMacro>
34 </ItemGroup> 38 </ItemGroup>
35</Project> \ No newline at end of file 39</Project> \ No newline at end of file
diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props
index 7b8660050..335d0ac47 100644
--- a/vsprops/qt_libs_debug.props
+++ b/vsprops/qt_libs_debug.props
@@ -12,9 +12,9 @@
12 <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine> 12 <QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine>
13 </MOC> 13 </MOC>
14 <PostBuildEvent> 14 <PostBuildEvent>
15 <Command>xcopy "$(QtLibraryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D 15 <Command>xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D
16xcopy "$(QtLibraryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D 16xcopy "$(QtBinaryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D
17xcopy "$(QtLibraryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D</Command> 17xcopy "$(QtBinaryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D</Command>
18 </PostBuildEvent> 18 </PostBuildEvent>
19 </ItemDefinitionGroup> 19 </ItemDefinitionGroup>
20 <ItemGroup /> 20 <ItemGroup />
diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props
index 76b71df07..0f02f30d5 100644
--- a/vsprops/qt_libs_release.props
+++ b/vsprops/qt_libs_release.props
@@ -8,9 +8,9 @@
8 <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies> 8 <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies>
9 </Link> 9 </Link>
10 <PostBuildEvent> 10 <PostBuildEvent>
11 <Command>xcopy "$(QtLibraryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D 11 <Command>xcopy "$(QtBinaryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D
12xcopy "$(QtLibraryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D 12xcopy "$(QtBinaryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D
13xcopy "$(QtLibraryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D</Command> 13xcopy "$(QtBinaryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D</Command>
14 </PostBuildEvent> 14 </PostBuildEvent>
15 </ItemDefinitionGroup> 15 </ItemDefinitionGroup>
16 <ItemGroup /> 16 <ItemGroup />