summaryrefslogtreecommitdiffstats
path: root/src/citrus
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citrus/CMakeLists.txt12
-rw-r--r--src/citrus/citrus.rc (renamed from src/akiru/akiru.rc)bin3144 -> 3144 bytes
-rw-r--r--src/citrus/citrus.vcxproj (renamed from src/akiru/akiru.vcxproj)8
-rw-r--r--src/citrus/citrus.vcxproj.filters (renamed from src/akiru/akiru.vcxproj.filters)6
-rw-r--r--src/citrus/resource.h (renamed from src/akiru/resource.h)bin898 -> 898 bytes
-rw-r--r--src/citrus/src/citrus.cpp (renamed from src/akiru/src/akiru.cpp)8
-rw-r--r--src/citrus/src/citrus.h (renamed from src/akiru/src/akiru.h)16
-rw-r--r--src/citrus/src/emu_window/emu_window_glfw.cpp (renamed from src/akiru/src/emu_window/emu_window_glfw.cpp)4
-rw-r--r--src/citrus/src/emu_window/emu_window_glfw.h (renamed from src/akiru/src/emu_window/emu_window_glfw.h)8
-rw-r--r--src/citrus/src/version.h (renamed from src/akiru/src/version.h)0
10 files changed, 37 insertions, 25 deletions
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
Binary files differ
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
Binary files differ
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:58:07 +0100