Parcourir la source

Revert "Testing old package"

This reverts commit a13f4672668f91d622413a440e3064f49caf7029.
Akio Gaule il y a 1 an
Parent
commit
fedd6f2b39

+ 1 - 0
package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows

@@ -19,6 +19,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 
 
 set(${MY_NAME}_RUNTIME_DEPENDENCIES
 set(${MY_NAME}_RUNTIME_DEPENDENCIES
 		${${MY_NAME}_BINARY_DIR}/Release/dxc.exe
 		${${MY_NAME}_BINARY_DIR}/Release/dxc.exe
+		${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe
 		${${MY_NAME}_BINARY_DIR}/Release/dxil.dll
 		${${MY_NAME}_BINARY_DIR}/Release/dxil.dll
 		${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll)
 		${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll)
 ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})
 ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})

+ 1 - 1
package-system/DirectXShaderCompiler/install_dxc_windows.cmd

@@ -38,7 +38,7 @@ echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\
 copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\
 copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\
 IF %ERRORLEVEL% NEQ 0 (
 IF %ERRORLEVEL% NEQ 0 (
     ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe
     ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe
-    REM exit /b 1
+    exit /b 1
 )
 )
 
 
 ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\
 ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\