Replace all $PSLIGHT with $DEVKITPS3 and PSL1GHT_INC/PSL1GHT_LIB with…

… the counterparts. Moved spu_rules and ppu_rules back to host root.
foobar-d · Apr 12, 2011 · 577dbb8 · 577dbb8
1 parent 782506e
commit 577dbb8
Show file tree

Hide file tree

Showing 52 changed files with 238 additions and 238 deletions.
diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:
@@ -14,12 +14,12 @@ all:
 	@make -C tools --no-print-directory
 
 install-ctrl:
-	@[ -d $(PSL1GHT) ] || mkdir -p $(PSL1GHT)
-	@[ -d $(PSL1GHT)/ppu ] || mkdir -p $(PSL1GHT)/ppu
-	@[ -d $(PSL1GHT)/spu ] || mkdir -p $(PSL1GHT)/spu
-	@cp -frv base_rules $(PSL1GHT)
-	@cp -frv ppu_rules $(PSL1GHT)/ppu
-	@cp -frv spu_rules $(PSL1GHT)/spu
+	@[ -d $(DEVKITPS3) ] || mkdir -p $(DEVKITPS3)
+	@[ -d $(DEVKITPS3)/ppu ] || mkdir -p $(DEVKITPS3)/ppu
+	@[ -d $(DEVKITPS3)/spu ] || mkdir -p $(DEVKITPS3)/spu
+	@cp -frv base_rules $(DEVKITPS3)
+	@cp -frv ppu_rules $(DEVKITPS3)/ppu
+	@cp -frv spu_rules $(DEVKITPS3)/spu
 
 install-socat:
 	@make -C tools install-socat --no-print-directory	

diff --git a/common/Makefile b/common/Makefile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:

diff --git a/common/libsimdmath/Makefile b/common/libsimdmath/Makefile
@@ -1,5 +1,5 @@
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:

diff --git a/common/libsimdmath/ppu/Makefile b/common/libsimdmath/ppu/Makefile
@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 
@@ -63,14 +63,14 @@ ppu:
 #---------------------------------------------------------------------------------
 install-header:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/include/simdmath ] || mkdir -p $(PSL1GHT)/ppu/include/simdmath
-	@cp -frv $(CURDIR)/../common/simdmath.h $(PSL1GHT)/ppu/include/simdmath
+	@[ -d $(DEVKITPS3)/ppu/include/simdmath ] || mkdir -p $(DEVKITPS3)/ppu/include/simdmath
+	@cp -frv $(CURDIR)/../common/simdmath.h $(DEVKITPS3)/ppu/include/simdmath
 
 #---------------------------------------------------------------------------------
 install: install-header
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: $(OBJS)	

diff --git a/common/libsimdmath/spu/Makefile b/common/libsimdmath/spu/Makefile
@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/spu/spu_rules
+include	$(DEVKITPS3)/spu_rules
 
 BUILD		:=	build
 
@@ -72,14 +72,14 @@ spu:
 #---------------------------------------------------------------------------------
 install-header:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/spu/include/simdmath ] || mkdir -p $(PSL1GHT)/spu/include/simdmath
