From 2e6d68cb8fba28d80986f7300dbffb6602d603da Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Mon, 11 Mar 2013 22:55:29 +0100
Subject: [PATCH] 7.0. Show git version in Windows about box.

---
 Windows/WndMainWindow.cpp                     | 44 +++++++++++--------
 Windows/ppsspp.rc                             |  2 +-
 Windows/resource.h                            |  1 +
 android/AndroidManifest.xml                   |  4 +-
 .../src/org/ppsspp/ppsspp/PpssppActivity.java |  2 +-
 native                                        |  2 +-
 6 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index b6b769f655..dae83ab13a 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -2,34 +2,34 @@
 
 #include <windows.h>
 #include <tchar.h>
-#include "../globals.h"
+#include "Globals.h"
 
 #include "shellapi.h"
 #include "commctrl.h"
 
-#include "../Core/Debugger/SymbolMap.h"
-#include "OpenGLBase.h"
-#include "Debugger/Debugger_Disasm.h"
-#include "Debugger/Debugger_MemoryDlg.h"
+#include "Core/Debugger/SymbolMap.h"
+#include "Windows/OpenGLBase.h"
+#include "Windows/Debugger/Debugger_Disasm.h"
+#include "Windows/Debugger/Debugger_MemoryDlg.h"
 #include "main.h"
 
-#include "../Core/Core.h"
-#include "../Core/MemMap.h"
-#include "../Core/SaveState.h"
-#include "../Core/System.h"
-#include "EmuThread.h"
+#include "Core/Core.h"
+#include "Core/MemMap.h"
+#include "Core/SaveState.h"
+#include "Core/System.h"
+#include "Core/Config.h"
+#include "Windows/EmuThread.h"
 
 #include "resource.h"
 
-#include "WndMainWindow.h"
-#include "LogManager.h"
-#include "ConsoleListener.h"
-#include "W32Util/DialogManager.h"
-#include "W32Util/ShellUtil.h"
-#include "W32Util/Misc.h"
-#include "../Core/Config.h"
-#include "../GPU/GPUInterface.h"
-#include "../GPU/GPUState.h"
+#include "Windows/WndMainWindow.h"
+#include "Common/LogManager.h"
+#include "Common/ConsoleListener.h"
+#include "Windows/W32Util/DialogManager.h"
+#include "Windows/W32Util/ShellUtil.h"
+#include "Windows/W32Util/Misc.h"
+#include "GPU/GPUInterface.h"
+#include "GPU/GPUState.h"
 
 #ifdef THEMES
 #include "XPTheme.h"
@@ -724,6 +724,12 @@ namespace MainWindow
 		{
 		case WM_INITDIALOG:
 			W32Util::CenterWindow(hDlg);
+			{
+				HWND versionBox = GetDlgItem(hDlg, IDC_VERSION);
+				char temp[256];
+				sprintf(temp, "PPSSPP %s", PPSSPP_GIT_VERSION);
+				SetWindowText(versionBox, temp);
+			}
 			return TRUE;
 
 		case WM_COMMAND:
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index bcde41f217..f81c04f091 100644
--- 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.1",IDC_STATIC,40,8,127,9
+    LTEXT           "PPSSPP v0.6.1",IDC_VERSION,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/Windows/resource.h b/Windows/resource.h
index f883f17e5b..648ac65b01 100644
--- a/Windows/resource.h
+++ b/Windows/resource.h
@@ -118,6 +118,7 @@
 #define IDC_REGISTERS                   1007
 #define IDC_BREAKPOINTS                 1008
 #define IDC_STEP                        1009
+#define IDC_VERSION                     1010
 #define IDC_UP                          1014
 #define IDC_DIRTREE                     1014
 #define IDC_DOWN                        1015
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 30812f98fa..58de156616 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.ppsspp.ppsspp"
-    android:versionCode="61"
-    android:versionName="0.61"
+    android:versionCode="70"
+    android:versionName="0.70"
     android:installLocation="auto" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
index c752713aaa..a710d02017 100644
--- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java
+++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
@@ -15,4 +15,4 @@ public class PpssppActivity extends NativeActivity {
 	{   
 		return false;
 	}  
-}                                
\ No newline at end of file
+}                                     
\ No newline at end of file
diff --git a/native b/native
index e0d107ad20..7f18e1faab 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit e0d107ad2063e6ec878e1b24889b9d949ee8d6a6
+Subproject commit 7f18e1faabd18381cf4a8ab85ff24bb6b9b7f89d