From 721b84b1cefe7684f4cf88dd3007e845ac430cc2 Mon Sep 17 00:00:00 2001
From: Romain Graillot <graillot.romain@gmail.com>
Date: Mon, 5 Sep 2016 22:55:52 +0200
Subject: [PATCH] Updated to latest vita-sdk

---
 NotEngine/include/notengine/game/Director.hpp | 7 ++++---
 NotEngine/source/game/Director.cpp            | 4 ++--
 floodit/Makefile.psp2                         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NotEngine/include/notengine/game/Director.hpp b/NotEngine/include/notengine/game/Director.hpp
index dd3c22f..a142518 100644
--- a/NotEngine/include/notengine/game/Director.hpp
+++ b/NotEngine/include/notengine/game/Director.hpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <psp2/ctrl.h>
 #include <psp2/touch.h>
+#include <psp2/rtc.h>
 
 #include "../system/Singleton.hpp"
 #include "GameState.hpp"
@@ -31,9 +32,9 @@ namespace NotEngine {
 				SceTouchData mTouchFrontData;
 				SceTouchData mTouchBackData;
 
-				uint64_t mCurrentTicks;
-				uint64_t mLastFpsTicks;
-				uint64_t mLastTicks;
+				SceRtcTick mCurrentTicks;
+				SceRtcTick mLastFpsTicks;
+				SceRtcTick mLastTicks;
 				float mElapsed;
 				unsigned int mFps;
 				unsigned int mFrames;
diff --git a/NotEngine/source/game/Director.cpp b/NotEngine/source/game/Director.cpp
index 71bb588..f8e2096 100644
--- a/NotEngine/source/game/Director.cpp
+++ b/NotEngine/source/game/Director.cpp
@@ -50,10 +50,10 @@ namespace NotEngine {
 			const float tickRate = 1.0f / sceRtcGetTickResolution();
 
 			sceRtcGetCurrentTick(&mCurrentTicks);
-			mElapsed = (float) (mCurrentTicks - mLastTicks) * tickRate;
+			mElapsed = (float) (mCurrentTicks.tick - mLastTicks.tick) * tickRate;
 			mLastTicks = mCurrentTicks;
 
-			if((mCurrentTicks - mLastFpsTicks) * tickRate >= 1) {
+			if((mCurrentTicks.tick - mLastFpsTicks.tick) * tickRate >= 1) {
 				mLastFpsTicks = mCurrentTicks;
 				mFps = mFrames;
 				mFrames = 0;
diff --git a/floodit/Makefile.psp2 b/floodit/Makefile.psp2
index c74c794..938cc87 100644
--- a/floodit/Makefile.psp2
+++ b/floodit/Makefile.psp2
@@ -35,7 +35,7 @@ all: $(TARGET).vpk
 	@cd vpk && zip -r -0 $(TARGET).vpk eboot.bin sce_sys
 
 eboot.bin: $(TARGET).velf
-	$(VITASDK)/bin/vita-make-fself $< $@
+	$(VITASDK)/bin/vita-make-fself -s $< $@
 
 %.velf: %.elf
 	$(PREFIX)-strip -g $<