diff --git a/Makefile.griffin b/Makefile.griffin
index e32982ab7f..9de7bc8788 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -41,6 +41,14 @@ INCLUDE :=
 LDFLAGS :=
 LIBDIRS := 
 
+SHADER_DIR      := media/shaders
+OVERLAY_DIR     := media/overlays
+SHADER_GLSL_DIR := media/shaders_glsl
+
+PYTHON2		= python2$(EXE_EXT)
+PYTHON3		= python3$(EXE_EXT)
+GIT			= git$(EXE_EXT)
+
 ifeq ($(platform), ngc)
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
@@ -65,6 +73,12 @@ endif
   HAVE_ZLIB                := 1
   HAVE_RPNG                := 1
   HAVE_OVERLAY             := 1
+else ifeq ($(platform), ps3)
+	#TODO
+  MEDIA_SHADER_DIR := ps3/pkg/USRDIR/cores/shaders
+else ifeq ($(platform), ps3-cobra)
+	#TODO
+  MEDIA_SHADER_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders
 else ifeq ($(platform), wii)
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
@@ -197,6 +211,50 @@ else ifeq ($(platform), psp1)
 	psp-fixup-imports$(EXT) $(EXT_TARGET)
 endif
 
+shaders-checkout:
+	@if test -d $(SHADER_DIR); then \
+		echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \
+      cd $(SHADER_DIR); \
+		$(GIT) pull; \
+		cd ../../../../..; \
+	else \
+	echo "[SHADER CHECKOUT::] Git cloning common-shaders first..."; \
+      $(GIT) clone git://github.com/libretro/common-shaders.git $(SHADER_DIR); \
+	fi
+
+shaders-deploy:
+ifeq ($(platform), ps3)
+	@if test -d $(MEDIA_SHADER_DIR); then \
+		cp -r $(SHADER_DIR)/* $(MEDIA_SHADER_DIR); \
+	else \
+	echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
+		mkdir -p $(MEDIA_SHADER_DIR) || bin/true; \
+	fi
+	@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."
+else ifeq ($(platform), ps3-cobra)
+	@if test -d $(MEDIA_SHADER_DIR); then \
+		cp -r $(SHADER_DIR)/* $(MEDIA_SHADER_DIR); \
+	else \
+	echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
+		mkdir -p $(MEDIA_SHADER_DIR) || bin/true; \
+	fi
+	@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."
+endif
+
+overlays-checkout:
+	@if test -d $(OVERLAY_DIR); then \
+		echo "[OVERLAY CHECKOUT::] Git pulling common-overlays..."; \
+      cd $(OVERLAY_DIR); \
+		$(GIT) pull; \
+		cd ../../../../..; \
+	else \
+	echo "[OVERLAY CHECKOUT::] Git cloning common-overlays first..."; \
+      $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
+	fi
+
+overlays-convert-glsl:
+	$(PYTHON3) tools/cg2glsl.py $(SHADER_DIR) $(SHADER_GLSL_DIR)
+
 clean:
 	rm -f $(EXT_TARGET)
 	rm -f $(EXT_INTER_TARGET)
diff --git a/Makefile.shaders b/Makefile.shaders
deleted file mode 100644
index 02a94dd804..0000000000
--- a/Makefile.shaders
+++ /dev/null
@@ -1,80 +0,0 @@
-DOWNLOAD_SHADERS	= 1
-DOWNLOAD_OVERLAYS = 1
-SHADER_DIR      := media/shaders
-OVERLAY_DIR     := media/overlays
-SHADER_GLSL_DIR := media/shaders_glsl
-
-PLATFORM_MEDIA_SHADER_DIR := ps3/pkg/USRDIR/cores/shaders
-SHADER_DEST_PS3_COBRA_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-ifeq ($(shell uname), Linux)
-PYTHON2		= python2
-PYTHON3		= python
-GIT			= git
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-PYTHON2		= python2
-PYTHON3		= python
-GIT			= git
-else
-PYTHON2		= python2.exe
-PYTHON3		= python.exe
-GIT			= git.exe
-endif
-
-checkout-shaders:
-ifeq ($(DOWNLOAD_SHADERS),1)
-	@if test -d $(SHADER_DIR); then \
-		echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \
-      cd $(SHADER_DIR); \
-		$(GIT) pull; \
-		cd ../../../../..; \
-	else \
-	echo "[SHADER CHECKOUT::] Git cloning common-shaders first..."; \
-      $(GIT) clone git://github.com/libretro/common-shaders.git $(SHADER_DIR); \
-	fi
-endif
-
-checkout-overlays:
-ifeq ($(DOWNLOAD_OVERLAYS),1)
-	@if test -d $(OVERLAY_DIR); then \
-		echo "[OVERLAY CHECKOUT::] Git pulling common-overlays..."; \
-      cd $(OVERLAY_DIR); \
-		$(GIT) pull; \
-		cd ../../../../..; \
-	else \
-	echo "[OVERLAY CHECKOUT::] Git cloning common-overlays first..."; \
-      $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
-	fi
-endif
-
-convert-xml:
-	$(PYTHON) tools/cg2glsl.py $(SHADER_DIR) $(SHADER_GLSL_DIR)
-
-deploy-ps3: checkout-shaders
-	@if test -d $(PLATFORM_MEDIA_SHADER_DIR); then \
-		cp -r $(SHADER_DIR)/* $(PLATFORM_MEDIA_SHADER_DIR); \
-	else \
-	echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
-		mkdir -p $(PLATFORM_MEDIA_SHADER_DIR) || bin/true; \
-	fi
-	@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."
-	
-deploy-ps3-cobra: checkout-shaders
-	@if test -d $(SHADER_DEST_PS3_COBRA_DIR); then \
-		cp -r $(SHADER_DIR)/* $(SHADER_DEST_PS3_COBRA_DIR); \
-	else \
-	echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
-		mkdir -p $(SHADER_DEST_PS3_COBRA_DIR) || bin/true; \
-	fi
-	@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."