BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

Browse Source 
# Conflicts:
#	include/Engine/Collision/Collision.h
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RawModelAssimp.cpp
This commit is contained in:
antc13
2016-01-15 18:00:30 +01:00
parent 8437b9c734 d28583ca9e
commit 16c39df439
109 changed files with 3705 additions and 1382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/deploy.bat
+3 -1
View File
@@ -31,8 +31,10 @@ ECHO Deploying %1 binaries to %DeployLocation%
COPY "deps\bin\%1\x64\*.dll" "%DeployLocation%"
:: Licenses
::ECHO Copying licenses %DeployLocation%
ECHO Copying licenses to %DeployLocation%
::COPY "libs\assimp-3.1.1\LICENSE" "%ConfigPath%\Assimp License.txt"
::COPY "libs\glew-1.11.0\LICENSE.txt" "%ConfigPath%\GLEW License.txt"
::COPY "libs\glm-0.9.5.4\copying.txt" "%ConfigPath%\GLM License.txt"
::COPY "libs\assimp-3.1.1\LICENSE" "%ConfigPath%\Assimp License.txt"
RMDIR "%DeployLocation%\Licenses"
MKLINK "%DeployLocation%\Licenses\" "resources\Licenses\" /J