0.6.1

hrydgard · Jan 29, 2013 · eabc32d · eabc32d
1 parent 8031aed
commit eabc32d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Core/Config.h b/Core/Config.h
@@ -19,6 +19,8 @@
 
 #include <string>
 
+#define PPSSPP_VERSION_STR "0.6.1"
+
 
 struct SState
 {

diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
@@ -1,4 +1,5 @@
-#include "../Core/Core.h"
+#include "Core/Core.h"
+#include "Core/Config.h"
 #include "EmuThread.h"
 #include "DSoundStream.h"
 #include "WindowsHost.h"
@@ -38,7 +39,7 @@ void WindowsHost::ShutdownGL()
 void WindowsHost::SetWindowTitle(const char *message)
 {
 	// Really need a better way to deal with versions.
-	std::string title = "PPSSPP v0.6 - ";
+	std::string title = PPSSPP_VERSION_STR " - ";
 	title += message;
 
 	int size = MultiByteToWideChar(CP_UTF8, 0, message, (int) title.size(), NULL, 0);

diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
@@ -1,9 +1,5 @@
 // NOTE: Apologies for the quality of this code, this is really from pre-opensource Dolphin - that is, 2003.
 
-
-#define programname "PPSSPP v0.6"
-
-
 #include <windows.h>
 #include <tchar.h>
 #include "../globals.h"
@@ -851,11 +847,11 @@ namespace MainWindow
 	void SetPlaying(const char *text)
 	{
 		if (text == 0)
-			SetWindowText(hwndMain,programname);
+			SetWindowText(hwndMain, "PPSSPP " PPSSPP_VERSION_STR);
 		else
 		{
 			char temp[256];
-			sprintf(temp, "%s - %s", text, programname);
+			sprintf(temp, "%s - %s", text, "PPSSPP " PPSSPP_VERSION_STR);
 			SetWindowText(hwndMain,temp);
 		}
 	}

diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
@@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,243,140,50,14
     ICON            IDI_PPSSPP,IDC_STATIC,10,9,21,20
-    LTEXT           "PPSSPP v0.6",IDC_STATIC,40,8,127,9
+    LTEXT           "PPSSPP v0.6.1",IDC_STATIC,40,8,127,9
     LTEXT           "Copyright (c) by Henrik Rydg�rd && the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
     LTEXT           "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
     LTEXT           "PSP emulator and debugger",IDC_STATIC,40,19,253,8

diff --git a/android/jni/MenuScreens.cpp b/android/jni/MenuScreens.cpp
@@ -165,7 +165,7 @@ void MenuScreen::render() {
 
 	ui_draw2d.DrawTextShadow(UBUNTU48, "PPSSPP", dp_xres + xoff - w/2, 80, 0xFFFFFFFF, ALIGN_HCENTER | ALIGN_BOTTOM);
 	ui_draw2d.SetFontScale(0.7f, 0.7f);
-	ui_draw2d.DrawTextShadow(UBUNTU24, "v0.6", dp_xres + xoff, 80, 0xFFFFFFFF, ALIGN_RIGHT | ALIGN_BOTTOM);
+	ui_draw2d.DrawTextShadow(UBUNTU24, PPSSPP_VERSION_STR, dp_xres + xoff, 80, 0xFFFFFFFF, ALIGN_RIGHT | ALIGN_BOTTOM);
 	ui_draw2d.SetFontScale(1.0f, 1.0f);
 	VLinear vlinear(dp_xres + xoff, 95, 20);
 
@@ -433,7 +433,7 @@ void CreditsScreen::update(InputState &input_state) {
 
 static const char *credits[] =
 {
-	"PPSSPP v0.6",
+	"PPSSPP " PPSSPP_VERSION_STR,
 	"",
 	"",
 	"A fast and portable PSP emulator",
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ @@
     #include <string>
+    #define PPSSPP_VERSION_STR "0.6.1"
     struct SState
     {
@@ Expand Down @@