diff --git a/.gitea/IMPLEMENTATION_GUIDE.md b/.gitea/IMPLEMENTATION_GUIDE.md index 64a8251..3701116 100644 --- a/.gitea/IMPLEMENTATION_GUIDE.md +++ b/.gitea/IMPLEMENTATION_GUIDE.md @@ -10,7 +10,7 @@ This guide will explain every change you can do in the source leak to improve it #### The original code for displaying and saving thumbnails was broken for the Windows platform, either by poor ports or lack of care, in this section it will be explained how to enable this feature for the Windows platform using 4JLibs -In the files ``ConsoleSaveFileOriginal.cpp`` and ``ConsoleSaveFileSplit.cpp`` (the latter might not exist if you are using the December build) there was a mistake when calling ``app.GetSaveThumbnail`` +In the files ``ConsoleSaveFileOriginal.cpp`` and ``ConsoleSaveFileSplit.cpp`` there was a mistake when calling ``app.GetSaveThumbnail`` To fix this issue, you need to replace the line of code: @@ -84,10 +84,10 @@ Then, below that, there's the following chunk of code: You want to modify the ``#else`` conditional to be: ```cpp -#elif defined(__ORBIS__) || defined(__PSVITA__) +#elif defined(__ORBIS__) ``` -This way the Windows platform doesn't try accessing PS4/PSVita functions +This way the Windows platform doesn't try accessing PS4 functions Then you want to comment/remove the following chunk of code: ```cpp @@ -102,13 +102,15 @@ Then you want to comment/remove the following chunk of code: You can replace it for ```cpp - //if(params->saveDetails->pbThumbnailData) - //{ - // m_pbThumbnailData = params->saveDetails->pbThumbnailData; - // m_uiThumbnailSize = params->saveDetails->dwThumbnailSize; - // m_bSaveThumbnailReady = true; - //} - //else +#ifndef _WINDOWS64 + if(params->saveDetails->pbThumbnailData) + { + m_pbThumbnailData = params->saveDetails->pbThumbnailData; + m_uiThumbnailSize = params->saveDetails->dwThumbnailSize; + m_bSaveThumbnailReady = true; + } + else +#endif ``` This is because, for a ``SAVE_DETAILS`` object, the thumbnail data is always pointing to valid memory (aka, it's always allocated) diff --git a/.gitignore b/.gitignore index 8954b22..d3bd8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,7 @@ ipch/ *.suo *.opensdf VS_* -/libs + +# Output Folders +libs/ +inc/ diff --git a/4J_Input/4J_Input.vcxproj b/4J_Input/4J_Input.vcxproj index de07dfc..edb9bd2 100644 --- a/4J_Input/4J_Input.vcxproj +++ b/4J_Input/4J_Input.vcxproj @@ -200,7 +200,6 @@ - Create Level3 Disabled _WINDOWS64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -208,11 +207,15 @@ ../Headers/Windows64;../Headers;$(ProjectDir);$(ProjectDir)Windows64\vendor\SDL\include;%(AdditionalIncludeDirectories) stdafx.h MultiThreadedDebug + true + false + CompileAsCpp Windows true + @@ -236,7 +239,6 @@ Level3 - Create MaxSpeed true true @@ -245,6 +247,8 @@ ../Headers/Windows64;../Headers;$(ProjectDir);$(ProjectDir)Windows64\vendor\SDL\include;%(AdditionalIncludeDirectories) stdafx.h MultiThreaded + true + CompileAsCpp Windows @@ -252,6 +256,7 @@ true true + diff --git a/4J_Profile/4J_Profile.vcxproj b/4J_Profile/4J_Profile.vcxproj index 28dc999..a641a60 100644 --- a/4J_Profile/4J_Profile.vcxproj +++ b/4J_Profile/4J_Profile.vcxproj @@ -114,7 +114,7 @@ - Create + NotUsing Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) @@ -122,6 +122,8 @@ ../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) stdafx.h MultiThreadedDLL + true + false Windows @@ -150,7 +152,7 @@ Level3 - Create + NotUsing MaxSpeed true true @@ -159,6 +161,7 @@ ../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) stdafx.h MultiThreaded + true Windows diff --git a/4J_Render/4J_Render.vcxproj b/4J_Render/4J_Render.vcxproj index edf8281..1babd17 100644 --- a/4J_Render/4J_Render.vcxproj +++ b/4J_Render/4J_Render.vcxproj @@ -144,7 +144,7 @@ - Create + NotUsing Level3 Disabled _WINDOWS64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -152,7 +152,9 @@ ../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) stdafx.h CompileAsCpp - MultiThreadedDLL + MultiThreadedDebug + true + false Windows @@ -188,7 +190,7 @@ Level3 - Create + NotUsing MaxSpeed true true @@ -198,6 +200,7 @@ stdafx.h MultiThreaded CompileAsCpp + true Windows diff --git a/4J_Storage/4J_Storage.vcxproj b/4J_Storage/4J_Storage.vcxproj index 8d357ca..1bdc21c 100644 --- a/4J_Storage/4J_Storage.vcxproj +++ b/4J_Storage/4J_Storage.vcxproj @@ -110,7 +110,7 @@ - Create + NotUsing Level3 Disabled _WINDOWS64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -118,6 +118,8 @@ ../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) stdafx.h MultiThreadedDebug + true + false Windows @@ -146,7 +148,7 @@ Level3 - Create + NotUsing MaxSpeed true true @@ -155,6 +157,7 @@ ../Headers/Windows64;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) stdafx.h MultiThreaded + true Windows diff --git a/4J_XTMS/4J_XTMS.vcxproj b/4J_XTMS/4J_XTMS.vcxproj index a986cfa..d4838bf 100644 --- a/4J_XTMS/4J_XTMS.vcxproj +++ b/4J_XTMS/4J_XTMS.vcxproj @@ -89,7 +89,7 @@ - Create + NotUsing Level3 Disabled _WINDOWS64;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -125,7 +125,7 @@ Level3 - Create + NotUsing MaxSpeed true true