diff options
author | ShizZy <shizzy@6bit.net> | 2013-09-26 23:34:48 +0200 |
---|---|---|
committer | ShizZy <shizzy@6bit.net> | 2013-09-26 23:34:48 +0200 |
commit | 8bb0c457bca110ca80fd3d09e78a794600a7221a (patch) | |
tree | 31023ba8d5839b836d4b49b31f9a74261c0540d1 /src/citra | |
parent | added meta_file_system to project (diff) | |
download | yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.gz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.bz2 yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.lz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.xz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.zst yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/citra/citra.rc (renamed from src/citrus/citrus.rc) | bin | 3144 -> 3144 bytes | |||
-rw-r--r-- | src/citra/citra.vcxproj (renamed from src/citrus/citrus.vcxproj) | 8 | ||||
-rw-r--r-- | src/citra/citra.vcxproj.filters (renamed from src/citrus/citrus.vcxproj.filters) | 6 | ||||
-rw-r--r-- | src/citra/resource.h (renamed from src/citrus/resource.h) | bin | 898 -> 898 bytes | |||
-rw-r--r-- | src/citra/src/citra.cpp (renamed from src/citrus/src/citrus.cpp) | 8 | ||||
-rw-r--r-- | src/citra/src/citra.h (renamed from src/citrus/src/citrus.h) | 14 | ||||
-rw-r--r-- | src/citra/src/emu_window/emu_window_glfw.cpp (renamed from src/citrus/src/emu_window/emu_window_glfw.cpp) | 4 | ||||
-rw-r--r-- | src/citra/src/emu_window/emu_window_glfw.h (renamed from src/citrus/src/emu_window/emu_window_glfw.h) | 8 | ||||
-rw-r--r-- | src/citra/src/version.h (renamed from src/citrus/src/version.h) | 0 |
10 files changed, 36 insertions, 24 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt new file mode 100644 index 000000000..3a76b5045 --- /dev/null +++ b/src/citra/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SRCS src/citra.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(citra ${SRCS}) +target_link_libraries(citra core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) + +#install(TARGETS citra RUNTIME DESTINATION ${bindir}) diff --git a/src/citrus/citrus.rc b/src/citra/citra.rc Binary files differindex dd5241bdf..dd5241bdf 100644 --- a/src/citrus/citrus.rc +++ b/src/citra/citra.rc diff --git a/src/citrus/citrus.vcxproj b/src/citra/citra.vcxproj index 1243d14e5..2645d3c3c 100644 --- a/src/citrus/citrus.vcxproj +++ b/src/citra/citra.vcxproj @@ -22,7 +22,7 @@ <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>emu_win32</RootNamespace> - <ProjectName>citrus</ProjectName> + <ProjectName>citra</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\citrus.cpp" /> + <ClCompile Include="src\citra.cpp" /> <ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h" /> - <ClInclude Include="src\citrus.h" /> + <ClInclude Include="src\citra.h" /> <ClInclude Include="src\emu_window\emu_window_glfw.h" /> <ClInclude Include="src\version.h" /> </ItemGroup> <ItemGroup> - <ResourceCompile Include="citrus.rc" /> + <ResourceCompile Include="citra.rc" /> </ItemGroup> <ItemGroup> <None Include="CMakeLists.txt" /> diff --git a/src/citrus/citrus.vcxproj.filters b/src/citra/citra.vcxproj.filters index 567467ac9..510e07b53 100644 --- a/src/citrus/citrus.vcxproj.filters +++ b/src/citra/citra.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\citrus.cpp" /> + <ClCompile Include="src\citra.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\citrus.h" /> + <ClInclude Include="src\citra.h" /> <ClInclude Include="src\emu_window\emu_window_glfw.h"> <Filter>emu_window</Filter> </ClInclude> </ItemGroup> <ItemGroup> - <ResourceCompile Include="citrus.rc" /> + <ResourceCompile Include="citra.rc" /> </ItemGroup> <ItemGroup> <Filter Include="emu_window"> diff --git a/src/citrus/resource.h b/src/citra/resource.h Binary files differindex 0d42c8a8a..0d42c8a8a 100644 --- a/src/citrus/resource.h +++ b/src/citra/resource.h diff --git a/src/citrus/src/citrus.cpp b/src/citra/src/citra.cpp index faeacc290..eb0290687 100644 --- a/src/citrus/src/citrus.cpp +++ b/src/citra/src/citra.cpp @@ -1,7 +1,7 @@ /** - * Copyright (C) 2013 Citrus Emulator + * Copyright (C) 2013 citra Emulator * - * @file citrus.cpp + * @file citra.cpp * @author ShizZy <shizzy247@gmail.com> * @date 2013-09-04 * @brief Main entry point @@ -30,7 +30,7 @@ #include "emu_window/emu_window_glfw.h" -#include "citrus.h" +#include "citra.h" //#define PLAY_FIFO_RECORDING @@ -38,7 +38,7 @@ int __cdecl main(int argc, char **argv) { //u32 tight_loop; - printf("citrus starting...\n"); + printf("citra starting...\n"); std::string program_dir = File::GetCurrentDir(); diff --git a/src/citrus/src/citrus.h b/src/citra/src/citra.h index 0f4d7dc3f..b3a07c005 100644 --- a/src/citrus/src/citrus.h +++ b/src/citra/src/citra.h @@ -1,7 +1,7 @@ /** - * Copyright (C) 2013 Citrus Emulator + * Copyright (C) 2013 Citra Emulator * - * @file citrus.h + * @file citra.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 CITRUS_CITRUS_H_ -#define CITRUS_CITRUS_H_ +#ifndef CITRA_CITRA_H +#define CITRA_CITRA_H #include "version.h" -#define APP_NAME "citrus" +#define APP_NAME "citra" #define APP_VERSION "0.01-" VERSION #define APP_TITLE APP_NAME " " APP_VERSION -#define COPYRIGHT "Copyright (C) 2013 Citrus Team" +#define COPYRIGHT "Copyright (C) 2013 Citra Emulator" -#endif // CITRUS_CITRUS_H_ +#endif // CITRA_CITRA_H diff --git a/src/citrus/src/emu_window/emu_window_glfw.cpp b/src/citra/src/emu_window/emu_window_glfw.cpp index 381f1d9a7..8edc745b7 100644 --- a/src/citrus/src/emu_window/emu_window_glfw.cpp +++ b/src/citra/src/emu_window/emu_window_glfw.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013 Citrus Emulator + * Copyright (C) 2013 Citra 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, "citrus", NULL, NULL); + render_window_ = glfwCreateWindow(640, 480, "citra", NULL, NULL); // Setup callbacks glfwSetWindowUserPointer(render_window_, this); diff --git a/src/citrus/src/emu_window/emu_window_glfw.h b/src/citra/src/emu_window/emu_window_glfw.h index 11d832b9a..0339b5d68 100644 --- a/src/citrus/src/emu_window/emu_window_glfw.h +++ b/src/citra/src/emu_window/emu_window_glfw.h @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013 Citrus Emulator + * Copyright (C) 2013 Citra Emulator * * @file emu_window_glfw.h * @author ShizZy <shizzy@6bit.net> @@ -22,8 +22,8 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#ifndef CITRUS_EMUWINDOW_GLFW_ -#define CITRUS_EMUWINDOW_GLFW_ +#ifndef CITRA_EMUWINDOW_GLFW_ +#define CITRA_EMUWINDOW_GLFW_ #include <GL/glew.h> #include <GLFW/glfw3.h> @@ -53,4 +53,4 @@ private: }; -#endif // CITRUS_EMUWINDOW_GLFW_ +#endif // CITRA_EMUWINDOW_GLFW_ diff --git a/src/citrus/src/version.h b/src/citra/src/version.h index 07b88c641..07b88c641 100644 --- a/src/citrus/src/version.h +++ b/src/citra/src/version.h |