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

This commit is contained in:
Mathieu Vaillancourt 2014-04-19 14:26:14 -04:00
parent ad0734acee
commit 1780f9b76a
4 changed files with 15 additions and 1 deletions

3
.gitignore vendored
View file

@ -22,3 +22,6 @@ ipch/
# Build generated files # Build generated files
build/ build/
bin/ bin/
# GIT revision number
src/common/scm_rev.h

View file

@ -12,7 +12,8 @@
<PostBuildEvent> <PostBuildEvent>
<Command>xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D <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)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> </PostBuildEvent>
<Link> <Link>
<AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

View file

@ -11,6 +11,11 @@
<QtNoDebug>false</QtNoDebug> <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> <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> </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> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>

View file

@ -7,6 +7,11 @@
<Link> <Link>
<AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </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> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />
</Project> </Project>