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

Merge branch 'master' into OctTree

Browse Source 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2015-12-15 17:11:11 +01:00
parent ed82a0939a 51dd627ae3
commit 04a01104b5
73 changed files with 2615 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/deploy.bat
+3
View File
@@ -11,6 +11,8 @@ RMDIR "%DeployLocation%\Textures"
MKLINK "%DeployLocation%\Textures\" "assets\Textures\" /J
RMDIR "%DeployLocation%\Audio"
MKLINK "%DeployLocation%\Audio\" "assets\Audio\" /J
RMDIR "%DeployLocation%\Fonts"
MKLINK "%DeployLocation%\Fonts\" "assets\Fonts\" /J
ECHO Deploying resources to %DeployLocation%
:: Schemas
@@ -21,6 +23,7 @@ RMDIR /S /Q "%DeployLocation%\Shaders"
MKLINK "%DeployLocation%\Shaders\" "resources\Shaders" /J
:: Configuration files
MKLINK "%DeployLocation%\DefaultConfig.ini" "resources\DefaultConfig.ini" /H
MKLINK "%DeployLocation%\DefaultInput.ini" "resources\DefaultInput.ini" /H
:: Platform specific binaries
IF "%~1"=="" GOTO :EOF