mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-08-05 13:28:40 +00:00
fixing clang build
This commit is contained in:
committed by
Ryan Fleury
parent
fc9449a2d5
commit
644a94d5ef
@@ -60,6 +60,8 @@ if "%msvc%"=="1" set only_compile=/c
|
|||||||
if "%clang%"=="1" set only_compile=-c
|
if "%clang%"=="1" set only_compile=-c
|
||||||
if "%msvc%"=="1" set EHsc=/EHsc
|
if "%msvc%"=="1" set EHsc=/EHsc
|
||||||
if "%clang%"=="1" set EHsc=
|
if "%clang%"=="1" set EHsc=
|
||||||
|
if "%msvc%"=="1" set rc=rc.exe
|
||||||
|
if "%clang%"=="1" set rc=llvm-rc.exe
|
||||||
|
|
||||||
:: --- Choose Compile/Link Lines ----------------------------------------------
|
:: --- Choose Compile/Link Lines ----------------------------------------------
|
||||||
if "%msvc%"=="1" set compile_debug=%cl_debug%
|
if "%msvc%"=="1" set compile_debug=%cl_debug%
|
||||||
@@ -79,7 +81,7 @@ if not exist local mkdir local
|
|||||||
|
|
||||||
:: --- Produce Logo Icon File -------------------------------------------------
|
:: --- Produce Logo Icon File -------------------------------------------------
|
||||||
pushd build
|
pushd build
|
||||||
rc /nologo /fo logo.res ..\data\logo.rc
|
%rc% /nologo /fo logo.res ..\data\logo.rc || exit /b 1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
:: --- Build & Run Metaprogram ------------------------------------------------
|
:: --- Build & Run Metaprogram ------------------------------------------------
|
||||||
|
|||||||
@@ -1300,8 +1300,8 @@ r_window_submit(OS_Handle window, R_Handle window_equip, R_PassList *passes)
|
|||||||
|
|
||||||
U32 uniform_offset[Axis2_COUNT][2] =
|
U32 uniform_offset[Axis2_COUNT][2] =
|
||||||
{
|
{
|
||||||
{ 0 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 },
|
{ 0 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, (U32)OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 },
|
||||||
{ 1 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 },
|
{ 1 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, (U32)OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 },
|
||||||
};
|
};
|
||||||
|
|
||||||
U32 uniform_count[Axis2_COUNT][2] =
|
U32 uniform_count[Axis2_COUNT][2] =
|
||||||
|
|||||||
Reference in New Issue
Block a user