Ignore scm_rev.h and auto copy Qt dlls to bin folder on build.

4 files changed, 15 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index f88dad0a2..8a794aa0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,6 @@ ipch/
 # Build generated files
 build/
 bin/
+
+# GIT revision number
+src/common/scm_rev.h
diff --git a/vsprops/app.props b/vsprops/app.props
index 532fee05e..aa86fd142 100644
--- a/vsprops/app.props
+++ b/vsprops/app.props
@@ -12,7 +12,8 @@
     <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D
 xcopy "$(ExternalsDir)glew-1.10.0\bin\Release\$(PlatformName)\glew32.dll" "$(EmuBinDir)" /Y /S /D
-xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(EmuBinDir)" /Y /S /D</Command>
+xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(EmuBinDir)" /Y /S /D
+%(Command)</Command>
     </PostBuildEvent>
     <Link>
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props
index 2b2ced9bc..7b8660050 100644
--- a/vsprops/qt_libs_debug.props
+++ b/vsprops/qt_libs_debug.props
@@ -11,6 +11,11 @@
       <QtNoDebug>false</QtNoDebug>
       <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>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props
index 87ccf605d..76b71df07 100644
--- a/vsprops/qt_libs_release.props
+++ b/vsprops/qt_libs_release.props
@@ -7,6 +7,11 @@
     <Link>
       <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>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file