Seth/Orbis-Suite-3.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix include paths & update libjc submodule

Browse Source
This commit is contained in:
Greg
2022-11-30 19:11:37 -07:00
parent ffa01a182b
commit 54f213119c
7 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
External/ps4-libjbc
Vendored
+1 -1
Submodule External/ps4-libjbc updated: 9910dcc146...d069c281dd
Playstation/OrbisLibAPI/Common.h
+20
View File
@@ -1 +1,21 @@
#pragma once
#include <math.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
#include <orbis/libkernel.h>
#include <orbis/SystemService.h>
#include <orbis/AppInstUtil.h>
#include <orbis/Bgft.h>
#include <orbis/Sysmodule.h>
#include <orbis/UserService.h>
#include <orbis/Sysmodule.h>
#include <orbis/SystemService.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
Playstation/OrbisLibAPI/OrbisLibAPI.vcxproj
+2 -1
View File
@@ -50,7 +50,8 @@ call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"</NMakeReBuildCommandLi
del /s /q /f $(IntDir)\*.elf
del /s /q /f $(IntDir)\*.oelf</NMakeCleanCommandLine>
<OutDir>$(SolutionDir)</OutDir>
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<NMakeIncludeSearchPath>$(OO_PS4_TOOLCHAIN)\include;External\ps4-libjbc;External\GoldHEN_Plugins_SDK\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>E:\Greg\Repos\Orbis-Suite-3.0\External\ps4-libjbc;E:\Greg\Repos\Orbis-Suite-3.0\External\GoldHEN_Plugins_SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeOutput>eboot.bin</NMakeOutput>
Playstation/OrbisLibAPI/build.bat
+2 -2
View File
@@ -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" -I"..\\..\\External\\GoldHEN_Plugins_SDK\\include" -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" -I"..\\..\\External\\ps4-libjbc" -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" "-L..\\..\\External\\GoldHEN_Plugins_SDK" %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% "..\\..\\External\\ps4-libjbc\\jbc.o"
Rem Create the eboot
%OO_PS4_TOOLCHAIN%\bin\windows\create-fself.exe -in "%outputElf%" --out "%outputOelf%" --eboot "eboot.bin"
Playstation/OrbisLibAPI/main.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "Common.h"
#include "GoldHEN.h"
int main()
{
Playstation/OrbisSuite/OrbisSuite.vcxproj
+2 -2
View File
@@ -75,8 +75,8 @@ call build.bat $(IntDir) "$(TargetName)" "$(SolutionDir)"</NMakeReBuildCommandLi
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>
<NMakeIncludeSearchPath>External\GoldHEN_Plugins_SDK\include;$(OO_PS4_TOOLCHAIN)\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>E:\Greg\Repos\Orbis-Suite-3.0\External\GoldHEN_Plugins_SDK\include;$(IncludePath)</IncludePath>
<SourcePath>External\GoldHEN_Plugins_SDK\source;$(SourcePath)</SourcePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Playstation/OrbisSuite/main.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "Common.h"
#include "../../External/GoldHEN_Plugins_SDK/include/GoldHEN.h"
#include "GoldHEN.h"
int main()
{