diff --git a/BluntDx/BluntDx.vcproj b/BluntDx/BluntDx.vcproj index c65bc6125d..686e1f0636 100644 --- a/BluntDx/BluntDx.vcproj +++ b/BluntDx/BluntDx.vcproj @@ -161,7 +161,7 @@ /> diff --git a/BluntDx/VertexBuffer.h b/BluntDx/VertexBuffer.h index b3553987ce..134f6c014b 100644 --- a/BluntDx/VertexBuffer.h +++ b/BluntDx/VertexBuffer.h @@ -29,7 +29,7 @@ namespace BluntDirectX { namespace Direct3D void * ib; buffer->Lock( 0, sizeof(unsigned short) * size, &ib, D3DLOCK_DISCARD ); - memcpy( ib, pdata, sizeof(unsigned short) * data.Length ); + memcpy( ib, pdata, sizeof(unsigned short) * data->Length ); buffer->Unlock(); } diff --git a/OpenRa.sln b/OpenRa.sln index 4ba451d576..55250a68de 100644 --- a/OpenRa.sln +++ b/OpenRa.sln @@ -28,8 +28,8 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 + {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Mixed Platforms.Build.0 = Release|Win32 {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Win32.ActiveCfg = Debug|Win32 {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Debug|Win32.Build.0 = Debug|Win32 {6F5D4280-3D23-41FF-AE2A-511B5553E377}.Release|Any CPU.ActiveCfg = Release|Win32 @@ -98,8 +98,8 @@ Global {C0DA4050-CF36-494B-AEB8-BFFC3F65B2AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C0DA4050-CF36-494B-AEB8-BFFC3F65B2AA}.Release|Win32.ActiveCfg = Release|Any CPU {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Mixed Platforms.ActiveCfg = Release|Win32 + {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Mixed Platforms.Build.0 = Release|Win32 {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Win32.ActiveCfg = Debug|Win32 {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Debug|Win32.Build.0 = Debug|Win32 {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}.Release|Any CPU.ActiveCfg = Release|Win32 diff --git a/release/BluntDx.dll b/release/BluntDx.dll new file mode 100644 index 0000000000..d4bc2213b5 Binary files /dev/null and b/release/BluntDx.dll differ