diff options
Diffstat (limited to 'src/citrus')
| -rw-r--r-- | src/citrus/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/citrus/citrus.rc | bin | 3144 -> 0 bytes | |||
| -rw-r--r-- | src/citrus/citrus.vcxproj | 214 | ||||
| -rw-r--r-- | src/citrus/citrus.vcxproj.filters | 25 | ||||
| -rw-r--r-- | src/citrus/resource.h | bin | 898 -> 0 bytes | |||
| -rw-r--r-- | src/citrus/src/citrus.cpp | 90 | ||||
| -rw-r--r-- | src/citrus/src/citrus.h | 35 | ||||
| -rw-r--r-- | src/citrus/src/emu_window/emu_window_glfw.cpp | 96 | ||||
| -rw-r--r-- | src/citrus/src/emu_window/emu_window_glfw.h | 56 | ||||
| -rw-r--r-- | src/citrus/src/version.h | 6 |
10 files changed, 0 insertions, 534 deletions
diff --git a/src/citrus/CMakeLists.txt b/src/citrus/CMakeLists.txt deleted file mode 100644 index 6858a5891..000000000 --- a/src/citrus/CMakeLists.txt +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | set(SRCS src/citrus.cpp | ||
| 2 | src/emuwindow/emuwindow_glfw.cpp) | ||
| 3 | |||
| 4 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | ||
| 5 | if (NOT X11_xf86vmode_LIB) | ||
| 6 | set(X11_xv86vmode_LIB Xxf86vm) | ||
| 7 | endif() | ||
| 8 | |||
| 9 | add_executable(citrus ${SRCS}) | ||
| 10 | target_link_libraries(citrus core common ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} GLEW rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) | ||
| 11 | |||
| 12 | #install(TARGETS citrus RUNTIME DESTINATION ${bindir}) | ||
diff --git a/src/citrus/citrus.rc b/src/citrus/citrus.rc deleted file mode 100644 index dd5241bdf..000000000 --- a/src/citrus/citrus.rc +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/citrus/citrus.vcxproj b/src/citrus/citrus.vcxproj deleted file mode 100644 index 1243d14e5..000000000 --- a/src/citrus/citrus.vcxproj +++ /dev/null | |||
| @@ -1,214 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Win32</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|x64"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>x64</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Release|Win32"> | ||
| 13 | <Configuration>Release</Configuration> | ||
| 14 | <Platform>Win32</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|x64"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>x64</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | </ItemGroup> | ||
| 21 | <PropertyGroup Label="Globals"> | ||
| 22 | <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid> | ||
| 23 | <Keyword>Win32Proj</Keyword> | ||
| 24 | <RootNamespace>emu_win32</RootNamespace> | ||
| 25 | <ProjectName>citrus</ProjectName> | ||
| 26 | </PropertyGroup> | ||
| 27 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 29 | <ConfigurationType>Application</ConfigurationType> | ||
| 30 | <UseDebugLibraries>true</UseDebugLibraries> | ||
| 31 | </PropertyGroup> | ||
| 32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 33 | <ConfigurationType>Application</ConfigurationType> | ||
| 34 | <UseDebugLibraries>true</UseDebugLibraries> | ||
| 35 | </PropertyGroup> | ||
| 36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 37 | <ConfigurationType>Application</ConfigurationType> | ||
| 38 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 39 | </PropertyGroup> | ||
| 40 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 41 | <ConfigurationType>Application</ConfigurationType> | ||
| 42 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 43 | </PropertyGroup> | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 45 | <ImportGroup Label="ExtensionSettings"> | ||
| 46 | </ImportGroup> | ||
| 47 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 48 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 49 | <Import Project="..\..\vsprops\base.props" /> | ||
| 50 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 51 | <Import Project="..\..\vsprops\code_generation_debug.props" /> | ||
| 52 | <Import Project="..\..\vsprops\app.props" /> | ||
| 53 | <Import Project="..\..\vsprops\optimization_debug.props" /> | ||
| 54 | |||
| 55 | </ImportGroup> | ||
| 56 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 57 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 58 | <Import Project="..\..\vsprops\base.props" /> | ||
| 59 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 60 | <Import Project="..\..\vsprops\code_generation_debug.props" /> | ||
| 61 | <Import Project="..\..\vsprops\app.props" /> | ||
| 62 | <Import Project="..\..\vsprops\optimization_debug.props" /> | ||
| 63 | </ImportGroup> | ||
| 64 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 65 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 66 | <Import Project="..\..\vsprops\base.props" /> | ||
| 67 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 68 | <Import Project="..\..\vsprops\code_generation_release.props" /> | ||
| 69 | <Import Project="..\..\vsprops\app.props" /> | ||
| 70 | <Import Project="..\..\vsprops\optimization_release.props" /> | ||
| 71 | </ImportGroup> | ||
| 72 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 73 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 74 | <Import Project="..\..\vsprops\base.props" /> | ||
| 75 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 76 | <Import Project="..\..\vsprops\code_generation_release.props" /> | ||
| 77 | <Import Project="..\..\vsprops\app.props" /> | ||
| 78 | <Import Project="..\..\vsprops\optimization_release.props" /> | ||
| 79 | </ImportGroup> | ||
| 80 | <PropertyGroup Label="UserMacros" /> | ||
| 81 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 82 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 84 | <CustomBuildBeforeTargets> | ||
| 85 | </CustomBuildBeforeTargets> | ||
| 86 | </PropertyGroup> | ||
| 87 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 88 | <CustomBuildBeforeTargets /> | ||
| 89 | </PropertyGroup> | ||
| 90 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 91 | <ClCompile> | ||
| 92 | <PrecompiledHeader> | ||
| 93 | </PrecompiledHeader> | ||
| 94 | </ClCompile> | ||
| 95 | <Link /> | ||
| 96 | <CustomBuildStep> | ||
| 97 | <Outputs> | ||
| 98 | </Outputs> | ||
| 99 | <Command> | ||
| 100 | </Command> | ||
| 101 | </CustomBuildStep> | ||
| 102 | <PreBuildEvent /> | ||
| 103 | <Link /> | ||
| 104 | <Link> | ||
| 105 | <IgnoreSpecificDefaultLibraries> | ||
| 106 | </IgnoreSpecificDefaultLibraries> | ||
| 107 | </Link> | ||
| 108 | </ItemDefinitionGroup> | ||
| 109 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 110 | <ClCompile> | ||
| 111 | <PrecompiledHeader> | ||
| 112 | </PrecompiledHeader> | ||
| 113 | </ClCompile> | ||
| 114 | <Link /> | ||
| 115 | <CustomBuildStep> | ||
| 116 | <Outputs> | ||
| 117 | </Outputs> | ||
| 118 | <Command> | ||
| 119 | </Command> | ||
| 120 | </CustomBuildStep> | ||
| 121 | <PreBuildEvent /> | ||
| 122 | <Link> | ||
| 123 | <IgnoreSpecificDefaultLibraries>msvcrtd.lib;msvcrt.lib</IgnoreSpecificDefaultLibraries> | ||
| 124 | </Link> | ||
| 125 | </ItemDefinitionGroup> | ||
| 126 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 127 | <ClCompile> | ||
| 128 | <PrecompiledHeader> | ||
| 129 | </PrecompiledHeader> | ||
| 130 | </ClCompile> | ||
| 131 | <Link> | ||
| 132 | <SpecifySectionAttributes> | ||
| 133 | </SpecifySectionAttributes> | ||
| 134 | <IgnoreSpecificDefaultLibraries> | ||
| 135 | </IgnoreSpecificDefaultLibraries> | ||
| 136 | </Link> | ||
| 137 | <CustomBuildStep> | ||
| 138 | <Command> | ||
| 139 | </Command> | ||
| 140 | </CustomBuildStep> | ||
| 141 | <CustomBuildStep> | ||
| 142 | <Message> | ||
| 143 | </Message> | ||
| 144 | </CustomBuildStep> | ||
| 145 | <CustomBuildStep> | ||
| 146 | <Outputs> | ||
| 147 | </Outputs> | ||
| 148 | </CustomBuildStep> | ||
| 149 | <PreBuildEvent /> | ||
| 150 | </ItemDefinitionGroup> | ||
| 151 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 152 | <ClCompile> | ||
| 153 | <PrecompiledHeader> | ||
| 154 | </PrecompiledHeader> | ||
| 155 | </ClCompile> | ||
| 156 | <Link> | ||
| 157 | <SpecifySectionAttributes> | ||
| 158 | </SpecifySectionAttributes> | ||
| 159 | <IgnoreAllDefaultLibraries> | ||
| 160 | </IgnoreAllDefaultLibraries> | ||
| 161 | <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries> | ||
| 162 | </Link> | ||
| 163 | <CustomBuildStep> | ||
| 164 | <Command> | ||
| 165 | </Command> | ||
| 166 | </CustomBuildStep> | ||
| 167 | <CustomBuildStep> | ||
| 168 | <Message> | ||
| 169 | </Message> | ||
| 170 | </CustomBuildStep> | ||
| 171 | <CustomBuildStep> | ||
| 172 | <Outputs> | ||
| 173 | </Outputs> | ||
| 174 | </CustomBuildStep> | ||
| 175 | <PreBuildEvent /> | ||
| 176 | </ItemDefinitionGroup> | ||
| 177 | <ItemGroup> | ||
| 178 | <ProjectReference Include="..\common\common.vcxproj"> | ||
| 179 | <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project> | ||
| 180 | <Private>true</Private> | ||
| 181 | <ReferenceOutputAssembly>true</ReferenceOutputAssembly> | ||
| 182 | <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> | ||
| 183 | <LinkLibraryDependencies>true</LinkLibraryDependencies> | ||
| 184 | <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> | ||
| 185 | </ProjectReference> | ||
| 186 | <ProjectReference Include="..\core\core.vcxproj"> | ||
| 187 | <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project> | ||
| 188 | <Private>true</Private> | ||
| 189 | <ReferenceOutputAssembly>true</ReferenceOutputAssembly> | ||
| 190 | <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> | ||
| 191 | <LinkLibraryDependencies>true</LinkLibraryDependencies> | ||
| 192 | <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> | ||
| 193 | </ProjectReference> | ||
| 194 | </ItemGroup> | ||
| 195 | <ItemGroup> | ||
| 196 | <ClCompile Include="src\citrus.cpp" /> | ||
| 197 | <ClCompile Include="src\emu_window\emu_window_glfw.cpp" /> | ||
| 198 | </ItemGroup> | ||
| 199 | <ItemGroup> | ||
| 200 | <ClInclude Include="resource.h" /> | ||
| 201 | <ClInclude Include="src\citrus.h" /> | ||
| 202 | <ClInclude Include="src\emu_window\emu_window_glfw.h" /> | ||
| 203 | <ClInclude Include="src\version.h" /> | ||
| 204 | </ItemGroup> | ||
| 205 | <ItemGroup> | ||
| 206 | <ResourceCompile Include="citrus.rc" /> | ||
| 207 | </ItemGroup> | ||
| 208 | <ItemGroup> | ||
| 209 | <None Include="CMakeLists.txt" /> | ||
| 210 | </ItemGroup> | ||
| 211 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 212 | <ImportGroup Label="ExtensionTargets"> | ||
| 213 | </ImportGroup> | ||
| 214 | </Project> \ No newline at end of file | ||
diff --git a/src/citrus/citrus.vcxproj.filters b/src/citrus/citrus.vcxproj.filters deleted file mode 100644 index 567467ac9..000000000 --- a/src/citrus/citrus.vcxproj.filters +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <ClCompile Include="src\citrus.cpp" /> | ||
| 5 | <ClCompile Include="src\emu_window\emu_window_glfw.cpp"> | ||
| 6 | <Filter>emu_window</Filter> | ||
| 7 | </ClCompile> | ||
| 8 | </ItemGroup> | ||
| 9 | <ItemGroup> | ||
| 10 | <ClInclude Include="resource.h" /> | ||
| 11 | <ClInclude Include="src\version.h" /> | ||
| 12 | <ClInclude Include="src\citrus.h" /> | ||
| 13 | <ClInclude Include="src\emu_window\emu_window_glfw.h"> | ||
| 14 | <Filter>emu_window</Filter> | ||
| 15 | </ClInclude> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ResourceCompile Include="citrus.rc" /> | ||
| 19 | </ItemGroup> | ||
| 20 | <ItemGroup> | ||
| 21 | <Filter Include="emu_window"> | ||
| 22 | <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier> | ||
| 23 | </Filter> | ||
| 24 | </ItemGroup> | ||
| 25 | </Project> \ No newline at end of file | ||
diff --git a/src/citrus/resource.h b/src/citrus/resource.h deleted file mode 100644 index 0d42c8a8a..000000000 --- a/src/citrus/resource.h +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/citrus/src/citrus.cpp b/src/citrus/src/citrus.cpp deleted file mode 100644 index faeacc290..000000000 --- a/src/citrus/src/citrus.cpp +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright (C) 2013 Citrus Emulator | ||
| 3 | * | ||
| 4 | * @file citrus.cpp | ||
| 5 | * @author ShizZy <shizzy247@gmail.com> | ||
| 6 | * @date 2013-09-04 | ||
| 7 | * @brief Main entry point | ||
| 8 | * | ||
| 9 | * @section LICENSE | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 18 | * General Public License for more details at | ||
| 19 | * http://www.gnu.org/copyleft/gpl.html | ||
| 20 | * | ||
| 21 | * Official project repository can be found at: | ||
| 22 | * http://code.google.com/p/gekko-gc-emu/ | ||
| 23 | */ | ||
| 24 | |||
| 25 | #include "common.h" | ||
| 26 | #include "log_manager.h" | ||
| 27 | #include "file_util.h" | ||
| 28 | |||
| 29 | #include "core.h" | ||
| 30 | |||
| 31 | #include "emu_window/emu_window_glfw.h" | ||
| 32 | |||
| 33 | #include "citrus.h" | ||
| 34 | |||
| 35 | //#define PLAY_FIFO_RECORDING | ||
| 36 | |||
| 37 | /// Application entry point | ||
| 38 | int __cdecl main(int argc, char **argv) { | ||
| 39 | //u32 tight_loop; | ||
| 40 | |||
| 41 | printf("citrus starting...\n"); | ||
| 42 | |||
| 43 | std::string program_dir = File::GetCurrentDir(); | ||
| 44 | |||
| 45 | LogManager::Init(); | ||
| 46 | |||
| 47 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; | ||
| 48 | |||
| 49 | Core::Init(emu_window); | ||
| 50 | |||
| 51 | //if (E_OK != core::Init(emu_window)) { | ||
| 52 | // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); | ||
| 53 | // core::Kill(); | ||
| 54 | // exit(1); | ||
| 55 | //} | ||
| 56 | |||
| 57 | //// Load a game or die... | ||
| 58 | //if (E_OK == dvd::LoadBootableFile(common::g_config->default_boot_file())) { | ||
| 59 | // if (common::g_config->enable_auto_boot()) { | ||
| 60 | // core::Start(); | ||
| 61 | // } else { | ||
| 62 | // LOG_ERROR(TMASTER, "Autoboot required in no-GUI mode... Exiting!\n"); | ||
| 63 | // } | ||
| 64 | //} else { | ||
| 65 | // LOG_ERROR(TMASTER, "Failed to load a bootable file... Exiting!\n"); | ||
| 66 | // exit(E_ERR); | ||
| 67 | //} | ||
| 68 | //// run the game | ||
| 69 | //while(core::SYS_DIE != core::g_state) { | ||
| 70 | // if (core::SYS_RUNNING == core::g_state) { | ||
| 71 | // if(!(cpu->is_on)) { | ||
| 72 | // cpu->Start(); // Initialize and start CPU. | ||
| 73 | // } else { | ||
| 74 | // for(tight_loop = 0; tight_loop < 10000; ++tight_loop) { | ||
| 75 | // cpu->execStep(); | ||
| 76 | // } | ||
| 77 | // } | ||
| 78 | // } else if (core::SYS_HALTED == core::g_state) { | ||
| 79 | // core::Stop(); | ||
| 80 | // } | ||
| 81 | //} | ||
| 82 | //core::Kill(); | ||
| 83 | |||
| 84 | while (1) { | ||
| 85 | } | ||
| 86 | |||
| 87 | //delete emu_window; | ||
| 88 | |||
| 89 | return 0; | ||
| 90 | } | ||
diff --git a/src/citrus/src/citrus.h b/src/citrus/src/citrus.h deleted file mode 100644 index 0f4d7dc3f..000000000 --- a/src/citrus/src/citrus.h +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright (C) 2013 Citrus Emulator | ||
| 3 | * | ||
| 4 | * @file citrus.h | ||
| 5 | * @author ShizZy <shizzy247@gmail.com> | ||
| 6 | * @date 2013-09-04 | ||
| 7 | * @brief Main entry point | ||
| 8 | * | ||
| 9 | * @section LICENSE | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 18 | * General Public License for more details at | ||
| 19 | * http://www.gnu.org/copyleft/gpl.html | ||
| 20 | * | ||
| 21 | * Official project repository can be found at: | ||
| 22 | * http://code.google.com/p/gekko-gc-emu/ | ||
| 23 | */ | ||
| 24 | |||
| 25 | #ifndef CITRUS_CITRUS_H_ | ||
| 26 | #define CITRUS_CITRUS_H_ | ||
| 27 | |||
| 28 | #include "version.h" | ||
| 29 | |||
| 30 | #define APP_NAME "citrus" | ||
| 31 | #define APP_VERSION "0.01-" VERSION | ||
| 32 | #define APP_TITLE APP_NAME " " APP_VERSION | ||
| 33 | #define COPYRIGHT "Copyright (C) 2013 Citrus Team" | ||
| 34 | |||
| 35 | #endif // CITRUS_CITRUS_H_ | ||
diff --git a/src/citrus/src/emu_window/emu_window_glfw.cpp b/src/citrus/src/emu_window/emu_window_glfw.cpp deleted file mode 100644 index 381f1d9a7..000000000 --- a/src/citrus/src/emu_window/emu_window_glfw.cpp +++ /dev/null | |||
| @@ -1,96 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright (C) 2013 Citrus Emulator | ||
| 3 | * | ||
| 4 | * @file emu_window_glfw.cpp | ||
| 5 | * @author ShizZy <shizzy@6bit.net> | ||
| 6 | * @date 2013-09-04 | ||
| 7 | * @brief Implementation implementation of EmuWindow class for GLFW | ||
| 8 | * | ||
| 9 | * @section LICENSE | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 18 | * General Public License for more details at | ||
| 19 | * http://www.gnu.org/copyleft/gpl.html | ||
| 20 | * | ||
| 21 | * Official project repository can be found at: | ||
| 22 | * http://code.google.com/p/gekko-gc-emu/ | ||
| 23 | */ | ||
| 24 | |||
| 25 | #include "common.h" | ||
| 26 | #include "emu_window_glfw.h" | ||
| 27 | |||
| 28 | static void OnKeyEvent(GLFWwindow* win, int key, int action) { | ||
| 29 | // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); | ||
| 30 | //input_common::GCController::GCButtonState state; | ||
| 31 | |||
| 32 | //if (action == GLFW_PRESS) { | ||
| 33 | // state = input_common::GCController::PRESSED; | ||
| 34 | //} else { | ||
| 35 | // state = input_common::GCController::RELEASED; | ||
| 36 | //} | ||
| 37 | // for (int channel = 0; channel < 4 && emuwin->controller_interface(); ++channel) { | ||
| 38 | // emuwin->controller_interface()->SetControllerStatus(channel, key, state); | ||
| 39 | // } | ||
| 40 | } | ||
| 41 | |||
| 42 | static void OnWindowSizeEvent(GLFWwindow* win, int width, int height) { | ||
| 43 | EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); | ||
| 44 | emuwin->set_client_area_width(width); | ||
| 45 | emuwin->set_client_area_height(height); | ||
| 46 | } | ||
| 47 | |||
| 48 | /// EmuWindow_GLFW constructor | ||
| 49 | EmuWindow_GLFW::EmuWindow_GLFW() { | ||
| 50 | // Initialize the window | ||
| 51 | if(glfwInit() != GL_TRUE) { | ||
| 52 | printf("Failed to initialize GLFW! Exiting..."); | ||
| 53 | exit(1); | ||
| 54 | } | ||
| 55 | glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); | ||
| 56 | glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); | ||
| 57 | render_window_ = glfwCreateWindow(640, 480, "citrus", NULL, NULL); | ||
| 58 | |||
| 59 | // Setup callbacks | ||
| 60 | glfwSetWindowUserPointer(render_window_, this); | ||
| 61 | //glfwSetKeyCallback(render_window_, OnKeyEvent); | ||
| 62 | //glfwSetWindowSizeCallback(render_window_, OnWindowSizeEvent); | ||
| 63 | |||
| 64 | DoneCurrent(); | ||
| 65 | } | ||
| 66 | |||
| 67 | /// EmuWindow_GLFW destructor | ||
| 68 | EmuWindow_GLFW::~EmuWindow_GLFW() { | ||
| 69 | glfwTerminate(); | ||
| 70 | } | ||
| 71 | |||
| 72 | /// Swap buffers to display the next frame | ||
| 73 | void EmuWindow_GLFW::SwapBuffers() { | ||
| 74 | glfwSwapBuffers(render_window_); | ||
| 75 | } | ||
| 76 | |||
| 77 | /// Polls window events | ||
| 78 | void EmuWindow_GLFW::PollEvents() { | ||
| 79 | // TODO(ShizZy): Does this belong here? This is a reasonable place to update the window title | ||
| 80 | // from the main thread, but this should probably be in an event handler... | ||
| 81 | static char title[128]; | ||
| 82 | sprintf(title, "%s (FPS: %02.02f)", window_title_.c_str(), 0.0f); | ||
| 83 | glfwSetWindowTitle(render_window_, title); | ||
| 84 | |||
| 85 | glfwPollEvents(); | ||
| 86 | } | ||
| 87 | |||
| 88 | /// Makes the GLFW OpenGL context current for the caller thread | ||
| 89 | void EmuWindow_GLFW::MakeCurrent() { | ||
| 90 | glfwMakeContextCurrent(render_window_); | ||
| 91 | } | ||
| 92 | |||
| 93 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread | ||
| 94 | void EmuWindow_GLFW::DoneCurrent() { | ||
| 95 | glfwMakeContextCurrent(NULL); | ||
| 96 | } | ||
diff --git a/src/citrus/src/emu_window/emu_window_glfw.h b/src/citrus/src/emu_window/emu_window_glfw.h deleted file mode 100644 index 11d832b9a..000000000 --- a/src/citrus/src/emu_window/emu_window_glfw.h +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * Copyright (C) 2013 Citrus Emulator | ||
| 3 | * | ||
| 4 | * @file emu_window_glfw.h | ||
| 5 | * @author ShizZy <shizzy@6bit.net> | ||
| 6 | * @date 2013-09-04 | ||
| 7 | * @brief Implementation implementation of EmuWindow class for GLFW | ||
| 8 | * | ||
| 9 | * @section LICENSE | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, but | ||
| 16 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 18 | * General Public License for more details at | ||
| 19 | * http://www.gnu.org/copyleft/gpl.html | ||
| 20 | * | ||
| 21 | * Official project repository can be found at: | ||
| 22 | * http://code.google.com/p/gekko-gc-emu/ | ||
| 23 | */ | ||
| 24 | |||
| 25 | #ifndef CITRUS_EMUWINDOW_GLFW_ | ||
| 26 | #define CITRUS_EMUWINDOW_GLFW_ | ||
| 27 | |||
| 28 | #include <GL/glew.h> | ||
| 29 | #include <GLFW/glfw3.h> | ||
| 30 | |||
| 31 | #include "emu_window.h" | ||
| 32 | |||
| 33 | class EmuWindow_GLFW : public EmuWindow { | ||
| 34 | public: | ||
| 35 | EmuWindow_GLFW(); | ||
| 36 | ~EmuWindow_GLFW(); | ||
| 37 | |||
| 38 | /// Swap buffers to display the next frame | ||
| 39 | void SwapBuffers(); | ||
| 40 | |||
| 41 | /// Polls window events | ||
| 42 | void PollEvents(); | ||
| 43 | |||
| 44 | /// Makes the graphics context current for the caller thread | ||
| 45 | void MakeCurrent(); | ||
| 46 | |||
| 47 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread | ||
| 48 | void DoneCurrent(); | ||
| 49 | |||
| 50 | GLFWwindow* render_window_; ///< Internal GLFW render window | ||
| 51 | |||
| 52 | private: | ||
| 53 | |||
| 54 | }; | ||
| 55 | |||
| 56 | #endif // CITRUS_EMUWINDOW_GLFW_ | ||
diff --git a/src/citrus/src/version.h b/src/citrus/src/version.h deleted file mode 100644 index 07b88c641..000000000 --- a/src/citrus/src/version.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | // GENERATED - Do not edit! | ||
| 2 | #ifndef VERSION_H_ | ||
| 3 | #define VERSION_H_ | ||
| 4 | #define __BUILD__ "122" | ||
| 5 | #define VERSION __BUILD__ | ||
| 6 | #endif // VERSION_H_ | ||