Browse Source

Make the symlinked batch files launchable via Windows Explorer.
Fix #2046.

Yao Wei Tjong 姚伟忠 8 years ago
parent
commit
ddf64ccdb8
7 changed files with 35 additions and 18 deletions
  1. 9 7
      bin/ConvertModels.bat
  2. 5 2
      bin/Editor.bat
  3. 5 2
      bin/NinjaSnowWar.bat
  4. 5 2
      bin/PBRDemo.bat
  5. 5 2
      bin/PBRDemoDeferred.bat
  6. 5 2
      bin/PBRDemoDeferredHWDepth.bat
  7. 1 1
      cmake_generic.bat

+ 9 - 7
bin/ConvertModels.bat

@@ -1,8 +1,10 @@
+@echo off
+set /p ASSETDIR="Enter source assets dir: "
 cd /d "%~dp0"
-tool/OgreImporter ../SourceAssets/Jack.mesh.xml Data/Models/Jack.mdl -t
-tool/OgreImporter ../SourceAssets/Level.mesh.xml Data/Models/NinjaSnowWar/Level.mdl -t
-tool/OgreImporter ../SourceAssets/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
-tool/OgreImporter ../SourceAssets/Ninja.mesh.xml Data/Models/NinjaSnowWar/Ninja.mdl -t
-tool/OgreImporter ../SourceAssets/Potion.mesh.xml Data/Models/NinjaSnowWar/Potion.mdl -t
-tool/OgreImporter ../SourceAssets/SnowBall.mesh.xml Data/Models/NinjaSnowWar/SnowBall.mdl -t
-tool/OgreImporter ../SourceAssets/SnowCrate.mesh.xml Data/Models/NinjaSnowWar/SnowCrate.mdl -t
+tool/OgreImporter %ASSETDIR%/Jack.mesh.xml Data/Models/Jack.mdl -t
+tool/OgreImporter %ASSETDIR%/Level.mesh.xml Data/Models/NinjaSnowWar/Level.mdl -t
+tool/OgreImporter %ASSETDIR%/Mushroom.mesh.xml Data/Models/Mushroom.mdl -t
+tool/OgreImporter %ASSETDIR%/Ninja.mesh.xml Data/Models/NinjaSnowWar/Ninja.mdl -t
+tool/OgreImporter %ASSETDIR%/Potion.mesh.xml Data/Models/NinjaSnowWar/Potion.mdl -t
+tool/OgreImporter %ASSETDIR%/SnowBall.mesh.xml Data/Models/NinjaSnowWar/SnowBall.mdl -t
+tool/OgreImporter %ASSETDIR%/SnowCrate.mesh.xml Data/Models/NinjaSnowWar/SnowCrate.mdl -t

+ 5 - 2
bin/Editor.bat

@@ -1,4 +1,7 @@
 @echo off
-if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+setlocal
+set "dirname=%~dp0"
+if %0 == "%~dpnx0" where /q "%cd%:%~nx0" && set "dirname=%cd%\"
+if exist "%dirname%Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
 if [%1] == [] (set "OPT1=-w -s") else (set "OPT1=")
-start "" "%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as %OPT1% %*
+start "" "%dirname%Urho3DPlayer%DEBUG%" Scripts/Editor.as %OPT1% %*

+ 5 - 2
bin/NinjaSnowWar.bat

@@ -10,5 +10,8 @@
 ::   Start the client on the same host with "NinjaSnowWar -w -nobgm -address <put-your-host-name-here>"
 ::
 @echo off
-if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-"%~dp0Urho3DPlayer%DEBUG%" Scripts/NinjaSnowWar.as %*
+setlocal
+set "dirname=%~dp0"
+if %0 == "%~dpnx0" where /q "%cd%:%~nx0" && set "dirname=%cd%\"
+if exist "%dirname%Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+"%dirname%Urho3DPlayer%DEBUG%" Scripts/NinjaSnowWar.as %*

+ 5 - 2
bin/PBRDemo.bat

@@ -1,3 +1,6 @@
 @echo off
-if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-"%~dp0Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as %*
+setlocal
+set "dirname=%~dp0"
+if %0 == "%~dpnx0" where /q "%cd%:%~nx0" && set "dirname=%cd%\"
+if exist "%dirname%Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+"%dirname%Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as %*

+ 5 - 2
bin/PBRDemoDeferred.bat

@@ -1,3 +1,6 @@
 @echo off
-if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-"%~dp0Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as -renderpath CoreData/RenderPaths/PBRDeferred.xml %*
+setlocal
+set "dirname=%~dp0"
+if %0 == "%~dpnx0" where /q "%cd%:%~nx0" && set "dirname=%cd%\"
+if exist "%dirname%Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+"%dirname%Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as -renderpath CoreData/RenderPaths/PBRDeferred.xml %*

+ 5 - 2
bin/PBRDemoDeferredHWDepth.bat

@@ -1,3 +1,6 @@
 @echo off
-if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-"%~dp0Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as -renderpath CoreData/RenderPaths/PBRDeferredHWDepth.xml %*
+setlocal
+set "dirname=%~dp0"
+if %0 == "%~dpnx0" where /q "%cd%:%~nx0" && set "dirname=%cd%\"
+if exist "%dirname%Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
+"%dirname%Urho3DPlayer%DEBUG%" Scripts/42_PBRMaterials.as -renderpath CoreData/RenderPaths/PBRDeferredHWDepth.xml %*

+ 1 - 1
cmake_generic.bat

@@ -23,6 +23,7 @@
 @echo off
 
 :: Determine source tree and build tree
+setlocal
 set "SOURCE=%~dp0"
 set "SOURCE=%SOURCE:~0,-1%"
 set "BUILD="
@@ -37,7 +38,6 @@ if "%BUILD%" == "" if exist "%cd%\CMakeCache.txt" (set "BUILD=%cd%") else (echo
 :: Detect CMake toolchains directory if it is not provided explicitly
 if "%TOOLCHAINS%" == "" set "TOOLCHAINS=%SOURCE%\CMake\Toolchains"
 if not exist "%TOOLCHAINS%" if exist "%URHO3D_HOME%\share\CMake\Toolchains" set "TOOLCHAINS=%URHO3D_HOME%\share\CMake\Toolchains"
-:: BEWARE that the TOOLCHAINS variable leaks to caller's environment!
 
 :: Default to native generator and toolchain if none is specified explicitly
 set "OPTS="