Port to use GoldHEN for kernel, add libjbc project and API Daemon
This commit is contained in:
Greg
+4
-1
@@ -5,4 +5,7 @@
|
||||
[submodule "External/GoldHEN_Plugins_SDK"]
|
||||
path = External/GoldHEN_Plugins_SDK
|
||||
url = https://github.com/GoldHEN/GoldHEN_Plugins_SDK
|
||||
shallow = true
|
||||
shallow = true
|
||||
[submodule "External/ps4-libjbc"]
|
||||
path = External/ps4-libjbc
|
||||
url = https://github.com/OSM-Made/ps4-libjbc
|
||||
|
||||
Vendored
+1
-1
Submodule External/GoldHEN_Plugins_SDK updated: 20991d2244...4d706c6123
+1
Submodule External/ps4-libjbc added at 9910dcc146
+19
-1
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Playstation", "Playstation"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{DBCE3AAD-373D-4EB6-8964-2A4BE1E9F575}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
Misc\DriverDefinitions.h = Misc\DriverDefinitions.h
|
||||
Misc\Increment.bat = Misc\Increment.bat
|
||||
EndProjectSection
|
||||
EndProject
|
||||
@@ -50,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetupBA", "Windows\Installe
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrbisLibraryManager", "Windows\OrbisLibraryManager\OrbisLibraryManager.csproj", "{53869FE9-BAFF-4FED-B8E3-20660865426C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OrbisLibAPI", "Playstation\OrbisLibAPI\OrbisLibAPI.vcxproj", "{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -206,6 +207,22 @@ Global
|
||||
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{53869FE9-BAFF-4FED-B8E3-20660865426C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Any CPU.Build.0 = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Win32.ActiveCfg = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|Win32.Build.0 = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x64.Build.0 = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x86.ActiveCfg = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Debug|x86.Build.0 = Debug|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Any CPU.Build.0 = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Win32.ActiveCfg = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|Win32.Build.0 = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x64.ActiveCfg = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x64.Build.0 = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x86.ActiveCfg = Release|x64
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121}.Release|x86.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -222,6 +239,7 @@ Global
|
||||
{A37095E9-80BD-4A6B-AF8B-33D278CF92F3} = {6046C772-BE17-4BC8-A362-AD8C77F9178E}
|
||||
{33C378F9-36C5-4C2C-8350-FD1C8DD5AB66} = {6046C772-BE17-4BC8-A362-AD8C77F9178E}
|
||||
{53869FE9-BAFF-4FED-B8E3-20660865426C} = {8F0E1457-FB1E-47A4-9DA8-74A6B757CAA4}
|
||||
{22E600CA-B7A4-4FA1-A1DB-6BA4736E6121} = {8E8E4C8D-E3E1-4CB9-BD78-7ADAB2F2CF45}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {4B6EE1D0-5ADF-44A2-B6EE-E5C8E110EE47}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
Binary file not shown.
@@ -33,6 +33,11 @@
|
||||
<file targ_path="sce_sys/pic0.png" orig_path="sce_sys\pic0.png" />
|
||||
<file targ_path="sce_sys/pic1.png" orig_path="sce_sys\pic1.png" />
|
||||
<file targ_path="Orbis Toolbox/OrbisToolbox-2.0.sprx" orig_path="Orbis Toolbox\OrbisToolbox-2.0.sprx" />
|
||||
<file targ_path="Daemons/ORBS30000/sce_module/libc.prx" orig_path="Daemons\ORBS30000\sce_module\libc.prx" />
|
||||
<file targ_path="Daemons/ORBS30000/sce_module/libSceFios2.prx" orig_path="Daemons\ORBS30000\sce_module\libSceFios2.prx" />
|
||||
<file targ_path="Daemons/ORBS30000/sce_sys/icon0.png" orig_path="Daemons\ORBS30000\sce_sys\icon0.png" />
|
||||
<file targ_path="Daemons/ORBS30000/sce_sys/param" orig_path="Daemons\ORBS30000\sce_sys\param" />
|
||||
<file targ_path="Daemons/ORBS30000/eboot.bin" orig_path="Daemons\ORBS30000\eboot.bin" />
|
||||
</files>
|
||||
<rootdir>
|
||||
<dir targ_name="Orbis Toolbox">
|
||||
@@ -40,6 +45,11 @@
|
||||
</dir>
|
||||
<dir targ_name="sce_module" />
|
||||
<dir targ_name="sce_sys" />
|
||||
<dir targ_name="Daemons" />
|
||||
<dir targ_name="Daemons">
|
||||
<dir targ_name="ORBS30000">
|
||||
<dir targ_name="sce_module" />
|
||||
<dir targ_name="sce_sys" />
|
||||
</dir>
|
||||
</dir>
|
||||
</rootdir>
|
||||
</psproject>
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
#pragma once
|
||||
@@ -0,0 +1,71 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<VCProjectVersion>15.0</VCProjectVersion>
|
||||
<ProjectGuid>{22e600ca-b7a4-4fa1-a1db-6ba4736e6121}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="Shared">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<NMakeOutput>eboot.bin</NMakeOutput>
|
||||
<NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
|
||||
<NMakeBuildCommandLine>call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>del /s /q /f $(IntDir)\*.o
|
||||
del /s /q /f $(IntDir)\*.elf
|
||||
del /s /q /f $(IntDir)\*.oelf
|
||||
call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>del /s /q /f $(IntDir)\*.o
|
||||
del /s /q /f $(IntDir)\*.elf
|
||||
del /s /q /f $(IntDir)\*.oelf</NMakeCleanCommandLine>
|
||||
<OutDir>$(SolutionDir)</OutDir>
|
||||
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<NMakeOutput>eboot.bin</NMakeOutput>
|
||||
<NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp" />
|
||||
<ClCompile Include="build.bat" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Common.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="build.bat" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Common.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,31 @@
|
||||
SETLOCAL EnableDelayedExpansion
|
||||
|
||||
Rem Libraries to link in
|
||||
set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog -lGoldHEN_Hook
|
||||
|
||||
Rem Read the script arguments into local vars
|
||||
set intdir=%1
|
||||
set targetname=%~2
|
||||
set outputPath=%3
|
||||
|
||||
set outputElf=%intdir%%targetname%.elf
|
||||
set outputOelf=%intdir%%targetname%.oelf
|
||||
|
||||
Rem Compile object files for all the source files
|
||||
for %%f in (*.cpp) do (
|
||||
clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -I"..\\..\\External\\GoldHEN_Plugins_SDK\\include" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
|
||||
)
|
||||
|
||||
Rem Get a list of object files for linking
|
||||
set obj_files=
|
||||
for %%f in (%1\\*.o) do set obj_files=!obj_files! .\%%f
|
||||
|
||||
Rem Link the input ELF
|
||||
ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" "-L..\\..\\External\\GoldHEN_Plugins_SDK" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
|
||||
|
||||
Rem Create the eboot
|
||||
%OO_PS4_TOOLCHAIN%\bin\windows\create-fself.exe -in "%outputElf%" --out "%outputOelf%" --eboot "eboot.bin"
|
||||
|
||||
Rem Cleanup
|
||||
copy "eboot.bin" %outputPath%\Playstation\Build\pkg\Daemons\ORBS30000\eboot.bin
|
||||
del "eboot.bin"
|
||||
@@ -0,0 +1,7 @@
|
||||
#include "Common.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
// Your code here...
|
||||
return 0;
|
||||
}
|
||||
@@ -76,6 +76,8 @@ del /s /q /f $(IntDir)\*.elf
|
||||
del /s /q /f $(IntDir)\*.oelf</NMakeCleanCommandLine>
|
||||
<OutDir>$(SolutionDir)</OutDir>
|
||||
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
|
||||
<IncludePath>External\GoldHEN_Plugins_SDK\include;$(IncludePath)</IncludePath>
|
||||
<SourcePath>External\GoldHEN_Plugins_SDK\source;$(SourcePath)</SourcePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
|
||||
|
||||
@@ -99,11 +99,6 @@ void InstallDaemon(const char* Daemon)
|
||||
sprintf(IconPath, "%s%s/sce_sys/icon0.png", DAEMONPATH, Daemon);
|
||||
CopyFile(IconFromPath, IconPath);
|
||||
|
||||
char LibjbcFromPath[0x100], LibjbcPath[0x100];
|
||||
sprintf(LibjbcFromPath, "%s%s/sce_module/libjbc.sprx", DAEMONGETPATH, Daemon);
|
||||
sprintf(LibjbcPath, "%s%s/sce_module/libjbc.sprx", DAEMONPATH, Daemon);
|
||||
CopyFile(LibjbcFromPath, LibjbcPath);
|
||||
|
||||
klog("[%s] Installation Success!\n", Daemon);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
SETLOCAL EnableDelayedExpansion
|
||||
|
||||
Rem Libraries to link in
|
||||
set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog
|
||||
set libraries=-lc++ -lc -lSceSysModule -lkernel -lSceVideoOut -lSceSystemService -lSceSysCore -lSceSystemStateMgr -lSceNet -lScePad -lSceUserService -lSceRegMgr -lSceFreeType -lSceMsgDialog -lSceCommonDialog -lGoldHEN_Hook
|
||||
|
||||
Rem Read the script arguments into local vars
|
||||
set intdir=%1
|
||||
@@ -13,7 +13,7 @@ set outputOelf=%intdir%%targetname%.oelf
|
||||
|
||||
Rem Compile object files for all the source files
|
||||
for %%f in (*.cpp) do (
|
||||
clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
|
||||
clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -I"..\\..\\External\\GoldHEN_Plugins_SDK\\include" -DORBISLIB_DEBUG -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
|
||||
)
|
||||
|
||||
Rem Get a list of object files for linking
|
||||
@@ -21,7 +21,7 @@ set obj_files=
|
||||
for %%f in (%1\\*.o) do set obj_files=!obj_files! .\%%f
|
||||
|
||||
Rem Link the input ELF
|
||||
ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
|
||||
ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\\lib" "-L..\\..\\External\\GoldHEN_Plugins_SDK" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crt1.o" %obj_files%
|
||||
|
||||
Rem Create the eboot
|
||||
%OO_PS4_TOOLCHAIN%\bin\windows\create-fself.exe -in "%outputElf%" --out "%outputOelf%" --eboot "eboot.bin"
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#include "Common.h"
|
||||
|
||||
#define DEBUG_BUILD
|
||||
#include "../../External/GoldHEN_Plugins_SDK/include/GoldHEN.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
@@ -12,9 +11,19 @@ int main()
|
||||
return 0;
|
||||
}
|
||||
|
||||
//TODO: Bug? This doesnt seem to work for some reason.
|
||||
// Check GoldHEN SDK Version make sure we can run!
|
||||
auto sdkVersion = sys_sdk_version();
|
||||
if (sdkVersion < GOLDHEN_SDK_VERSION)
|
||||
{
|
||||
Notify("Invalid GoldHEN SDK Version %d Orbis Toolbox supports %d+", sdkVersion, GOLDHEN_SDK_VERSION);
|
||||
sceSystemServiceLoadExec("exit", 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Use future GoldHEN JB
|
||||
jailbreak_backup jb1;
|
||||
sys_sdk_jailbreak(&jb1);
|
||||
|
||||
//MakeDirs
|
||||
MakeDir("/data/Orbis Suite");
|
||||
@@ -23,19 +32,21 @@ int main()
|
||||
mount_large_fs("/dev/da0x4.crypt", "/system", "exfatfs", "511", MNT_UPDATE);
|
||||
|
||||
// Install all the things! :D
|
||||
//InstallDaemon("ORBS30000"); // Orbis Lib
|
||||
InstallDaemon("ORBS30000"); // Orbis Lib
|
||||
InstallOrbisToolbox();
|
||||
|
||||
// Pull module list of SceShellUI to see if we should unload the toolbox.
|
||||
//TODO: Pull module list of SceShellUI to see if we should unload the toolbox.
|
||||
|
||||
// Use GoldHEN SDK to load PRX to SceShellUI.
|
||||
/*
|
||||
|
||||
auto Handle = OrbisDriver::LoadSPRX("SceShellUI", "/data/Orbis Toolbox/OrbisToolbox-2.0.sprx");
|
||||
if (Handle > 0)
|
||||
klog("Orbis Toolbox loaded! %d\n", Handle);
|
||||
auto Handle = sys_sdk_proc_prx_load("SceShellUI", "/user/data/Orbis Toolbox/OrbisToolbox-2.0.sprx");
|
||||
|
||||
*/
|
||||
if (Handle > 0)
|
||||
klog("Orbis Toolbox loaded! %d\n", Handle);
|
||||
else
|
||||
{
|
||||
klog("error: %d\n", Handle);
|
||||
Notify("Failed to load Orbis Toolbox!");
|
||||
}
|
||||
|
||||
sceSystemServiceLoadExec("exit", 0);
|
||||
|
||||
|
||||
@@ -54,6 +54,7 @@ del /s /q /f $(IntDir)\*.elf
|
||||
del /s /q /f $(IntDir)\*.oelf</NMakeCleanCommandLine>
|
||||
<OutDir>$(SolutionDir)</OutDir>
|
||||
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
|
||||
<ExternalIncludePath>External\GoldHEN_Plugins_SDK\include;$(ExternalIncludePath)</ExternalIncludePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
|
||||
|
||||
@@ -174,9 +174,6 @@
|
||||
<ClInclude Include="Detour.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="hde64.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Patcher.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
@@ -195,9 +192,6 @@
|
||||
<ClInclude Include="SysfileUtilWrapper.h">
|
||||
<Filter>Header Files\Utilities\Mono</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="table64.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Flash.h">
|
||||
<Filter>Header Files\Utilities\PS Utils</Filter>
|
||||
</ClInclude>
|
||||
@@ -216,6 +210,12 @@
|
||||
<ClInclude Include="NetWrapper.h">
|
||||
<Filter>Header Files\Utilities\Mono</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="table64.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="hde64.h">
|
||||
<Filter>Header Files\Utilities\Memory Utils</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="OrbisToolbox.cpp">
|
||||
@@ -308,9 +308,6 @@
|
||||
<ClCompile Include="Detour.cpp">
|
||||
<Filter>Source Files\Utilities\Memory Utils</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="hde64.cpp">
|
||||
<Filter>Source Files\Utilities\Memory Utils</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Patcher.cpp">
|
||||
<Filter>Source Files\Utilities\Memory Utils</Filter>
|
||||
</ClCompile>
|
||||
@@ -332,6 +329,9 @@
|
||||
<ClCompile Include="NetWrapper.cpp">
|
||||
<Filter>Source Files\Utilities\Mono</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="hde64.cpp">
|
||||
<Filter>Source Files\Utilities\Memory Utils</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Xml Include="external_hdd.xml">
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#pragma once
|
||||
#define ORBIS_TOOLBOX_MAJOR 2
|
||||
#define ORBIS_TOOLBOX_MINOR 0
|
||||
#define ORBIS_TOOLBOX_BUILDVERSION 198
|
||||
#define stringify(a) stringify_(a)
|
||||
#define stringify_(a) #a
|
||||
#if defined(ORBIS_TOOLBOX_DEBUG)
|
||||
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
|
||||
#else
|
||||
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
|
||||
#endif
|
||||
#pragma once
|
||||
#define ORBIS_TOOLBOX_MAJOR 2
|
||||
#define ORBIS_TOOLBOX_MINOR 0
|
||||
#define ORBIS_TOOLBOX_BUILDVERSION 218
|
||||
#define stringify(a) stringify_(a)
|
||||
#define stringify_(a) #a
|
||||
#if defined(ORBIS_TOOLBOX_DEBUG)
|
||||
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Dev Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
|
||||
#else
|
||||
#define ORBIS_TOOLBOX_BUILDSTRING ("[Orbis Toolbox " stringify(ORBIS_TOOLBOX_MAJOR) "." stringify(ORBIS_TOOLBOX_MINOR) "] Build " stringify(ORBIS_TOOLBOX_BUILDVERSION) " " __DATE__ " " __TIME__)
|
||||
#endif
|
||||
|
||||
@@ -13,7 +13,7 @@ set outputOelf=%intdir%%targetname%.oelf
|
||||
set outputPrx=%intdir%%targetname%.prx
|
||||
set outputStub=%intdir%%targetname%_stub.so
|
||||
|
||||
Rem Compile object files for all the source files -DORBIS_TOOLBOX_DEBUG
|
||||
Rem Compile object files for all the source files
|
||||
for %%f in (*.cpp) do (
|
||||
clang++ -cc1 -triple x86_64-scei-ps4-elf -I"%OO_PS4_TOOLCHAIN%\include" -I"%OO_PS4_TOOLCHAIN%\\include\\c++\\v1" -emit-obj -o %intdir%\%%~nf.o %%~nf.cpp
|
||||
)
|
||||
@@ -28,7 +28,7 @@ set obj_files=
|
||||
for %%f in (%intdir%\\*.o) do set obj_files=!obj_files! .\%%f
|
||||
|
||||
Rem Link the input ELF
|
||||
ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\lib" %libraries% --verbose "%OO_PS4_TOOLCHAIN%\lib\crtlib.o" %obj_files%
|
||||
ld.lld -m elf_x86_64 -pie --script "%OO_PS4_TOOLCHAIN%\link.x" --eh-frame-hdr -o "%outputElf%" "-L%OO_PS4_TOOLCHAIN%\lib" %libraries% --verbose "..\\..\\External\\GoldHEN_Plugins_SDK\\build\\crtprx.o" %obj_files%
|
||||
|
||||
Rem Create stub shared libraries
|
||||
for %%f in (*.cpp) do (
|
||||
@@ -49,15 +49,15 @@ del "%outputPrx%"
|
||||
|
||||
REM Generate the script. Will overwrite any existing temp.txt
|
||||
REM echo open 192.168.0.54 1337> temp.txt
|
||||
echo open 192.168.0.54 2121> temp.txt
|
||||
echo anonymous>> temp.txt
|
||||
echo anonymous>> temp.txt
|
||||
echo cd "/data/Orbis Toolbox/">> temp.txt
|
||||
echo send "%outputPath%\Playstation\Build\pkg\Orbis Toolbox\%targetname%.sprx">> temp.txt
|
||||
echo quit>> temp.txt
|
||||
REM echo open 192.168.0.54 2121> temp.txt
|
||||
REM echo anonymous>> temp.txt
|
||||
REM echo anonymous>> temp.txt
|
||||
REM echo cd "/data/Orbis Toolbox/">> temp.txt
|
||||
REM echo send "%outputPath%\Playstation\Build\pkg\Orbis Toolbox\%targetname%.sprx">> temp.txt
|
||||
REM echo quit>> temp.txt
|
||||
|
||||
REM Launch FTP and pass it the script
|
||||
ftp -s:temp.txt
|
||||
REM ftp -s:temp.txt
|
||||
|
||||
REM Clean up.
|
||||
del temp.txt
|
||||
REM del temp.txt
|
||||
@@ -1 +1 @@
|
||||
1369
|
||||
1382
|
||||
|
||||
@@ -1 +1 @@
|
||||
Version 3.0.1369 Debug Build Sunday November 13 2022 10:27 AM
|
||||
Version 3.0.1382 Debug Build Wednesday November 30 2022 3:20 PM
|
||||
|
||||
Reference in New Issue
Block a user