diff --git a/Toshi/Include/TKernel/TObject.h b/Toshi/Include/TKernel/TObject.h index 389331a..7839846 100644 --- a/Toshi/Include/TKernel/TObject.h +++ b/Toshi/Include/TKernel/TObject.h @@ -2,6 +2,8 @@ #include "Defines.h" #include "TCString.h" #include + + TOSHI_NAMESPACE_BEGIN // TClassProps definitions diff --git a/Toshi/Include/TRenderD3D/TTextureResourceD3D.h b/Toshi/Include/TRenderD3D/TTextureResourceD3D.h index b312d30..f2427ca 100644 --- a/Toshi/Include/TRenderD3D/TTextureResourceD3D.h +++ b/Toshi/Include/TRenderD3D/TTextureResourceD3D.h @@ -1,6 +1,6 @@ #pragma once #include "TRender/TTextureResource.h" -#include +#include TOSHI_NAMESPACE_BEGIN diff --git a/Toshi/Source/TRender/TRenderInterface.cpp b/Toshi/Source/TRender/TRenderInterface.cpp index c52112a..09c96bf 100644 --- a/Toshi/Source/TRender/TRenderInterface.cpp +++ b/Toshi/Source/TRender/TRenderInterface.cpp @@ -29,12 +29,12 @@ TBOOL TRenderInterface::Create(TKernelInterface* pKernelInterface) return TTRUE; } -class TVertexFactoryResource : public TVertexFactoryFormat, public TResource -{ - DECLARE_DYNAMIC(TVertexFactoryResource) -}; +//class TVertexFactoryResource : public TVertexFactoryFormat, public TResource +//{ +// DECLARE_DYNAMIC(TVertexFactoryResource) +//}; -IMPLEMENT_DYNCREATE(TVertexFactoryResource, TResource) +//IMPLEMENT_DYNCREATE(TVertexFactoryResource, TResource) TBOOL TRenderInterface::CreateSystemResources() { diff --git a/Toshi/Source/TRender/TTextureResource.cpp b/Toshi/Source/TRender/TTextureResource.cpp index e1d8d68..0a00830 100644 --- a/Toshi/Source/TRender/TTextureResource.cpp +++ b/Toshi/Source/TRender/TTextureResource.cpp @@ -4,6 +4,16 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(TTextureResource, TResource) +TBOOL TTextureResource::Create(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_eTextureFlags, TUINT a_uiWidth, TUINT a_uiHeight) +{ + return TTRUE; +} + +TBOOL TTextureResource::Create(TPCCHAR a_szFileName, TUINT a_eTextureFlags) +{ + return TTRUE; +} + TBOOL TTextureResource::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiMipmapFlags) { return TResource::Create(); diff --git a/Toshi/premake5.lua b/Toshi/premake5.lua index 6fb64ab..565f8b9 100644 --- a/Toshi/premake5.lua +++ b/Toshi/premake5.lua @@ -131,7 +131,7 @@ project ("TRenderInterface") links { "winmm.lib", - "TKernelInterface" + "TKernelInterface", } includedirs @@ -192,17 +192,24 @@ project ("TRenderD3DInterface") "d3dx8.lib", "dxguid.lib", "dxgi.lib", + "DxErr8.lib", + "legacy_stdio_definitions.lib", + "winmm.lib", + "dinput8.lib", "TKernelInterface", "TRenderInterface" } includedirs { - "Include", + "Include" + } + + externalincludedirs + { "%{IncludeDir.dx8}" } - libdirs { "%{LibDir.dx8}" diff --git a/vendor/premake/premake5.exe b/vendor/premake/premake5.exe index c73da1f..1a637aa 100644 Binary files a/vendor/premake/premake5.exe and b/vendor/premake/premake5.exe differ