23 files changed, 52 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1c839408..24ede00d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-project(akiru)
+project(citrus)
 
 # silence some spam
 add_definitions(-Wno-attributes)
@@ -39,8 +39,7 @@ include_directories(${OPENGL_INCLUDE_DIR})
 # internal includes
 include_directories(src/common/src)
 include_directories(src/core/src)
-include_directories(src/akiru/src)
-include_directories(src/akiru_qt/src)
+include_directories(src/citrus/src)
 
 # process subdirectories
 if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
diff --git a/README.md b/README.md
index e709101aa..1e6dcb5af 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-akiru
-=====
+citrus
+======
diff --git a/akiru.sln b/citrus.sln
index 045e0015c..b440746df 100644
--- a/akiru.sln
+++ b/citrus.sln
@@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common
 		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "akiru", "src\akiru\akiru.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citrus", "src\citrus\citrus.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
 	EndProjectSection
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62962f281..967288000 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(common)
 add_subdirectory(core)
-add_subdirectory(akiru)
+add_subdirectory(citrus)
 
 if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
-    add_subdirectory(akiru_qt)
+    #add_subdirectory(citrus_qt)
 endif()
diff --git a/src/akiru/CMakeLists.txt b/src/akiru/CMakeLists.txt
deleted file mode 100644
index 9517b11a4..000000000
--- a/src/akiru/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(SRCS	src/akiru.cpp
-            src/emuwindow/emuwindow_glfw.cpp)
-
-# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
-if (NOT X11_xf86vmode_LIB)
-    set(X11_xv86vmode_LIB Xxf86vm)
-endif()
-
-add_executable(akiru ${SRCS})
-target_link_libraries(akiru core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
-
-#install(TARGETS akiru RUNTIME DESTINATION ${bindir})
diff --git a/src/citrus/CMakeLists.txt b/src/citrus/CMakeLists.txt
new file mode 100644
index 000000000..6858a5891
--- /dev/null
+++ b/src/citrus/CMakeLists.txt
@@ -0,0 +1,12 @@
+set(SRCS	src/citrus.cpp
+            src/emuwindow/emuwindow_glfw.cpp)
+
+# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
+if (NOT X11_xf86vmode_LIB)
+    set(X11_xv86vmode_LIB Xxf86vm)
+endif()
+
+add_executable(citrus ${SRCS})
+target_link_libraries(citrus core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
+
+#install(TARGETS citrus RUNTIME DESTINATION ${bindir})
diff --git a/src/akiru/akiru.rc b/src/citrus/citrus.rc
index dd5241bdf..dd5241bdf 100644
--- a/src/akiru/akiru.rc
+++ b/src/citrus/citrus.rc
diff --git a/src/akiru/akiru.vcxproj b/src/citrus/citrus.vcxproj
index 513e3412b..1243d14e5 100644
--- a/src/akiru/akiru.vcxproj
+++ b/src/citrus/citrus.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>emu_win32</RootNamespace>
-    <ProjectName>akiru</ProjectName>
+    <ProjectName>citrus</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -193,17 +193,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\akiru.cpp" />
+    <ClCompile Include="src\citrus.cpp" />
     <ClCompile Include="src\emu_window\emu_window_glfw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
-    <ClInclude Include="src\akiru.h" />
+    <ClInclude Include="src\citrus.h" />
     <ClInclude Include="src\emu_window\emu_window_glfw.h" />
     <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="akiru.rc" />
+    <ResourceCompile Include="citrus.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
diff --git a/src/akiru/akiru.vcxproj.filters b/src/citrus/citrus.vcxproj.filters
index a0cff2548..567467ac9 100644
--- a/src/akiru/akiru.vcxproj.filters
+++ b/src/citrus/citrus.vcxproj.filters
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="src\akiru.cpp" />
+    <ClCompile Include="src\citrus.cpp" />
     <ClCompile Include="src\emu_window\emu_window_glfw.cpp">
       <Filter>emu_window</Filter>
     </ClCompile>
@@ -9,13 +9,13 @@
   <ItemGroup>
     <ClInclude Include="resource.h" />
     <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\akiru.h" />
+    <ClInclude Include="src\citrus.h" />
     <ClInclude Include="src\emu_window\emu_window_glfw.h">
       <Filter>emu_window</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="akiru.rc" />
+    <ResourceCompile Include="citrus.rc" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="emu_window">
diff --git a/src/akiru/resource.h b/src/citrus/resource.h
index 0d42c8a8a..0d42c8a8a 100644
--- a/src/akiru/resource.h
+++ b/src/citrus/resource.h
diff --git a/src/akiru/src/akiru.cpp b/src/citrus/src/citrus.cpp
index a31b6fbca..b50c14e80 100644
--- a/src/akiru/src/akiru.cpp
+++ b/src/citrus/src/citrus.cpp
@@ -1,7 +1,7 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
- * @file    akiru.cpp
+ * @file    citrus.cpp
  * @author  ShizZy <shizzy247@gmail.com>
  * @date    2013-09-04
  * @brief   Main entry point
@@ -31,7 +31,7 @@
 
 #include "emu_window/emu_window_glfw.h"
 
-#include "akiru.h"
+#include "citrus.h"
 
 //#define PLAY_FIFO_RECORDING
 
@@ -39,7 +39,7 @@
 int __cdecl main(int argc, char **argv) {
     //u32 tight_loop;
 
-    printf("akiru starting...\n");
+    printf("citrus starting...\n");
 
 	std::string program_dir = File::GetCurrentDir();
 
diff --git a/src/akiru/src/akiru.h b/src/citrus/src/citrus.h
index 4752b961e..0f4d7dc3f 100644
--- a/src/akiru/src/akiru.h
+++ b/src/citrus/src/citrus.h
@@ -1,7 +1,7 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
- * @file    akiru.cpp
+ * @file    citrus.h
  * @author  ShizZy <shizzy247@gmail.com>
  * @date    2013-09-04
  * @brief   Main entry point
@@ -22,14 +22,14 @@
  * http://code.google.com/p/gekko-gc-emu/
  */
 
-#ifndef AKIRU_AKIRU_H_
-#define AKIRU_AKIRU_H_
+#ifndef CITRUS_CITRUS_H_
+#define CITRUS_CITRUS_H_
 
 #include "version.h"
 
-#define APP_NAME        "akiru"
-#define APP_VERSION     "0.31-" VERSION
+#define APP_NAME        "citrus"
+#define APP_VERSION     "0.01-" VERSION
 #define APP_TITLE       APP_NAME " " APP_VERSION
-#define	COPYRIGHT       "Copyright (C) 2005-2012 Akiru Team"
+#define	COPYRIGHT       "Copyright (C) 2013 Citrus Team"
 
-#endif // AKIRU_AKIRU_H_
+#endif // CITRUS_CITRUS_H_
diff --git a/src/akiru/src/emu_window/emu_window_glfw.cpp b/src/citrus/src/emu_window/emu_window_glfw.cpp
index 01e5992e5..381f1d9a7 100644
--- a/src/akiru/src/emu_window/emu_window_glfw.cpp
+++ b/src/citrus/src/emu_window/emu_window_glfw.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    emu_window_glfw.cpp
  * @author  ShizZy <shizzy@6bit.net>
@@ -54,7 +54,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
     }
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
-    render_window_ = glfwCreateWindow(640, 480, "akiru", NULL, NULL);
+    render_window_ = glfwCreateWindow(640, 480, "citrus", NULL, NULL);
 
     // Setup callbacks
     glfwSetWindowUserPointer(render_window_, this);
diff --git a/src/akiru/src/emu_window/emu_window_glfw.h b/src/citrus/src/emu_window/emu_window_glfw.h
index 927d726b8..11d832b9a 100644
--- a/src/akiru/src/emu_window/emu_window_glfw.h
+++ b/src/citrus/src/emu_window/emu_window_glfw.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    emu_window_glfw.h
  * @author  ShizZy <shizzy@6bit.net>
@@ -22,8 +22,8 @@
  * http://code.google.com/p/gekko-gc-emu/
  */
 
-#ifndef AKIRU_EMUWINDOW_GLFW_
-#define AKIRU_EMUWINDOW_GLFW_
+#ifndef CITRUS_EMUWINDOW_GLFW_
+#define CITRUS_EMUWINDOW_GLFW_
 
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
@@ -53,4 +53,4 @@ private:
 
 };
 
-#endif // AKIRU_EMUWINDOW_GLFW_
+#endif // CITRUS_EMUWINDOW_GLFW_
diff --git a/src/akiru/src/version.h b/src/citrus/src/version.h
index 07b88c641..07b88c641 100644
--- a/src/akiru/src/version.h
+++ b/src/citrus/src/version.h
diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h
index fae810bf0..1ad887a79 100644
--- a/src/common/src/common_paths.h
+++ b/src/common/src/common_paths.h
@@ -26,7 +26,7 @@
 	#ifdef USER_DIR
 		#define EMU_DATA_DIR USER_DIR
 	#else
-		#define EMU_DATA_DIR ".akiru"
+		#define EMU_DATA_DIR ".citrus"
 	#endif
 #endif
 
diff --git a/src/common/src/emu_window.h b/src/common/src/emu_window.h
index 56ff94819..12b475934 100644
--- a/src/common/src/emu_window.h
+++ b/src/common/src/emu_window.h
@@ -81,7 +81,7 @@ public:
 protected:
     EmuWindow() : client_area_width_(640), client_area_height_(480) {
         char window_title[255];
-        sprintf(window_title, "akiru [%s|%s] - %s", 
+        sprintf(window_title, "citrus [%s|%s] - %s", 
             "null-cpu", 
             "null-renderer", 
             __DATE__);
diff --git a/src/common/src/version.cpp b/src/common/src/version.cpp
index d5cf10c3d..f4010b6df 100644
--- a/src/common/src/version.cpp
+++ b/src/common/src/version.cpp
@@ -13,7 +13,7 @@
 	#define BUILD_TYPE_STR ""
 #endif
 
-const char *scm_rev_str = "Akiru "
+const char *scm_rev_str = "citrus "
 #if !SCM_IS_MASTER
 	"[" SCM_BRANCH_STR "] "
 #endif
diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp
index 61e3a8df4..873c687b7 100644
--- a/src/core/src/core.cpp
+++ b/src/core/src/core.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    core.cpp
  * @author  ShizZy <shizzy247@gmail.com>
diff --git a/src/core/src/core.h b/src/core/src/core.h
index 41429e8a3..2270e46e2 100644
--- a/src/core/src/core.h
+++ b/src/core/src/core.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    core.h
  * @author  ShizZy <shizzy247@gmail.com>
diff --git a/src/core/src/mem_map.cpp b/src/core/src/mem_map.cpp
index e649da91b..8793fdc8d 100644
--- a/src/core/src/mem_map.cpp
+++ b/src/core/src/mem_map.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    mem_map.cpp
  * @author  ShizZy <shizzy247@gmail.com>
diff --git a/src/core/src/mem_map.h b/src/core/src/mem_map.h
index 3251fc416..29ec2e7a9 100644
--- a/src/core/src/mem_map.h
+++ b/src/core/src/mem_map.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Akiru Emulator
+ * Copyright (C) 2013 Citrus Emulator
  *
  * @file    mem_map.h
  * @author  ShizZy <shizzy247@gmail.com>
diff --git a/vsprops/base.props b/vsprops/base.props
index 2eb647e98..a4f95a3e7 100644
--- a/vsprops/base.props
+++ b/vsprops/base.props
@@ -12,7 +12,7 @@
       <StructMemberAlignment>16Bytes</StructMemberAlignment>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\akiru\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citrus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1</PreprocessorDefinitions>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
     </ClCompile>