diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ede00d25..80acc1cb7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -project(citrus) +project(citra) # silence some spam add_definitions(-Wno-attributes) @@ -39,7 +39,7 @@ include_directories(${OPENGL_INCLUDE_DIR}) # internal includes include_directories(src/common/src) include_directories(src/core/src) -include_directories(src/citrus/src) +include_directories(src/citra/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 1e6dcb5af7..6271f93c55 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -citrus -====== +citra emulator +============== diff --git a/citrus.sln b/citra.sln similarity index 96% rename from citrus.sln rename to citra.sln index b440746df7..8d6deada24 100644 --- a/citrus.sln +++ b/citra.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}") = "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 {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} EndProjectSection diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9672880000..f988bf34e1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(common) 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) - #add_subdirectory(citrus_qt) + #add_subdirectory(citra_qt) endif() diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt new file mode 100644 index 0000000000..3a76b50455 --- /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 similarity index 100% rename from src/citrus/citrus.rc rename to src/citra/citra.rc diff --git a/src/citrus/citrus.vcxproj b/src/citra/citra.vcxproj similarity index 98% rename from src/citrus/citrus.vcxproj rename to src/citra/citra.vcxproj index 1243d14e5e..2645d3c3c6 100644 --- a/src/citrus/citrus.vcxproj +++ b/src/citra/citra.vcxproj @@ -22,7 +22,7 @@ {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F} Win32Proj emu_win32 - citrus + citra @@ -193,17 +193,17 @@ - + - + - + diff --git a/src/citrus/citrus.vcxproj.filters b/src/citra/citra.vcxproj.filters similarity index 84% rename from src/citrus/citrus.vcxproj.filters rename to src/citra/citra.vcxproj.filters index 567467ac99..510e07b531 100644 --- a/src/citrus/citrus.vcxproj.filters +++ b/src/citra/citra.vcxproj.filters @@ -1,7 +1,7 @@  - + emu_window @@ -9,13 +9,13 @@ - + emu_window - + diff --git a/src/citrus/resource.h b/src/citra/resource.h similarity index 100% rename from src/citrus/resource.h rename to src/citra/resource.h diff --git a/src/citrus/src/citrus.cpp b/src/citra/src/citra.cpp similarity index 95% rename from src/citrus/src/citrus.cpp rename to src/citra/src/citra.cpp index faeacc2903..eb02906871 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 * @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 similarity index 79% rename from src/citrus/src/citrus.h rename to src/citra/src/citra.h index 0f4d7dc3fa..b3a07c005e 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 * @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 similarity index 96% rename from src/citrus/src/emu_window/emu_window_glfw.cpp rename to src/citra/src/emu_window/emu_window_glfw.cpp index 381f1d9a78..8edc745b70 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 @@ -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 similarity index 91% rename from src/citrus/src/emu_window/emu_window_glfw.h rename to src/citra/src/emu_window/emu_window_glfw.h index 11d832b9a6..0339b5d688 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 @@ -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 #include @@ -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 similarity index 100% rename from src/citrus/src/version.h rename to src/citra/src/version.h diff --git a/src/citrus/CMakeLists.txt b/src/citrus/CMakeLists.txt deleted file mode 100644 index 6858a5891e..0000000000 --- a/src/citrus/CMakeLists.txt +++ /dev/null @@ -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}) diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h index 1ad887a79a..30bd4b7424 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 ".citrus" + #define EMU_DATA_DIR ".emu" #endif #endif diff --git a/src/common/src/emu_window.h b/src/common/src/emu_window.h index 12b4759347..2427b5b6a4 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, "citrus [%s|%s] - %s", + sprintf(window_title, "emu [%s|%s] - %s", "null-cpu", "null-renderer", __DATE__); diff --git a/src/common/src/scm_rev.h b/src/common/src/scm_rev.h index 05ad769644..69962c58e5 100644 --- a/src/common/src/scm_rev.h +++ b/src/common/src/scm_rev.h @@ -1,4 +1,4 @@ -#define SCM_REV_STR "bfa6493324336066a1ef9d04f336faacae57d9f3" -#define SCM_DESC_STR "bfa6493" +#define SCM_REV_STR "a7b06698ff012aa7b1094414e796ffae1ca1eb4d" +#define SCM_DESC_STR "a7b0669" #define SCM_BRANCH_STR "master" #define SCM_IS_MASTER 1 diff --git a/src/common/src/version.cpp b/src/common/src/version.cpp index f4010b6df1..25e99b21a8 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 = "citrus " +const char *scm_rev_str = "emu " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif diff --git a/vsprops/base.props b/vsprops/base.props index e0f1eb51ee..0f59b512b6 100644 --- a/vsprops/base.props +++ b/vsprops/base.props @@ -12,7 +12,7 @@ 16Bytes true true - $(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citrus\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\citra\src;%(AdditionalIncludeDirectories) false