-	@cp -frv $(CURDIR)/../common/simdmath.h $(PSL1GHT)/spu/include/simdmath
+	@[ -d $(DEVKITPS3)/spu/include/simdmath ] || mkdir -p $(DEVKITPS3)/spu/include/simdmath
+	@cp -frv $(CURDIR)/../common/simdmath.h $(DEVKITPS3)/spu/include/simdmath
 
 #---------------------------------------------------------------------------------
 install: install-header
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/spu/lib ] || mkdir -p $(PSL1GHT)/spu/lib
-	@cp -frv $(CURDIR)/lib/spu/*.a $(PSL1GHT)/spu/lib
+	@[ -d $(DEVKITPS3)/spu/lib ] || mkdir -p $(DEVKITPS3)/spu/lib
+	@cp -frv $(CURDIR)/lib/spu/*.a $(DEVKITPS3)/spu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: $(OBJS)	

diff --git a/common/vectormath/Makefile b/common/vectormath/Makefile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:

diff --git a/common/vectormath/ppu/Makefile b/common/vectormath/ppu/Makefile
@@ -3,16 +3,16 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:
 
 install:
-	@[ -d $(PSL1GHT)/ppu/include/vectormath ] || mkdir -p $(PSL1GHT)/ppu/include/vectormath
-	@cp -frv $(CURDIR)/c $(PSL1GHT)/ppu/include/vectormath
-	@cp -frv $(CURDIR)/cpp $(PSL1GHT)/ppu/include/vectormath
+	@[ -d $(DEVKITPS3)/ppu/include/vectormath ] || mkdir -p $(DEVKITPS3)/ppu/include/vectormath
+	@cp -frv $(CURDIR)/c $(DEVKITPS3)/ppu/include/vectormath
+	@cp -frv $(CURDIR)/cpp $(DEVKITPS3)/ppu/include/vectormath
 
 clean:
 

diff --git a/common/vectormath/spu/Makefile b/common/vectormath/spu/Makefile
@@ -3,16 +3,16 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:
 
 install:
-	@[ -d $(PSL1GHT)/spu/include/vectormath ] || mkdir -p $(PSL1GHT)/spu/include/vectormath
-	@cp -frv $(CURDIR)/c $(PSL1GHT)/spu/include/vectormath
-	@cp -frv $(CURDIR)/cpp $(PSL1GHT)/spu/include/vectormath
+	@[ -d $(DEVKITPS3)/spu/include/vectormath ] || mkdir -p $(DEVKITPS3)/spu/include/vectormath
+	@cp -frv $(CURDIR)/c $(DEVKITPS3)/spu/include/vectormath
+	@cp -frv $(CURDIR)/cpp $(DEVKITPS3)/spu/include/vectormath
 
 clean:
 

diff --git a/ppu/Makefile b/ppu/Makefile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:
@@ -14,8 +14,8 @@ all:
 	@make -C librsx --no-print-directory
 
 install-headers:
-	@[ -d $(PSL1GHT)/ppu ] || mkdir -p $(PSL1GHT)/ppu
-	@cp -frv include $(PSL1GHT)/ppu
+	@[ -d $(DEVKITPS3)/ppu ] || mkdir -p $(DEVKITPS3)/ppu
+	@cp -frv include $(DEVKITPS3)/ppu
 
 install: install-headers
 	@make -C crt install --no-print-directory

diff --git a/ppu/crt/Makefile b/ppu/crt/Makefile
@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 
@@ -55,8 +55,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@cp -frv $(CURDIR)/ppu/lv2-*.o $(PSL1GHT)/ppu/ppu/lib
-	@cp -frv $(CURDIR)/lv2.ld $(PSL1GHT)/ppu/ppu/lib
+	@cp -frv $(CURDIR)/ppu/lv2-*.o $(DEVKITPS3)/ppu/ppu/lib
+	@cp -frv $(CURDIR)/lv2.ld $(DEVKITPS3)/ppu/ppu/lib
 
 .PHONY: crts ppu install
 

diff --git a/ppu/librsx/Makefile b/ppu/librsx/Makefile
@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 
@@ -58,8 +58,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: $(OBJS)	

diff --git a/ppu/librt/Makefile b/ppu/librt/Makefile
@@ -3,11 +3,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 
@@ -59,8 +59,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: $(OBJS)	

diff --git a/ppu/sprx/Makefile b/ppu/sprx/Makefile
@@ -1,5 +1,5 @@
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
 all:

diff --git a/ppu/sprx/libaudio/Makefile b/ppu/sprx/libaudio/Makefile
@@ -1,11 +1,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 SOURCES		:=	../common .
@@ -71,8 +71,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: sprx.o

diff --git a/ppu/sprx/libgcm_sys/Makefile b/ppu/sprx/libgcm_sys/Makefile
@@ -1,11 +1,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 SOURCES		:=	../common .
@@ -71,8 +71,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: sprx.o gcm_wrapper.o

diff --git a/ppu/sprx/libgem/Makefile b/ppu/sprx/libgem/Makefile
@@ -1,11 +1,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 SOURCES		:=	../common .
@@ -71,8 +71,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: sprx.o

diff --git a/ppu/sprx/libio/Makefile b/ppu/sprx/libio/Makefile
@@ -1,11 +1,11 @@
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
+ifeq ($(strip $(DEVKITPS3)),)
+$(error "Please set DEVKITPS3 in your environment. export DEVKITPS3=<path>")
 endif
 
-include	$(PSL1GHT)/ppu/ppu_rules
+include	$(DEVKITPS3)/ppu_rules
 
 BUILD		:=	build
 SOURCES		:=	../common .
@@ -71,8 +71,8 @@ ppu:
 #---------------------------------------------------------------------------------
 install:
 #---------------------------------------------------------------------------------
-	@[ -d $(PSL1GHT)/ppu/lib ] || mkdir -p $(PSL1GHT)/ppu/lib
-	@cp -frv $(CURDIR)/lib/ppu/*.a $(PSL1GHT)/ppu/lib
+	@[ -d $(DEVKITPS3)/ppu/lib ] || mkdir -p $(DEVKITPS3)/ppu/lib
+	@cp -frv $(CURDIR)/lib/ppu/*.a $(DEVKITPS3)/ppu/lib
 
 #---------------------------------------------------------------------------------
 $(LIBRARY).a: sprx.o