Browse Source

some psy-q-sdk bindings added to the rtl compilation

Kirill Kranz 10 months ago
parent
commit
7e73ccf915
2 changed files with 5 additions and 11 deletions
  1. 2 4
      rtl/ps1/Makefile
  2. 3 7
      rtl/ps1/Makefile.fpc

+ 2 - 4
rtl/ps1/Makefile

@@ -923,14 +923,14 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
 override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-ps1)
-override TARGET_UNITS+=$(SYSTEMUNIT) $(OBJPASUNIT) $(FPINTRESUNIT)
+override TARGET_UNITS+=$(SYSTEMUNIT) $(OBJPASUNIT) $(FPINTRESUNIT) libstd libetc libgpu libgte
 endif
 override INSTALL_FPCPACKAGE=y y
 ifeq ($(CPU_OS_TARGET),mipsel-ps1)
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
 endif
 ifeq ($(CPU_OS_TARGET),mipsel-ps1)
-override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) ./psy-q-sdk
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -2922,5 +2922,3 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(FPINTRESUNIT)$(PPUEXT)
-	$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl

+ 3 - 7
rtl/ps1/Makefile.fpc

@@ -5,7 +5,7 @@
 main=rtl
 [target]
 loaders=
-units=$(SYSTEMUNIT) $(OBJPASUNIT) $(FPINTRESUNIT)
+units=$(SYSTEMUNIT) $(OBJPASUNIT) $(FPINTRESUNIT) libstd libetc libgpu libgte
 
 [require]
 nortl=y
@@ -16,7 +16,7 @@ target=ps1
 cpu=mipsel
 [compiler]
 includedir=$(INC) $(PROCINC)
-sourcedir=$(INC) $(PROCINC) $(COMMON)
+sourcedir=$(INC) $(PROCINC) $(COMMON) ./psy-q-sdk
 [prerules]
 RTL=..
 INC=../inc
@@ -50,8 +50,4 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 
 #
 # Loaders
-#
-
-
-buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(FPINTRESUNIT)$(PPUEXT)
-        $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
+#