octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed from citrus to citra

Browse Source
This commit is contained in:
ShizZy
2013-09-26 17:34:48 -04:00
parent a7b06698ff
commit 8bb0c457bc
20 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(citrus) project(citra)
# silence some spam # silence some spam
add_definitions(-Wno-attributes) add_definitions(-Wno-attributes)
@@ -39,7 +39,7 @@ include_directories(${OPENGL_INCLUDE_DIR})
# internal includes # internal includes
include_directories(src/common/src) include_directories(src/common/src)
include_directories(src/core/src) include_directories(src/core/src)
include_directories(src/citrus/src) include_directories(src/citra/src)
# process subdirectories # process subdirectories
if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)

4
README.md
View File

@@ -1,2 +1,2 @@
citrus citra emulator
====== ==============

2
citrus.sln → citra.sln
View File

@@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citrus", "src\citrus\citrus.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citra", "src\citra\citra.vcxproj", "{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
EndProjectSection EndProjectSection

4
src/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_subdirectory(common) add_subdirectory(common)
add_subdirectory(core) add_subdirectory(core)
add_subdirectory(citrus) add_subdirectory(citra)
if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
#add_subdirectory(citrus_qt) #add_subdirectory(citra_qt)
endif() endif()

12
src/citra/CMakeLists.txt Normal file
View File

@@ -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})

0
src/citrus/citrus.rc → src/citra/citra.rc
View File

8
src/citrus/citrus.vcxproj → src/citra/citra.vcxproj
View File

@@ -22,7 +22,7 @@
<ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid> <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>emu_win32</RootNamespace> <RootNamespace>emu_win32</RootNamespace>
<ProjectName>citrus</ProjectName> <ProjectName>citra</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -193,17 +193,17 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\citrus.cpp" /> <ClCompile Include="src\citra.cpp" />
<ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> <ClCompile Include="src\emu_window\emu_window_glfw.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h" /> <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\emu_window\emu_window_glfw.h" />
<ClInclude Include="src\version.h" /> <ClInclude Include="src\version.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="citrus.rc" /> <ResourceCompile Include="citra.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="CMakeLists.txt" /> <None Include="CMakeLists.txt" />

6
src/citrus/citrus.vcxproj.filters → src/citra/citra.vcxproj.filters
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="src\citrus.cpp" /> <ClCompile Include="src\citra.cpp" />
<ClCompile Include="src\emu_window\emu_window_glfw.cpp"> <ClCompile Include="src\emu_window\emu_window_glfw.cpp">
<Filter>emu_window</Filter> <Filter>emu_window</Filter>
</ClCompile> </ClCompile>
@@ -9,13 +9,13 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="src\version.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"> <ClInclude Include="src\emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter> <Filter>emu_window</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="citrus.rc" /> <ResourceCompile Include="citra.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="emu_window"> <Filter Include="emu_window">

0
src/citrus/resource.h → src/citra/resource.h
View File

8
src/citrus/src/citrus.cpp → src/citra/src/citra.cpp
View File

