From 089dff2cd495c02d2547ec203bf0183b7e5bd6c7 Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Mon, 21 Apr 2014 22:00:13 -0400
Subject: [PATCH] fixed VSProps for Qt DLL copy
---
vsprops/qt.props | 4 ++++
vsprops/qt_libs_debug.props | 6 +++---
vsprops/qt_libs_release.props | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/vsprops/qt.props b/vsprops/qt.props
index 4845073238..f8bb447765 100644
--- a/vsprops/qt.props
+++ b/vsprops/qt.props
@@ -4,6 +4,7 @@
<PropertyGroup Label="UserMacros">
<QtIncludeDir>$(QTDIR)\include\</QtIncludeDir>
<QtLibraryDir>$(QTDIR)\lib\</QtLibraryDir>
+ <QtBinaryDir>$(QTDIR)\bin\</QtBinaryDir>
</PropertyGroup>
<PropertyGroup>
<IncludePath>$(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(IncludePath)</IncludePath>
@@ -31,5 +32,8 @@
<BuildMacro Include="QtLibraryDir">
<Value>$(QtLibraryDir)</Value>
</BuildMacro>
+ <BuildMacro Include="QtBinaryDir">
+ <Value>$(QtBinaryDir)</Value>
+ </BuildMacro>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props
index 7b8660050b..335d0ac471 100644
--- a/vsprops/qt_libs_debug.props
+++ b/vsprops/qt_libs_debug.props
@@ -12,9 +12,9 @@
<QtCommandLine>/I"$(SolutionDir)src" /I"$(ExternalsDir)glew-1.6.0\include" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG"</QtCommandLine>
</MOC>
<PostBuildEvent>
- <Command>xcopy "$(QtLibraryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtLibraryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtLibraryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D</Command>
+ <Command>xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D
+xcopy "$(QtBinaryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D
+xcopy "$(QtBinaryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props
index 76b71df076..0f02f30d59 100644
--- a/vsprops/qt_libs_release.props
+++ b/vsprops/qt_libs_release.props
@@ -8,9 +8,9 @@
<AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
- <Command>xcopy "$(QtLibraryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtLibraryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(QtLibraryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D</Command>
+ <Command>xcopy "$(QtBinaryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D
+xcopy "$(QtBinaryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D
+xcopy "$(QtBinaryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup />
--
GitLab