Explorar el Código

Install CoreData and Data subdirs to 'share/Urho3D/Resources' instead.
Close #620.

Yao Wei Tjong 姚伟忠 hace 11 años
padre
commit
cf79f6ce1e
Se han modificado 5 ficheros con 11 adiciones y 10 borrados
  1. 1 1
      CMakeLists.txt
  2. 3 1
      bin/Editor.bat
  3. 3 6
      bin/Editor.sh
  4. 2 1
      bin/NinjaSnowWar.bat
  5. 2 1
      bin/NinjaSnowWar.sh

+ 1 - 1
CMakeLists.txt

@@ -79,7 +79,7 @@ set (DEST_PERMISSIONS FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_R
 file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/bin/*${SCRIPT_EXT})
 file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/bin/*${SCRIPT_EXT})
 install (FILES ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR} PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)   # 755
 install (FILES ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR} PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)   # 755
 # Install resource directories required by applications built with Urho3D library
 # Install resource directories required by applications built with Urho3D library
-install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/CoreData ${CMAKE_SOURCE_DIR}/bin/Data DESTINATION ${DEST_RUNTIME_DIR} ${DEST_PERMISSIONS})
+install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/CoreData ${CMAKE_SOURCE_DIR}/bin/Data DESTINATION ${DEST_SHARE_DIR}/Resources ${DEST_PERMISSIONS})
 # Install CMake modules and toolchains provided by and for Urho3D
 # Install CMake modules and toolchains provided by and for Urho3D
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/CMake/ DESTINATION ${DEST_SHARE_DIR}/CMake ${DEST_PERMISSIONS})    # Note: the trailing slash is significant
 install (DIRECTORY ${CMAKE_SOURCE_DIR}/CMake/ DESTINATION ${DEST_SHARE_DIR}/CMake ${DEST_PERMISSIONS})    # Note: the trailing slash is significant
 # Install CMake build scripts
 # Install CMake build scripts

+ 3 - 1
bin/Editor.bat

@@ -1,3 +1,5 @@
 @echo off
 @echo off
 if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
 if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-if [%1] == [] ("%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as -w -s) else ("%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as %*)
+if exist "%~dp0..\share\Urho3D\Resources" (set "OPT1=-pp ..\share\Urho3D\Resources") else (set "OPT1=")
+if [%1] == [] (set "OPT2=-w -s") else (set "OPT2=")
+"%~dp0Urho3DPlayer%DEBUG%" Scripts/Editor.as %OPT1% %OPT2% %*

+ 3 - 6
bin/Editor.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 #!/usr/bin/env bash
-if [ $# -eq 0 ]
-then
-    $(dirname $0)/Urho3DPlayer Scripts/Editor.as -w -s
-else
-    $(dirname $0)/Urho3DPlayer Scripts/Editor.as $@
-fi
+if [ -d $(dirname $0)/../share/Urho3D/Resources ]; then OPT1="-pp ../share/Urho3D/Resources"; fi
+if [ $# -eq 0 ]; then OPT2="-w -s"; fi
+$(dirname $0)/Urho3DPlayer Scripts/Editor.as $OPT1 $OPT2 $@

+ 2 - 1
bin/NinjaSnowWar.bat

@@ -11,4 +11,5 @@
 ::
 ::
 @echo off
 @echo off
 if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
 if exist "%~dp0Urho3DPlayer.exe" (set "DEBUG=") else (set "DEBUG=_d")
-"%~dp0Urho3DPlayer%DEBUG%" Scripts/NinjaSnowWar.as %*
+if exist "%~dp0..\share\Urho3D\Resources" (set "OPT1=-pp ..\share\Urho3D\Resources") else (set "OPT1=")
+"%~dp0Urho3DPlayer%DEBUG%" Scripts/NinjaSnowWar.as %OPT1% %*

+ 2 - 1
bin/NinjaSnowWar.sh

@@ -10,4 +10,5 @@
 #   Start the server with "./NinjaSnowWar.sh -w -server"
 #   Start the server with "./NinjaSnowWar.sh -w -server"
 #   Start the client on the same host with "./NinjaSnowWar.sh -w -nobgm -address `hostname`"
 #   Start the client on the same host with "./NinjaSnowWar.sh -w -nobgm -address `hostname`"
 #
 #
-$(dirname $0)/Urho3DPlayer Scripts/NinjaSnowWar.as $@
+if [ -d $(dirname $0)/../share/Urho3D/Resources ]; then OPT1="-pp ../share/Urho3D/Resources"; fi
+$(dirname $0)/Urho3DPlayer Scripts/NinjaSnowWar.as $OPT1 $@