@@ -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> * @author ShizZy <shizzy247@gmail.com>
* @date 2013-09-04 * @date 2013-09-04
* @brief Main entry point * @brief Main entry point
@@ -30,7 +30,7 @@
#include "emu_window/emu_window_glfw.h" #include "emu_window/emu_window_glfw.h"
#include "citrus.h" #include "citra.h"
//#define PLAY_FIFO_RECORDING //#define PLAY_FIFO_RECORDING
@@ -38,7 +38,7 @@
int __cdecl main(int argc, char **argv) { int __cdecl main(int argc, char **argv) {
//u32 tight_loop; //u32 tight_loop;
printf("citrus starting...\n"); printf("citra starting...\n");
std::string program_dir = File::GetCurrentDir(); std::string program_dir = File::GetCurrentDir();

14
src/citrus/src/citrus.h → src/citra/src/citra.h
View File

@@ -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> * @author ShizZy <shizzy247@gmail.com>
* @date 2013-09-04 * @date 2013-09-04
* @brief Main entry point * @brief Main entry point
@@ -22,14 +22,14 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#ifndef CITRUS_CITRUS_H_ #ifndef CITRA_CITRA_H
#define CITRUS_CITRUS_H_ #define CITRA_CITRA_H
#include "version.h" #include "version.h"
#define APP_NAME "citrus" #define APP_NAME "citra"
#define APP_VERSION "0.01-" VERSION #define APP_VERSION "0.01-" VERSION
#define APP_TITLE APP_NAME " " APP_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

4
src/citrus/src/emu_window/emu_window_glfw.cpp → src/citra/src/emu_window/emu_window_glfw.cpp
View File

@@ -1,5 +1,5 @@
/** /**
* Copyright (C) 2013 Citrus Emulator * Copyright (C) 2013 Citra Emulator
* *
* @file emu_window_glfw.cpp * @file emu_window_glfw.cpp
* @author ShizZy <shizzy@6bit.net> * @author ShizZy <shizzy@6bit.net>
@@ -54,7 +54,7 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
} }
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
render_window_ = glfwCreateWindow(640, 480, "citrus", NULL, NULL); render_window_ = glfwCreateWindow(640, 480, "citra", NULL, NULL);
// Setup callbacks // Setup callbacks
glfwSetWindowUserPointer(render_window_, this); glfwSetWindowUserPointer(render_window_, this);

8
src/citrus/src/emu_window/emu_window_glfw.h → src/citra/src/emu_window/emu_window_glfw.h
View File

@@ -1,5 +1,5 @@
/** /**
* Copyright (C) 2013 Citrus Emulator * Copyright (C) 2013 Citra Emulator
* *
* @file emu_window_glfw.h * @file emu_window_glfw.h
* @author ShizZy <shizzy@6bit.net> * @author ShizZy <shizzy@6bit.net>
@@ -22,8 +22,8 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#ifndef CITRUS_EMUWINDOW_GLFW_ #ifndef CITRA_EMUWINDOW_GLFW_
#define CITRUS_EMUWINDOW_GLFW_ #define CITRA_EMUWINDOW_GLFW_
#include <GL/glew.h> #include <GL/glew.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
@@ -53,4 +53,4 @@ private:
}; };
#endif // CITRUS_EMUWINDOW_GLFW_ #endif // CITRA_EMUWINDOW_GLFW_

0
src/citrus/src/version.h → src/citra/src/version.h
View File

12
src/citrus/CMakeLists.txt
View File

@@ -1,12 +0,0 @@
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})

2
src/common/src/common_paths.h
View File

@@ -26,7 +26,7 @@
#ifdef USER_DIR #ifdef USER_DIR
#define EMU_DATA_DIR USER_DIR #define EMU_DATA_DIR USER_DIR
#else #else
#define EMU_DATA_DIR ".citrus" #define EMU_DATA_DIR ".emu"
#endif #endif
#endif #endif

2
src/common/src/emu_window.h
View File

@@ -81,7 +81,7 @@ public:
protected: protected:
EmuWindow() : client_area_width_(640), client_area_height_(480) { EmuWindow() : client_area_width_(640), client_area_height_(480) {
char window_title[255]; char window_title[255];
sprintf(window_title, "citrus [%s|%s] - %s", sprintf(window_title, "emu [%s|%s] - %s",
"null-cpu", "null-cpu",
"null-renderer", "null-renderer",
__DATE__); __DATE__);

4
src/common/src/scm_rev.h
View File

@@ -1,4 +1,4 @@
#define SCM_REV_STR "bfa6493324336066a1ef9d04f336faacae57d9f3" #define SCM_REV_STR "a7b06698ff012aa7b1094414e796ffae1ca1eb4d"
#define SCM_DESC_STR "bfa6493" #define SCM_DESC_STR "a7b0669"
#define SCM_BRANCH_STR "master" #define SCM_BRANCH_STR "master"
#define SCM_IS_MASTER 1 #define SCM_IS_MASTER 1

2
src/common/src/version.cpp
View File

@@ -13,7 +13,7 @@
#define BUILD_TYPE_STR "" #define BUILD_TYPE_STR ""
#endif #endif
const char *scm_rev_str = "citrus " const char *scm_rev_str = "emu "
#if !SCM_IS_MASTER #if !SCM_IS_MASTER
"[" SCM_BRANCH_STR "] " "[" SCM_BRANCH_STR "] "
#endif #endif

2
vsprops/base.props
View File

@@ -12,7 +12,7 @@
<StructMemberAlignment>16Bytes</StructMemberAlignment> <StructMemberAlignment>16Bytes</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citrus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citra\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions> <PreprocessorDefinitions>
</PreprocessorDefinitions> </PreprocessorDefinitions>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>