diff --git a/.gitignore b/.gitignore index 03785b6..9493eff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,6 @@ ipch/ VS_* # Output Folders +4J_*/Build/* libs/ inc/ diff --git a/4JLibs.sln b/4JLibs.sln index 7a7a6b7..f6036a6 100644 --- a/4JLibs.sln +++ b/4JLibs.sln @@ -68,58 +68,77 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Durango = Debug|Durango + Debug|ORBIS = Debug|ORBIS Debug|Windows64 = Debug|Windows64 Release|Durango = Release|Durango + Release|ORBIS = Release|ORBIS Release|Windows64 = Release|Windows64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|Durango.ActiveCfg = Debug|Durango {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|Durango.Build.0 = Debug|Durango {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|Durango.Deploy.0 = Debug|Durango + {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|ORBIS.Build.0 = Debug|ORBIS {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|Windows64.ActiveCfg = Debug|x64 {A9125E77-A460-46FB-8EF3-2166F8657226}.Debug|Windows64.Build.0 = Debug|x64 {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|Durango.ActiveCfg = Release|Durango {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|Durango.Build.0 = Release|Durango {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|Durango.Deploy.0 = Release|Durango + {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|ORBIS.ActiveCfg = Release|ORBIS + {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|ORBIS.Build.0 = Release|ORBIS {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|Windows64.ActiveCfg = Release|x64 {A9125E77-A460-46FB-8EF3-2166F8657226}.Release|Windows64.Build.0 = Release|x64 {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|Durango.ActiveCfg = Debug|Durango {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|Durango.Build.0 = Debug|Durango {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|Durango.Deploy.0 = Debug|Durango + {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|ORBIS.Build.0 = Debug|ORBIS {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|Windows64.ActiveCfg = Debug|x64 {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Debug|Windows64.Build.0 = Debug|x64 {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|Durango.ActiveCfg = Release|Durango {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|Durango.Build.0 = Release|Durango {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|Durango.Deploy.0 = Release|Durango + {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|ORBIS.ActiveCfg = Release|ORBIS + {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|ORBIS.Build.0 = Release|ORBIS {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|Windows64.ActiveCfg = Release|x64 {C3833C67-05E4-4D6C-8707-22F95B6939E4}.Release|Windows64.Build.0 = Release|x64 {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|Durango.ActiveCfg = Debug|Durango {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|Durango.Build.0 = Debug|Durango {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|Durango.Deploy.0 = Debug|Durango + {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|ORBIS.Build.0 = Debug|ORBIS {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|Windows64.ActiveCfg = Debug|x64 {22938163-5DDB-4D04-883B-07212EB99FAE}.Debug|Windows64.Build.0 = Debug|x64 {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|Durango.ActiveCfg = Release|Durango {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|Durango.Build.0 = Release|Durango {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|Durango.Deploy.0 = Release|Durango + {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|ORBIS.ActiveCfg = Release|ORBIS + {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|ORBIS.Build.0 = Release|ORBIS {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|Windows64.ActiveCfg = Release|x64 {22938163-5DDB-4D04-883B-07212EB99FAE}.Release|Windows64.Build.0 = Release|x64 {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|Durango.ActiveCfg = Debug|Durango {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|Durango.Build.0 = Debug|Durango {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|Durango.Deploy.0 = Debug|Durango + {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|ORBIS.Build.0 = Debug|ORBIS {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|Windows64.ActiveCfg = Debug|x64 {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Debug|Windows64.Build.0 = Debug|x64 {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|Durango.ActiveCfg = Release|Durango {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|Durango.Build.0 = Release|Durango {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|Durango.Deploy.0 = Release|Durango + {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|ORBIS.ActiveCfg = Release|ORBIS + {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|ORBIS.Build.0 = Release|ORBIS {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|Windows64.ActiveCfg = Release|x64 {2E28BC2E-BF30-4C83-A4D8-C967DD409D70}.Release|Windows64.Build.0 = Release|x64 {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|Durango.ActiveCfg = Debug|Durango {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|Durango.Build.0 = Debug|Durango {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|Durango.Deploy.0 = Debug|Durango + {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|ORBIS.Build.0 = Debug|ORBIS {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Debug|Windows64.ActiveCfg = Debug|x64 {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Release|Durango.ActiveCfg = Release|Durango - {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Release|Durango.Build.0 = Release|Durango - {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Release|Durango.Deploy.0 = Release|Durango + {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Release|ORBIS.ActiveCfg = Release|ORBIS {D0FDED0B-7704-4376-82DC-FF4377A7CD53}.Release|Windows64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/4J_Input/4J_Input.vcxproj b/4J_Input/4J_Input.vcxproj index 0c76dab..c6c2564 100644 --- a/4J_Input/4J_Input.vcxproj +++ b/4J_Input/4J_Input.vcxproj @@ -5,6 +5,10 @@ Debug Durango + + Debug + ORBIS + Debug x64 @@ -13,113 +17,656 @@ Release Durango + + Release + ORBIS + Release x64 + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + - - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + {A9125E77-A460-46FB-8EF3-2166F8657226} @@ -146,6 +693,14 @@ v110 + + Clang + StaticLibrary + + + Clang + StaticLibrary + @@ -159,10 +714,28 @@ $(ProjectName)_d $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ $(ProjectName)_r $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ + + + .a + $(ProjectDir);$(SCE_ORBIS_SDK_DIR)\host_tools\lib\clang\include;$(SCE_ORBIS_SDK_DIR)\target\include;$(SCE_ORBIS_SDK_DIR)\target\include_common; + Build\$(Platform)\$(Configuration)\ + + + .a + $(ProjectDir);$(SCE_ORBIS_SDK_DIR)\host_tools\lib\clang\include;$(SCE_ORBIS_SDK_DIR)\target\include;$(SCE_ORBIS_SDK_DIR)\target\include_common; + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ @@ -216,6 +789,19 @@ ../Headers/Durango;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + + ../Headers/Orbis;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + + NormalWarnings + + + + + ../Headers/Orbis;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + diff --git a/4J_Input/4J_Input.vcxproj.filters b/4J_Input/4J_Input.vcxproj.filters index 74305d5..2afc699 100644 --- a/4J_Input/4J_Input.vcxproj.filters +++ b/4J_Input/4J_Input.vcxproj.filters @@ -291,6 +291,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + @@ -314,5 +326,20 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/4J_Input/Orbis/4J_Input.cpp b/4J_Input/Orbis/4J_Input.cpp new file mode 100644 index 0000000..b7cda3a --- /dev/null +++ b/4J_Input/Orbis/4J_Input.cpp @@ -0,0 +1,14 @@ +#include "INP_OnScreenKeyboard.h" +#include "4J_Input.h" +#include "INP_Main.h" + +//str1k3r - to be renamed SelectBackSwapped +void C_4JInput::SetCircleCrossSwapped(bool swapped) +{ + InternalInputManager.m_iSelectBackSwapped = swapped; +} + +bool C_4JInput::IsCircleCrossSwapped() +{ + return InternalInputManager.m_iSelectBackSwapped; +} \ No newline at end of file diff --git a/4J_Input/Orbis/INP_ForceFeedback.cpp b/4J_Input/Orbis/INP_ForceFeedback.cpp new file mode 100644 index 0000000..e69de29 diff --git a/4J_Input/Orbis/INP_ForceFeedback.h b/4J_Input/Orbis/INP_ForceFeedback.h new file mode 100644 index 0000000..737ae6f --- /dev/null +++ b/4J_Input/Orbis/INP_ForceFeedback.h @@ -0,0 +1,5 @@ +#pragma once + +class CForceFeedback +{ +}; \ No newline at end of file diff --git a/4J_Input/Orbis/INP_Main.cpp b/4J_Input/Orbis/INP_Main.cpp new file mode 100644 index 0000000..e69de29 diff --git a/4J_Input/Orbis/INP_Main.h b/4J_Input/Orbis/INP_Main.h new file mode 100644 index 0000000..3064a26 --- /dev/null +++ b/4J_Input/Orbis/INP_Main.h @@ -0,0 +1,10 @@ +#pragma once + +class CInput +{ +public: + bool m_iSelectBackSwapped; +}; + +// Singleton +extern CInput InternalInputManager; \ No newline at end of file diff --git a/4J_Input/Orbis/INP_OnScreenKeyboard.cpp b/4J_Input/Orbis/INP_OnScreenKeyboard.cpp new file mode 100644 index 0000000..e69de29 diff --git a/4J_Input/Orbis/INP_OnScreenKeyboard.h b/4J_Input/Orbis/INP_OnScreenKeyboard.h new file mode 100644 index 0000000..d719bf0 --- /dev/null +++ b/4J_Input/Orbis/INP_OnScreenKeyboard.h @@ -0,0 +1,5 @@ +#pragma once + +class CKeyboard +{ +}; \ No newline at end of file diff --git a/4J_Input/Orbis/LinkedList.cpp b/4J_Input/Orbis/LinkedList.cpp new file mode 100644 index 0000000..e69de29 diff --git a/4J_Input/Orbis/LinkedList.h b/4J_Input/Orbis/LinkedList.h new file mode 100644 index 0000000..3a5d9d7 --- /dev/null +++ b/4J_Input/Orbis/LinkedList.h @@ -0,0 +1,5 @@ +#pragma once + +class LinkedList +{ +}; \ No newline at end of file diff --git a/4J_Input/Windows64/INP_Main.cpp b/4J_Input/Windows64/INP_Main.cpp index 45d9923..4d34fb1 100644 --- a/4J_Input/Windows64/INP_Main.cpp +++ b/4J_Input/Windows64/INP_Main.cpp @@ -27,11 +27,10 @@ SOFTWARE. CInput InternalInputManager; -bool m_SelectBackSwapped = false; - CInput::CInput() { m_Keyboard = CKeyboard(); + m_bSelectBackSwapped = false; m_uiSigninJoypadMask = 0; for (int i = 0; i < 4; ++i) @@ -414,12 +413,15 @@ bool CInput::IsPadConnected(int iPad) void CInput::SetSelectBackSwapped(bool swapped) { - m_SelectBackSwapped = swapped; + if(m_bSelectBackSwapped != swapped) + { + m_bSelectBackSwapped = swapped; + } } bool CInput::IsSelectBackSwapped() { - return m_SelectBackSwapped; + return m_bSelectBackSwapped; } void CInput::SetSigninJoypadMask(unsigned int mask) diff --git a/4J_Input/Windows64/INP_Main.h b/4J_Input/Windows64/INP_Main.h index 2d80ec0..5b6f529 100644 --- a/4J_Input/Windows64/INP_Main.h +++ b/4J_Input/Windows64/INP_Main.h @@ -166,6 +166,8 @@ public: unsigned int **m_JoypadMap; + bool m_bSelectBackSwapped; + bool m_bJoypadMapArrayIsSetup; unsigned int m_uiSigninJoypadMask; bool m_bIsMenuDisplayed[MAX_JOYPADS]; diff --git a/4J_Input/stdafx.h b/4J_Input/stdafx.h index cd473ea..694cd67 100644 --- a/4J_Input/stdafx.h +++ b/4J_Input/stdafx.h @@ -7,7 +7,16 @@ #include #include -#include +#endif + +#ifdef __ORBIS__ +#include +#include +#include +#include +#include +#include +#include #endif #ifndef _XBOX diff --git a/4J_Profile/4J_Profile.vcxproj b/4J_Profile/4J_Profile.vcxproj index 43040fc..eb81c6c 100644 --- a/4J_Profile/4J_Profile.vcxproj +++ b/4J_Profile/4J_Profile.vcxproj @@ -5,6 +5,10 @@ Debug Durango + + Debug + ORBIS + Debug x64 @@ -13,6 +17,10 @@ Release Durango + + Release + ORBIS + Release x64 @@ -22,86 +30,126 @@ true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true true true + true + true @@ -131,6 +179,14 @@ v110 StaticLibrary + + Clang + StaticLibrary + + + Clang + StaticLibrary + @@ -144,10 +200,12 @@ $(ProjectName)_d $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ $(ProjectName)_r $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ .lib @@ -156,6 +214,18 @@ $(Console_SdkLibPath) $(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath) $(Console_SdkIncludeRoot) + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + .a + + + Build\$(Platform)\$(Configuration)\ + .a @@ -207,6 +277,12 @@ ../Headers/Durango;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + + ../Headers/Orbis;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + NormalWarnings + + diff --git a/4J_Profile/Windows64/PRO_Sys.cpp b/4J_Profile/Windows64/PRO_Sys.cpp index 737124b..551834f 100644 --- a/4J_Profile/Windows64/PRO_Sys.cpp +++ b/4J_Profile/Windows64/PRO_Sys.cpp @@ -2,8 +2,8 @@ #include "4J_Input.h" bool s_bProfileIsFullVersion = true; -char fakeGamerTag[16] = "PlayerName"; -wchar_t fakeGamerTagW[16] = L"PlayerName"; +char fakeGamerTag[XUSER_NAME_SIZE] = "PlayerName"; +wchar_t fakeGamerTagW[XUSER_NAME_SIZE] = L"PlayerName"; CSys::CSys() { @@ -68,7 +68,7 @@ void CSys::SetFakeGamertag(char *name) size_t chars = 0; strcpy_s(fakeGamerTag, name); - mbstowcs_s(&chars, fakeGamerTagW, 16, name, _TRUNCATE); + mbstowcs_s(&chars, fakeGamerTagW, XUSER_NAME_SIZE, name, _TRUNCATE); } char* CSys::GetGamertag(int iPad) @@ -78,7 +78,7 @@ char* CSys::GetGamertag(int iPad) return fakeGamerTag; } - static char iPadGamertag[32]; + char iPadGamertag[XUSER_NAME_SIZE]; _snprintf_s(iPadGamertag, sizeof(iPadGamertag), "%s (%d)", fakeGamerTag, iPad); @@ -92,7 +92,7 @@ wstring CSys::GetDisplayName(int iPad) return fakeGamerTagW; } - wchar_t iPadGamertagW[16]; + wchar_t iPadGamertagW[XUSER_NAME_SIZE]; _snwprintf_s(iPadGamertagW, _countof(iPadGamertagW), L"%s (%d)", fakeGamerTagW, iPad); diff --git a/4J_Profile/stdafx.h b/4J_Profile/stdafx.h index cd473ea..694cd67 100644 --- a/4J_Profile/stdafx.h +++ b/4J_Profile/stdafx.h @@ -7,7 +7,16 @@ #include #include -#include +#endif + +#ifdef __ORBIS__ +#include +#include +#include +#include +#include +#include +#include #endif #ifndef _XBOX diff --git a/4J_Render/4J_Render.vcxproj b/4J_Render/4J_Render.vcxproj index 3330bf5..784b98b 100644 --- a/4J_Render/4J_Render.vcxproj +++ b/4J_Render/4J_Render.vcxproj @@ -5,6 +5,10 @@ Debug Durango + + Debug + ORBIS + Debug x64 @@ -13,6 +17,10 @@ Release Durango + + Release + ORBIS + Release x64 @@ -20,50 +28,173 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + - - - - - - - - - - - - - - - - - + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + {22938163-5DDB-4D04-883B-07212EB99FAE} @@ -90,6 +221,14 @@ v110 + + Clang + StaticLibrary + + + Clang + StaticLibrary + @@ -109,10 +248,26 @@ $(ProjectName)_d $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ $(ProjectName)_r $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + .a + + + Build\$(Platform)\$(Configuration)\ + .a @@ -172,6 +327,12 @@ ../Headers/Durango;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + + ../Headers/Orbis;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + NormalWarnings + + diff --git a/4J_Render/stdafx.h b/4J_Render/stdafx.h index 6084efc..030099e 100644 --- a/4J_Render/stdafx.h +++ b/4J_Render/stdafx.h @@ -7,13 +7,22 @@ #include #include -#include #include #include #include #endif +#ifdef __ORBIS__ +#include +#include +#include +#include +#include +#include +#include +#endif + #ifndef _XBOX #include "extraX64.h" #endif diff --git a/4J_Storage/4J_Storage.vcxproj b/4J_Storage/4J_Storage.vcxproj index f126cc4..9ea021e 100644 --- a/4J_Storage/4J_Storage.vcxproj +++ b/4J_Storage/4J_Storage.vcxproj @@ -5,6 +5,10 @@ Debug Durango + + Debug + ORBIS + Debug x64 @@ -13,6 +17,10 @@ Release Durango + + Release + ORBIS + Release x64 @@ -20,16 +28,37 @@ - - - + + true + true + + + true + true + + + true + true + - - - - + + true + true + + + true + true + + + true + true + + + true + true + {2E28BC2E-BF30-4C83-A4D8-C967DD409D70} @@ -56,6 +85,14 @@ v110 + + Clang + StaticLibrary + + + Clang + StaticLibrary + @@ -69,10 +106,26 @@ $(ProjectName)_d $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ $(ProjectName)_r $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + .a + + + Build\$(Platform)\$(Configuration)\ + .a @@ -124,6 +177,12 @@ ../Headers/Durango;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + + + ../Headers/Orbis;../Headers;$(ProjectDir);%(AdditionalIncludeDirectories) + NormalWarnings + + diff --git a/4J_Storage/stdafx.h b/4J_Storage/stdafx.h index fbe6752..beb2b07 100644 --- a/4J_Storage/stdafx.h +++ b/4J_Storage/stdafx.h @@ -7,11 +7,20 @@ #include #include -#include #include #endif +#ifdef __ORBIS__ +#include +#include +#include +#include +#include +#include +#include +#endif + #ifndef _XBOX #include "extraX64.h" #endif diff --git a/4J_XTMS/4J_XTMS.vcxproj b/4J_XTMS/4J_XTMS.vcxproj index 1052c79..96a072e 100644 --- a/4J_XTMS/4J_XTMS.vcxproj +++ b/4J_XTMS/4J_XTMS.vcxproj @@ -5,6 +5,10 @@ Debug Durango + + Debug + ORBIS + Debug x64 @@ -13,6 +17,10 @@ Release Durango + + Release + ORBIS + Release x64 @@ -43,6 +51,12 @@ v110 + + Clang + + + Clang + @@ -55,9 +69,23 @@ $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ $(SolutionDir)\libs\ + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ + + + Build\$(Platform)\$(Configuration)\ diff --git a/Headers/extraX64.h b/Headers/extraX64.h index 653b0e1..b907918 100644 --- a/Headers/extraX64.h +++ b/Headers/extraX64.h @@ -8,14 +8,14 @@ #define MULTITHREAD_ENABLE -//const int XUSER_INDEX_ANY = 255; +const int XUSER_INDEX_ANY = 255; const int XUSER_INDEX_FOCUS = 254; #ifdef __PSVITA__ const int XUSER_MAX_COUNT = 1; const int MINECRAFT_NET_MAX_PLAYERS = 4; #else -//const int XUSER_MAX_COUNT = 4; +const int XUSER_MAX_COUNT = 4; const int MINECRAFT_NET_MAX_PLAYERS = 8; #endif