diff --git a/.gitignore b/.gitignore index 001894c3c1..cc8abe9ff8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,5 @@ -# Compiled Object files -*.slo -*.lo -*.o - -# Compiled Dynamic libraries -*.so -*.dylib - -# Compiled Static libraries -*.lai -*.la -*.a - -# MSVS generated files -ipch/ -*.suo -*.user -*.sdf -*.opensdf - -# Build generated files +# Build directory build/ -bin/ # Generated source files src/common/scm_rev.cpp - -# Generated header files -src/citra_qt/ui_*.h diff --git a/citra.sln b/citra.sln deleted file mode 100644 index af1f1ee55a..0000000000 --- a/citra.sln +++ /dev/null @@ -1,87 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "src\common\common.vcxproj", "{DFE335FC-755D-4BAA-8452-94434F8A1EDB}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -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} - {6678D1A3-33A6-48A9-878B-48E5D2903D27} = {6678D1A3-33A6-48A9-878B-48E5D2903D27} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "src\core\core.vcxproj", "{8AEA7F29-3466-4786-A10D-6A4BD0610977}" - ProjectSection(ProjectDependencies) = postProject - {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scm_rev_gen", "src\common\scm_rev_gen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "citra_qt", "src\citra_qt\citra_qt.vcxproj", "{A587F714-490F-407A-9E36-7AB7FA0D7BAB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video_core", "src\video_core\video_core.vcxproj", "{6678D1A3-33A6-48A9-878B-48E5D2903D27}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|Win32.Build.0 = Debug|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.ActiveCfg = Debug|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Debug|x64.Build.0 = Debug|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.ActiveCfg = Release|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|Win32.Build.0 = Release|Win32 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.ActiveCfg = Release|x64 - {DFE335FC-755D-4BAA-8452-94434F8A1EDB}.Release|x64.Build.0 = Release|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.ActiveCfg = Debug|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|Win32.Build.0 = Debug|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.ActiveCfg = Debug|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Debug|x64.Build.0 = Debug|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.ActiveCfg = Release|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|Win32.Build.0 = Release|Win32 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.ActiveCfg = Release|x64 - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}.Release|x64.Build.0 = Release|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|Win32.Build.0 = Debug|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.ActiveCfg = Debug|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Debug|x64.Build.0 = Debug|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.ActiveCfg = Release|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|Win32.Build.0 = Release|Win32 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.ActiveCfg = Release|x64 - {8AEA7F29-3466-4786-A10D-6A4BD0610977}.Release|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Debug|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|Win32.ActiveCfg = Debug|Win32 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|Win32.Build.0 = Debug|Win32 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|x64.ActiveCfg = Debug|x64 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Debug|x64.Build.0 = Debug|x64 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|Win32.ActiveCfg = Release|Win32 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|Win32.Build.0 = Release|Win32 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|x64.ActiveCfg = Release|x64 - {A587F714-490F-407A-9E36-7AB7FA0D7BAB}.Release|x64.Build.0 = Release|x64 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|Win32.ActiveCfg = Debug|Win32 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|Win32.Build.0 = Debug|Win32 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|x64.ActiveCfg = Debug|x64 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Debug|x64.Build.0 = Debug|x64 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|Win32.ActiveCfg = Release|Win32 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|Win32.Build.0 = Release|Win32 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|x64.ActiveCfg = Release|x64 - {6678D1A3-33A6-48A9-878B-48E5D2903D27}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj deleted file mode 100644 index bda1ed07d2..0000000000 --- a/src/citra/citra.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CE7D2C07-21CE-4590-81AB-2ADA88A2B85F} - Win32Proj - emu_win32 - citra - - - - Application - true - v120 - - - Application - true - v120 - - - Application - false - v120 - - - Application - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - msvcrtd.lib;msvcrt.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - libcmt.lib - - - - - - - - - - - - - - - - - - {dfe335fc-755d-4baa-8452-94434f8a1edb} - true - true - false - true - false - - - {8aea7f29-3466-4786-a10d-6a4bd0610977} - true - true - false - true - false - - - {6678d1a3-33a6-48a9-878b-48e5d2903d27} - - - - - - - - - - - - - - - - - diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters deleted file mode 100644 index 78954670e0..0000000000 --- a/src/citra/citra.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {e3161526-9f53-4670-8dae-2be81ff01bc2} - - - - - - emu_window - - - - - - emu_window - - - - - - diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj deleted file mode 100644 index 746c12a5bc..0000000000 --- a/src/citra_qt/citra_qt.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A587F714-490F-407A-9E36-7AB7FA0D7BAB} - citra_qt - - - - Application - true - v120 - - - Application - true - v120 - - - Application - false - v120 - - - Application - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dfe335fc-755d-4baa-8452-94434f8a1edb} - - - {8aea7f29-3466-4786-a10d-6a4bd0610977} - - - {6678d1a3-33a6-48a9-878b-48e5d2903d27} - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters deleted file mode 100644 index 8f699e50e4..0000000000 --- a/src/citra_qt/citra_qt.vcxproj.filters +++ /dev/null @@ -1,118 +0,0 @@ - - - - - {dede739c-939b-4147-9e72-4a326b97d237} - - - {80178741-d3ab-4031-892c-ec58490ea8bf} - - - {9495d0e7-87d6-4fe1-92f1-cfa1bbec7025} - - - - - qhexedit - - - qhexedit - - - qhexedit - - - qhexedit - - - - - - config - - - config - - - debugger - - - debugger - - - debugger - - - debugger - - - debugger - - - debugger - - - - - qhexedit - - - qhexedit - - - qhexedit - - - qhexedit - - - - - - debugger - - - debugger - - - debugger - - - debugger - - - debugger - - - debugger - - - - - - config - - - config - - - - - - - config - - - debugger - - - debugger - - - debugger - - - - - - \ No newline at end of file diff --git a/src/citra_qt/qt-build.props b/src/citra_qt/qt-build.props deleted file mode 100644 index b6a5025fbd..0000000000 --- a/src/citra_qt/qt-build.props +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Midl - CustomBuild - - - - .hpp - ui_ - $(QTDIR)\bin\uic.exe [inputs] -o "[QtUicPrefix]%(FileName)[QtUicExt]" - [QtUicPrefix]%(FileName)[QtUicExt] - %(FileName).ui - - - - Midl - CustomBuild - - - - true - true - true - true - true - true - true - true - False - False - _moc - %(FileName)%(QtMocPfx) - $(QTDIR)\bin\moc.exe [QtMocNoWarnings] [QtCoreLib] [QtShared] [QtThread] [QtUnicode] [QtLargeFile] [QtKeywords] [QtOpenGLLib] [QtNoDebug] [QtGuiLib] -DWIN32 -D_MSC_VER=1500 -DWIN32 [Inputs] -o$(IntDir)%(QtMocFilename).cpp && cl.exe $(IntDir)%(QtMocFilename).cpp [QtCommandLine] /c /Fo"$(IntDir)%(QtMocFilename).obj" - $(IntDir)%(QtMocFilename).obj - %(FileName).hxx - true - - - - Midl - CustomBuild - - - - _qrc - %(FileName)%(QtQrcPfx) - %QTDIR%\bin\rcc.exe [inputs] -o $(IntDir)%(QtQrcFileName).cpp && cl.exe $(IntDir)%(QtQrcFileName).cpp /c /Fo"$(IntDir)%(QtQrcFileName)" [QtCommandLine] - $(IntDir)%(QtQrcFileName).obj - %(FileName).qrc - - - diff --git a/src/citra_qt/qt-build.targets b/src/citra_qt/qt-build.targets deleted file mode 100644 index d0ae0d6424..0000000000 --- a/src/citra_qt/qt-build.targets +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - _UIC - - - _MOC - - - _QRC - - - - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - - - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - - - $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml - - - - - - - - @(UIC, '|') - - - - - - - - - $(ComputeLinkInputsTargets); - ComputeUICOutput; - - - $(ComputeLibInputsTargets); - ComputeUICOutput; - - - - - - - - - - - - - - - - - - @(MOC, '|') - - - - - - - - - $(ComputeLinkInputsTargets); - ComputeMOCOutput; - - - $(ComputeLibInputsTargets); - ComputeMOCOutput; - - - - - - - - - - - - - - - - - - @(QRC, '|') - - - - - - - - - $(ComputeLinkInputsTargets); - ComputeQRCOutput; - - - $(ComputeLibInputsTargets); - ComputeQRCOutput; - - - - - - - - - - - - diff --git a/src/citra_qt/qt-build.xml b/src/citra_qt/qt-build.xml deleted file mode 100644 index 7a69f5a884..0000000000 --- a/src/citra_qt/qt-build.xml +++ /dev/null @@ -1,491 +0,0 @@ - - - - - - - - - - - General - - - - - Command Line - - - - - - - - - - - - - - Execute Before - - - Specifies the targets for the build customization to run before. - - - - - - - - - - - Execute After - - - Specifies the targets for the build customization to run after. - - - - - - - - - - - - - - Additional Options - - - Additional Options - - - - - - - - - - - - - - General - - - - - Command Line - - - - - - - - - - - - - - - - - - - - - - - - Execute Before - - - Specifies the targets for the build customization to run before. - - - - - - - - - - - Execute After - - - Specifies the targets for the build customization to run after. - - - - - - - - - - - - - - Additional Options - - - Additional Options - - - - - - - - - - - - - - General - - - - - Command Line - - - - - - - - - - - - - - Execute Before - - - Specifies the targets for the build customization to run before. - - - - - - - - - - - Execute After - - - Specifies the targets for the build customization to run after. - - - - - - - - - - - - - - Additional Options - - - Additional Options - - - - - - - diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj deleted file mode 100644 index 341d3a813c..0000000000 --- a/src/common/common.vcxproj +++ /dev/null @@ -1,224 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DFE335FC-755D-4BAA-8452-94434F8A1EDB} - common - - - - true - StaticLibrary - MultiByte - v120 - - - true - StaticLibrary - MultiByte - v120 - - - false - StaticLibrary - Unicode - v120 - - - StaticLibrary - false - MultiByte - - - false - StaticLibrary - Unicode - v120 - - - StaticLibrary - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - ProgramDatabase - - - - - - true - - - - - - - true - true - true - - - - - - - true - true - true - - - - - - - true - true - true - - - - - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters deleted file mode 100644 index 59268ce5ae..0000000000 --- a/src/common/common.vcxproj.filters +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/common/scm_rev_gen.js b/src/common/scm_rev_gen.js deleted file mode 100644 index 98313e376f..0000000000 --- a/src/common/scm_rev_gen.js +++ /dev/null @@ -1,74 +0,0 @@ -var wshShell = new ActiveXObject("WScript.Shell") -var oFS = new ActiveXObject("Scripting.FileSystemObject"); - -var outfile = "scm_rev.cpp"; -var cmd_revision = " rev-parse HEAD"; -var cmd_describe = " describe --always --long --dirty"; -var cmd_branch = " rev-parse --abbrev-ref HEAD"; - -var git_search_paths = { - "git.cmd": 1, - "git": 1, - "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1, - "C:\\Program Files\\Git\\bin\\git.exe": 1 -}; - -function GetGitExe() { - for (var gitexe in git_search_paths) { - try { - wshShell.Exec(gitexe); - return gitexe; - } catch (e) { - } - } - - WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + - wshShell.ExpandEnvironmentStrings("%PATH%")); - WScript.Quit(1); -} - -function GetFirstStdOutLine(cmd) { - try { - return wshShell.Exec(cmd).StdOut.ReadLine(); - } catch (e) { - // catch "the system cannot find the file specified" error - WScript.Echo("Failed to exec " + cmd + " this should never happen"); - WScript.Quit(1); - } -} - -function GetFileContents(f) { - try { - return oFS.OpenTextFile(f).ReadAll(); - } catch (e) { - // file doesn't exist - return ""; - } -} - -// get info from git -var gitexe = GetGitExe(); -var revision = GetFirstStdOutLine(gitexe + cmd_revision); -var describe = GetFirstStdOutLine(gitexe + cmd_describe); -var branch = GetFirstStdOutLine(gitexe + cmd_branch); -var isMaster = +("master" == branch); - -// remove hash (and trailing "-0" if needed) from description -describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); - -var out_contents = - "#include \"common/scm_rev.h\"\n" + - "namespace Common {\n" + - " const char g_scm_rev[] = \"" + revision + "\";\n" + - " const char g_scm_branch[] = \"" + branch + "\";\n" + - " const char g_scm_desc[] = \"" + describe + "\";\n" + - "}\n"; - -// check if file needs updating -if (out_contents == GetFileContents(outfile)) { - WScript.Echo(outfile + " current at " + describe); -} else { - // needs updating - writeout current info - oFS.CreateTextFile(outfile, true).Write(out_contents); - WScript.Echo(outfile + " updated to " + describe); -} diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj deleted file mode 100644 index f4f2a62395..0000000000 --- a/src/common/scm_rev_gen.vcxproj +++ /dev/null @@ -1,87 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - {69F00340-5C3D-449F-9A80-958435C6CF06} - scm_rev_gen - scm_rev_gen - - - - Utility - false - Unicode - v120 - - - v120 - - - v120 - - - v120 - - - - - - - - - - - - - - - - - - - - - - - - - cscript /nologo /E:JScript "scm_rev_gen.js" - - - - - cscript /nologo /E:JScript "scm_rev_gen.js" - - - - - cscript /nologo /E:JScript "scm_rev_gen.js" - - - - - - \ No newline at end of file diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj deleted file mode 100644 index ddc174c2c2..0000000000 --- a/src/core/core.vcxproj +++ /dev/null @@ -1,253 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8AEA7F29-3466-4786-A10D-6A4BD0610977} - core - - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - true - - - - - - - true - true - true - - - - - Fast - false - StreamingSIMDExtensions2 - - - - - - true - true - true - - - - - - {dfe335fc-755d-4baa-8452-94434f8a1edb} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters deleted file mode 100644 index 68ba9e50b8..0000000000 --- a/src/core/core.vcxproj.filters +++ /dev/null @@ -1,339 +0,0 @@ - - - - - {b84ab55c-588b-45f0-a5ba-f9ebb0442f13} - - - {61100188-a726-4024-ab16-95ee242b446e} - - - {7f618562-73d1-4f55-9628-887497c27654} - - - {cca8b763-8a80-4478-9bcc-3c979293c357} - - - {d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5} - - - {8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7} - - - {812c5189-ca49-4704-b842-3ffad09092d3} - - - {de62238f-a28e-4a33-8495-23fed6784588} - - - {13ef9860-2ba0-47e9-a93d-b4052adab269} - - - {8089d94b-5faa-43dc-854b-ffd2fa2e7fe3} - - - {491d5558-5f3a-4283-8ba4-0a58b1984e37} - - - - - arm\disassembler - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - hw - - - - - - - - hle - - - hle\service - - - hle\service - - - hle\service - - - hle\service - - - hle\service - - - hw - - - hw - - - arm\disassembler - - - hle - - - hle - - - arm\interpreter\vfp - - - arm\interpreter\vfp - - - arm\interpreter\vfp - - - arm\interpreter\vfp - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - hle\kernel - - - hle\kernel - - - hle - - - hle\kernel - - - arm\interpreter - - - hle\kernel - - - hle\service - - - loader - - - loader - - - loader - - - hle\kernel - - - hle\service - - - file_sys - - - hle\kernel - - - hle\kernel - - - - - arm\disassembler - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - hw - - - arm - - - - - - - hle - - - hle - - - hle\service - - - hle\service - - - hle\service - - - hle\service - - - hle\service - - - hw - - - hw - - - arm\disassembler - - - hle - - - hle - - - arm\interpreter\vfp - - - arm\interpreter\vfp - - - arm\interpreter\vfp - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - arm\interpreter\mmu - - - hle\kernel - - - hle\kernel - - - hle - - - hle\kernel - - - hle\kernel - - - hle\service - - - loader - - - loader - - - loader - - - hle\kernel - - - hle\service - - - file_sys - - - file_sys - - - hle\kernel - - - hle\kernel - - - - - - \ No newline at end of file diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj deleted file mode 100644 index a115f44b1a..0000000000 --- a/src/video_core/video_core.vcxproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {6678D1A3-33A6-48A9-878B-48E5D2903D27} - input_common - video_core - - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - false - v120 - - - StaticLibrary - false - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - true - - - - - - true - true - true - - - - - - - - - true - true - true - - - - - - diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters deleted file mode 100644 index b40271abcf..0000000000 --- a/src/video_core/video_core.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - {e0245557-dbd4-423e-9399-513d5e99f1e4} - - - {0ac498e6-bbd8-46e3-9d5f-e816546ab90e} - - - {00301d57-24b3-4717-86a4-0073d131eb78} - - - - - renderer_opengl - - - renderer_opengl - - - - - - - - - - debug_utils - - - renderer_opengl\generated - - - - - - - - - - - - - - - - renderer_opengl - - - renderer_opengl - - - renderer_opengl - - - debug_utils - - - renderer_opengl\generated - - - - - - \ No newline at end of file diff --git a/vsprops/app.props b/vsprops/app.props deleted file mode 100644 index b9c583e0f4..0000000000 --- a/vsprops/app.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - $(SolutionDir)bin\$(PlatformName)\ - - - $(EmuBinDir) - $(ProjectName)$(Configuration) - - - - xcopy "$(SolutionDir)data" "$(EmuBinDir)" /Y /S /D -xcopy "$(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform)\glfw3.dll" "$(EmuBinDir)" /Y /S /D -%(Command) - - - comctl32.lib;winmm.lib;%(AdditionalDependencies) - - - - - $(EmuBinDir) - - - \ No newline at end of file diff --git a/vsprops/base.props b/vsprops/base.props deleted file mode 100644 index 7eedacc744..0000000000 --- a/vsprops/base.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)build\$(ProjectName)\$(PlatformName)\$(Configuration)\ - - - - Level3 - 16Bytes - true - true - $(SolutionDir)src;%(AdditionalIncludeDirectories) - - - false - - - true - - - - \ No newline at end of file diff --git a/vsprops/code_generation_debug.props b/vsprops/code_generation_debug.props deleted file mode 100644 index abd617d71f..0000000000 --- a/vsprops/code_generation_debug.props +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - _DEBUG;_SECURE_SCL=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - MultiThreadedDebug - false - - - - - /NODEFAULTLIB:LIBCMT %(AdditionalOptions) - - - - \ No newline at end of file diff --git a/vsprops/code_generation_release.props b/vsprops/code_generation_release.props deleted file mode 100644 index 732092ad6e..0000000000 --- a/vsprops/code_generation_release.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - <_PropertySheetDisplayName>code_generation_release - - - - false - MultiThreaded - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - StreamingSIMDExtensions2 - - - true - true - - - - \ No newline at end of file diff --git a/vsprops/externals.props b/vsprops/externals.props deleted file mode 100644 index 2d320c7942..0000000000 --- a/vsprops/externals.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - $(SolutionDir)externals\ - - - <_PropertySheetDisplayName>externals - - - - $(ExternalsDir)glfw-3.0.4.bin\include;$(ExternalsDir)qhexedit;%(AdditionalIncludeDirectories) - - - - - - $(ExternalsDir)glfw-3.0.4.bin\lib-msvc_$(PlatformToolset)-$(Platform);$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories) - glfw3dll.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - - - - - - - - $(ExternalsDir) - - - \ No newline at end of file diff --git a/vsprops/optimization_debug.props b/vsprops/optimization_debug.props deleted file mode 100644 index 3c7081f16c..0000000000 --- a/vsprops/optimization_debug.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - false - - - - \ No newline at end of file diff --git a/vsprops/optimization_release.props b/vsprops/optimization_release.props deleted file mode 100644 index ea1573e6c1..0000000000 --- a/vsprops/optimization_release.props +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - AnySuitable - - - - - true - - - - - Speed - - - - - true - - - - - true - - - - - true - MaxSpeed - - - UseLinkTimeCodeGeneration - - - - \ No newline at end of file diff --git a/vsprops/qt.props b/vsprops/qt.props deleted file mode 100644 index ba9455e962..0000000000 --- a/vsprops/qt.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - - $(QTDIR)\include\ - $(QTDIR)\lib\ - $(QTDIR)\bin\ - - - $(QtIncludeDir);$(QtIncludeDir)QtGui;$(QtIncludeDir)QtCore;$(QtIncludeDir)Qt;$(QtIncludeDir)QtOpenGL;$(QtIncludeDir)QtANGLE;$(QtIncludeDir)QtWidgets;$(ProjectDir);$(IncludePath) - $(QtLibraryDir);$(LibraryPath) - - - - - - - ui_ - .h - - - /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" - false - - - - - - - $(QtIncludeDir) - - - $(QtLibraryDir) - - - $(QtBinaryDir) - - - \ No newline at end of file diff --git a/vsprops/qt_libs_debug.props b/vsprops/qt_libs_debug.props deleted file mode 100644 index 65261c9086..0000000000 --- a/vsprops/qt_libs_debug.props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - QtCored4.lib;QtGuid4.lib;QtOpenGLd4.lib;%(AdditionalDependencies) - - - false - /I"$(SolutionDir)src" /I"$(ExternalsDir)sdl-1.2.15\include" /I"$(ExternalsDir)qhexedit" /D"_DEBUG" - - - xcopy "$(QtBinaryDir)QtCored4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtGuid4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtOpenGLd4.dll" "$(EmuBinDir)" /Y /S /D - - - - \ No newline at end of file diff --git a/vsprops/qt_libs_release.props b/vsprops/qt_libs_release.props deleted file mode 100644 index 0f02f30d59..0000000000 --- a/vsprops/qt_libs_release.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - QtCore4.lib;QtGui4.lib;QtOpenGL4.lib;%(AdditionalDependencies) - - - xcopy "$(QtBinaryDir)QtCore4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtGui4.dll" "$(EmuBinDir)" /Y /S /D -xcopy "$(QtBinaryDir)QtOpenGL4.dll" "$(EmuBinDir)" /Y /S /D - - - - \ No newline at end of file