Merge branch 'master' of https://github.com/teamfisk/TacticalZ into MayaExporter
This commit is contained in:
+1
-2
@@ -86,8 +86,7 @@ T* ClassType::PublicMemberFunction(bool value)
|
||||
|
||||
if (m_PrivateMember2->PublicMember == 1) {
|
||||
return new T();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user