diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 746cf083d2..37ea97403a 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -22,17 +22,17 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#include "common.h" -#include "log_manager.h" -#include "file_util.h" +#include "common/common.h" +#include "common/log_manager.h" +#include "common/file_util.h" -#include "system.h" -#include "core.h" -#include "loader.h" +#include "core/system.h" +#include "core/core.h" +#include "core/loader.h" -#include "emu_window/emu_window_glfw.h" +#include "citra/emu_window/emu_window_glfw.h" -#include "citra.h" +#include "citra/citra.h" #define E_ERR -1 @@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) { System::Init(emu_window); - std::string boot_filename = "homebrew.elf"; + std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf"; std::string error_str; bool res = Loader::LoadFile(boot_filename, &error_str); diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj index 16157ad04e..4ea222fcd0 100644 --- a/src/citra/citra.vcxproj +++ b/src/citra/citra.vcxproj @@ -199,20 +199,17 @@ - - + + + + - - - + - - - - + diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters index f0b6906deb..b41cdf1460 100644 --- a/src/citra/citra.vcxproj.filters +++ b/src/citra/citra.vcxproj.filters @@ -1,28 +1,25 @@  - - - - emu_window - - - - - - - - emu_window - - - - - {e3161526-9f53-4670-8dae-2be81ff01bc2} - + + + emu_window + + + + + + + + emu_window + + + + \ No newline at end of file diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 4cdb7fbb08..0192d8598c 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp @@ -22,9 +22,9 @@ * http://code.google.com/p/gekko-gc-emu/ */ -#include "common.h" -#include "video_core.h" -#include "emu_window_glfw.h" +#include "common/common.h" +#include "video_core/video_core.h" +#include "citra/emu_window/emu_window_glfw.h" static void OnKeyEvent(GLFWwindow* win, int key, int action) { // EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win); diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index abca9faa86..c3feb6e510 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h @@ -27,7 +27,7 @@ #include #include -#include "emu_window.h" +#include "common/emu_window.h" class EmuWindow_GLFW : public EmuWindow { public: diff --git a/src/citra_qt/citra_qt.vcxproj b/src/citra_qt/citra_qt.vcxproj index 9164b280b5..da8740beca 100644 --- a/src/citra_qt/citra_qt.vcxproj +++ b/src/citra_qt/citra_qt.vcxproj @@ -127,43 +127,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - src/config/ui_ - - - - - + + + + + + + + + - @@ -173,6 +151,38 @@ {8aea7f29-3466-4786-a10d-6a4bd0610977} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/citra_qt/citra_qt.vcxproj.filters b/src/citra_qt/citra_qt.vcxproj.filters index 3900cc8e0a..5bc29c1d7f 100644 --- a/src/citra_qt/citra_qt.vcxproj.filters +++ b/src/citra_qt/citra_qt.vcxproj.filters @@ -12,20 +12,6 @@ - - - debugger - - - debugger - - - - debugger - - - debugger - qhexedit @@ -38,22 +24,29 @@ qhexedit - - + + + + config - + config + + debugger + + + debugger + + + debugger + + + debugger + - - - debugger - - - debugger - qhexedit @@ -66,38 +59,67 @@ qhexedit - - debugger - - - debugger - - - - - config - - - config - - - - debugger - - - debugger - - - debugger - - - + + + + + + + + + config + + + config + + + config + + + debugger + + + debugger + + + debugger + + + debugger + + + debugger + + + debugger + + + debugger + + + debugger + + + + + + + config + + + debugger + + + debugger + + + debugger - + \ No newline at end of file diff --git a/src/common/atomic.h b/src/common/atomic.h index 883bc14fb6..ff2fb23d3f 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -7,12 +7,12 @@ #ifdef _WIN32 -#include "atomic_win32.h" +#include "common/atomic_win32.h" #else // GCC-compatible compiler assumed! -#include "atomic_gcc.h" +#include "common/atomic_gcc.h" #endif diff --git a/src/common/atomic_gcc.h b/src/common/atomic_gcc.h index 2eb38697b2..953c82c6c9 100644 --- a/src/common/atomic_gcc.h +++ b/src/common/atomic_gcc.h @@ -5,7 +5,7 @@ #ifndef _ATOMIC_GCC_H_ #define _ATOMIC_GCC_H_ -#include "common.h" +#include "common/common.h" // Atomic operations are performed in a single step by the CPU. It is // impossible for other threads to see the operation "half-done." diff --git a/src/common/atomic_win32.h b/src/common/atomic_win32.h index 760b16d4da..f8ec80520b 100644 --- a/src/common/atomic_win32.h +++ b/src/common/atomic_win32.h @@ -5,7 +5,7 @@ #ifndef _ATOMIC_WIN32_H_ #define _ATOMIC_WIN32_H_ -#include "common.h" +#include "common/common.h" #include #include diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp index 787263f792..25d34a21a3 100644 --- a/src/common/break_points.cpp +++ b/src/common/break_points.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "debug_interface.h" -#include "break_points.h" +#include "common/common.h" +#include "common/debug_interface.h" +#include "common/break_points.h" #include #include diff --git a/src/common/break_points.h b/src/common/break_points.h index dc771ba013..46df346653 100644 --- a/src/common/break_points.h +++ b/src/common/break_points.h @@ -8,7 +8,7 @@ #include #include -#include "common.h" +#include "common/common.h" class DebugInterface; diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 68c2943ab7..a412058570 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -41,8 +41,8 @@ #endif #endif -#include "common.h" -#include "file_util.h" +#include "common/common.h" +#include "common/file_util.h" //#include "../ext/snappy/snappy-c.h" #if defined(IOS) || defined(MACGNUSTD) diff --git a/src/common/common.h b/src/common/common.h index 3b71d9b3d3..8795c8a0ef 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -43,12 +43,12 @@ private: }; #endif -#include "log.h" -#include "common_types.h" -#include "msg_handler.h" -#include "common_funcs.h" -#include "common_paths.h" -#include "platform.h" +#include "common/log.h" +#include "common/common_types.h" +#include "common/msg_handler.h" +#include "common/common_funcs.h" +#include "common/common_paths.h" +#include "common/platform.h" #ifdef __APPLE__ // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index f9033fa570..32d735a092 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -146,67 +146,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,6 +153,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index ccc15d6139..3bdaa973f2 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -1,64 +1,63 @@  - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/common/common_paths.h b/src/common/common_paths.h index 9ccb87d823..252e93fa9f 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -6,7 +6,7 @@ #define _COMMON_PATHS_H_ // Make sure we pick up USER_DIR if set in config.h -#include "common.h" +#include "common/common.h" // Directory seperators, do we need this? #define DIR_SEP "/" diff --git a/src/common/common_types.h b/src/common/common_types.h index af1cd0e21b..4289b88d37 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -62,7 +62,7 @@ typedef signed long long s64; ///< 64-bit signed int typedef float f32; ///< 32-bit floating point typedef double f64; ///< 64-bit floating point -#include "swap.h" +#include "common/swap.h" /// Union for fast 16-bit type casting union t16 { diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp index 270ad9ce98..b5f32d1bd9 100644 --- a/src/common/console_listener.cpp +++ b/src/common/console_listener.cpp @@ -13,9 +13,9 @@ #include #endif -#include "common.h" -#include "log_manager.h" // Common -#include "console_listener.h" // Common +#include "common/common.h" +#include "common/log_manager.h" // Common +#include "common/console_listener.h" // Common ConsoleListener::ConsoleListener() { diff --git a/src/common/console_listener.h b/src/common/console_listener.h index a2936050db..224d170172 100644 --- a/src/common/console_listener.h +++ b/src/common/console_listener.h @@ -5,7 +5,7 @@ #ifndef _CONSOLELISTENER_H #define _CONSOLELISTENER_H -#include "log_manager.h" +#include "common/log_manager.h" #ifdef _WIN32 #include diff --git a/src/common/emu_window.h b/src/common/emu_window.h index f49367057e..7f68c9237d 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -25,7 +25,7 @@ #ifndef CORE_EMUWINDOW_H_ #define CORE_EMUWINDOW_H_ -#include "common.h" +#include "common/common.h" //namespace input_common //{ diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp index 9f717dba36..77425bd0d4 100644 --- a/src/common/extended_trace.cpp +++ b/src/common/extended_trace.cpp @@ -16,8 +16,8 @@ #include #include -#include "extended_trace.h" -#include "string_util.h" +#include "common/extended_trace.h" +#include "common/string_util.h" using namespace std; #include diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h index 57efcd8390..4e80f53b4c 100644 --- a/src/common/fifo_queue.h +++ b/src/common/fifo_queue.h @@ -5,7 +5,7 @@ // a simple lockless thread-safe, // single reader, single writer queue -#include "atomic.h" +#include "common/atomic.h" namespace Common { diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp index 59f6401099..a9d19477de 100644 --- a/src/common/file_search.cpp +++ b/src/common/file_search.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "common.h" -#include "common_paths.h" +#include "common/common.h" +#include "common/common_paths.h" #ifndef _WIN32 #include #include @@ -15,9 +15,8 @@ #include #include -#include "file_search.h" - -#include "string_util.h" +#include "common/file_search.h" +#include "common/string_util.h" CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 8b47cb3e55..d36304d911 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -3,10 +3,10 @@ // Refer to the license.txt file included. -#include "common.h" -#include "common_paths.h" -#include "file_util.h" -#include "string_util.h" +#include "common/common.h" +#include "common/common_paths.h" +#include "common/file_util.h" +#include "common/string_util.h" #ifdef _WIN32 #include @@ -32,7 +32,7 @@ #include #include -#include "string_util.h" +#include "common/string_util.h" #ifndef S_ISDIR #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) diff --git a/src/common/file_util.h b/src/common/file_util.h index f4ef949d89..5edb43f6ae 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -12,8 +12,8 @@ #include #include -#include "common.h" -#include "string_util.h" +#include "common/common.h" +#include "common/string_util.h" // User directory indices for GetUserPath enum { diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 5303f07b57..d2ebc73416 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "hash.h" +#include "common/hash.h" #if _M_SSE >= 0x402 -#include "cpu_detect.h" +#include "common/cpu_detect.h" #include #endif diff --git a/src/common/hash.h b/src/common/hash.h index addfa4b5fb..c69908415e 100644 --- a/src/common/hash.h +++ b/src/common/hash.h @@ -6,7 +6,7 @@ #ifndef _HASH_H_ #define _HASH_H_ -#include "common.h" +#include "common/common.h" u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h index da5d6b9b42..a246876153 100644 --- a/src/common/linear_disk_cache.h +++ b/src/common/linear_disk_cache.h @@ -6,7 +6,7 @@ #ifndef _LINEAR_DISKCACHE #define _LINEAR_DISKCACHE -#include "common.h" +#include "common/common.h" #include // defined in Version.cpp diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index b5b0348469..245760d0da 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -4,14 +4,11 @@ #include -#ifdef ANDROID -#include "Host.h" -#endif -#include "log_manager.h" -#include "console_listener.h" -#include "timer.h" -#include "thread.h" -#include "file_util.h" +#include "common/log_manager.h" +#include "common/console_listener.h" +#include "common/timer.h" +#include "common/thread.h" +#include "common/file_util.h" void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char *file, int line, const char* fmt, ...) diff --git a/src/common/log_manager.h b/src/common/log_manager.h index 579198ff6d..580860b4d6 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h @@ -5,10 +5,10 @@ #ifndef _LOGMANAGER_H_ #define _LOGMANAGER_H_ -#include "log.h" -#include "string_util.h" -#include "thread.h" -#include "file_util.h" +#include "common/log.h" +#include "common/string_util.h" +#include "common/thread.h" +#include "common/file_util.h" #include #include diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp index da90f8d744..82eceab00d 100644 --- a/src/common/math_util.cpp +++ b/src/common/math_util.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "common.h" -#include "math_util.h" +#include "common/common.h" +#include "common/math_util.h" #include #include diff --git a/src/common/math_util.h b/src/common/math_util.h index 4410c5e017..9167d20122 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h @@ -6,7 +6,7 @@ #ifndef _MATH_UTIL_H_ #define _MATH_UTIL_H_ -#include "common.h" +#include "common/common.h" #include diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp index 1a6fcf44dc..b918eb5688 100644 --- a/src/common/mem_arena.cpp +++ b/src/common/mem_arena.cpp @@ -17,12 +17,10 @@ #include -#include "memory_util.h" -#include "mem_arena.h" +#include "common/memory_util.h" +#include "common/mem_arena.h" -#ifdef _WIN32 -//#include "CommonWindows.h" -#else +#ifndef _WIN32 #include #include #include diff --git a/src/common/mem_arena.h b/src/common/mem_arena.h index 8bdf9f1890..667efbea91 100644 --- a/src/common/mem_arena.h +++ b/src/common/mem_arena.h @@ -26,7 +26,7 @@ #include #endif -#include "common.h" +#include "common/common.h" // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. // Multiple views can mirror the same section of the block, which makes it very convient for emulating diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index cc6e77b358..71ef159c36 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -3,9 +3,9 @@ // Refer to the license.txt file included. -#include "common.h" -#include "memory_util.h" -#include "string_util.h" +#include "common/common.h" +#include "common/memory_util.h" +#include "common/string_util.h" #ifdef _WIN32 #include diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 9358054781..cf6df44e80 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" +#include "common/common.h" #ifdef _WIN32 #include diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp index 8e9fe218e5..c1386cdaa1 100644 --- a/src/common/msg_handler.cpp +++ b/src/common/msg_handler.cpp @@ -4,8 +4,8 @@ #include // System -#include "common.h" // Local -#include "string_util.h" +#include "common/common.h" // Local +#include "common/string_util.h" bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); static MsgAlertHandler msg_handler = DefaultMsgHandler; diff --git a/src/common/platform.h b/src/common/platform.h index 84c6b63651..633f1d694b 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -25,7 +25,7 @@ #ifndef COMMON_PLATFORM_H_ #define COMMON_PLATFORM_H_ -#include "common_types.h" +#include "common/common_types.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Platform definitions diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj index d2d9b7fbbb..6b81c9055b 100644 --- a/src/common/scm_rev_gen.vcxproj +++ b/src/common/scm_rev_gen.vcxproj @@ -19,12 +19,11 @@ - - + + - - + {69F00340-5C3D-449F-9A80-958435C6CF06} diff --git a/src/common/std_condition_variable.h b/src/common/std_condition_variable.h index cee7a9dcd1..8964b4f6fa 100644 --- a/src/common/std_condition_variable.h +++ b/src/common/std_condition_variable.h @@ -29,7 +29,7 @@ // partial std::condition_variable implementation for win32/pthread -#include "std_mutex.h" +#include "common/std_mutex.h" #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) #define USE_RVALUE_REFERENCES diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 415dcbbc76..a99644f118 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -6,9 +6,9 @@ #include #include -#include "common.h" -#include "common_paths.h" -#include "string_util.h" +#include "common/common.h" +#include "common/common_paths.h" +#include "common/string_util.h" #ifdef _WIN32 #include diff --git a/src/common/string_util.h b/src/common/string_util.h index fcbae47156..6b7e847970 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -12,7 +12,7 @@ #include #include -#include "common.h" +#include "common/common.h" std::string StringFromFormat(const char* format, ...); // Cheap! diff --git a/src/common/thread.cpp b/src/common/thread.cpp index 27dbf3f93d..c70ee37cf8 100644 --- a/src/common/thread.cpp +++ b/src/common/thread.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "thread.h" -#include "common.h" +#include "common/thread.h" +#include "common/common.h" #ifdef __APPLE__ #include diff --git a/src/common/thread.h b/src/common/thread.h index 6384a44a11..d72ac7b47a 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -5,12 +5,12 @@ #ifndef _THREAD_H_ #define _THREAD_H_ -#include "std_condition_variable.h" -#include "std_mutex.h" -#include "std_thread.h" +#include "common/std_condition_variable.h" +#include "common/std_mutex.h" +#include "common/std_thread.h" // Don't include common.h here as it will break LogManager -#include "common_types.h" +#include "common/common_types.h" #include #include diff --git a/src/common/thunk.h b/src/common/thunk.h index c9e6fd39fe..2c2f23cd02 100644 --- a/src/common/thunk.h +++ b/src/common/thunk.h @@ -7,8 +7,7 @@ #include -#include "common.h" -#include "x64Emitter.h" +#include "common/common.h" // This simple class creates a wrapper around a C/C++ function that saves all fp state // before entering it, and restores it upon exit. This is required to be able to selectively diff --git a/src/common/timer.cpp b/src/common/timer.cpp index 90604292ef..f8e1fadca2 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp @@ -12,9 +12,9 @@ #include #endif -#include "common.h" -#include "timer.h" -#include "string_util.h" +#include "common/common.h" +#include "common/timer.h" +#include "common/string_util.h" namespace Common { diff --git a/src/common/timer.h b/src/common/timer.h index 20c86762ab..cfa5cf6091 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -5,7 +5,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#include "common.h" +#include "common/common.h" #include namespace Common diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp index 9aa8088efa..fe52701839 100644 --- a/src/common/utf8.cpp +++ b/src/common/utf8.cpp @@ -26,8 +26,8 @@ #include #include -#include "common_types.h" -#include "utf8.h" +#include "common/common_types.h" +#include "common/utf8.h" // is start of UTF sequence inline bool isutf(char c) { diff --git a/src/common/utf8.h b/src/common/utf8.h index 36cf757130..6479ec5ad0 100644 --- a/src/common/utf8.h +++ b/src/common/utf8.h @@ -16,7 +16,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" #include u32 u8_nextchar(const char *s, int *i); diff --git a/src/common/version.cpp b/src/common/version.cpp index 01890dbb65..f0df884d7b 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "scm_rev.h" +#include "common/common.h" +#include "common/scm_rev.h" #ifdef _DEBUG #define BUILD_TYPE_STR "Debug " diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index eee2f62408..e5df2d9710 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -4,8 +4,8 @@ #pragma once -#include "common.h" -#include "common_types.h" +#include "common/common.h" +#include "common/common_types.h" /// Generic ARM11 CPU interface class ARM_Interface { diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 82ca5ee8dd..db15674983 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -2,7 +2,8 @@ #include #include -#include "arm_disasm.h" + +#include "core/arm/disassembler/arm_disasm.h" static const char *cond_names[] = { "eq", diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h index 074149f1bf..03b781c6d3 100644 --- a/src/core/arm/interpreter/arm_interpreter.h +++ b/src/core/arm/interpreter/arm_interpreter.h @@ -24,12 +24,11 @@ #pragma once -#include "common.h" -#include "common_types.h" -#include "arm/arm_interface.h" +#include "common/common.h" -#include "arm/interpreter/armdefs.h" -#include "arm/interpreter/armemu.h" +#include "core/arm/arm_interface.h" +#include "core/arm/interpreter/armdefs.h" +#include "core/arm/interpreter/armemu.h" class ARM_Interpreter : virtual public ARM_Interface { public: diff --git a/src/core/arm/interpreter/armcpu.h b/src/core/arm/interpreter/armcpu.h index d7e336b94c..6b5ea85663 100644 --- a/src/core/arm/interpreter/armcpu.h +++ b/src/core/arm/interpreter/armcpu.h @@ -28,7 +28,7 @@ #include #include -#include "thread.h" +#include "common/thread.h" typedef struct ARM_CPU_State_s { diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/interpreter/armdefs.h index 0136a52d29..30b5b689c1 100644 --- a/src/core/arm/interpreter/armdefs.h +++ b/src/core/arm/interpreter/armdefs.h @@ -32,7 +32,7 @@ //#include "portable/mman.h" #include "arm_regformat.h" -#include "platform.h" +#include "common/platform.h" #include "skyeye_defs.h" //AJ2D-------------------------------------------------------------------------- @@ -82,7 +82,7 @@ //teawater add DBCT_TEST_SPEED 2005.10.04--------------------------------------- #include -#include "platform.h" +#include "common/platform.h" #if EMU_PLATFORM == PLATFORM_LINUX #include diff --git a/src/core/arm/interpreter/armemu.h b/src/core/arm/interpreter/armemu.h index 2ab317fdd4..7391dea7fd 100644 --- a/src/core/arm/interpreter/armemu.h +++ b/src/core/arm/interpreter/armemu.h @@ -17,7 +17,7 @@ #ifndef __ARMEMU_H__ #define __ARMEMU_H__ -#include "common.h" +#include "common/common.h" #include "armdefs.h" //#include "skyeye.h" diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index f48232eecc..cdbd02f3c6 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "platform.h" +#include "common/platform.h" #if EMU_PLATFORM == PLATFORM_LINUX #include #endif diff --git a/src/core/arm/interpreter/armmmu.h b/src/core/arm/interpreter/armmmu.h index c28d8753e3..8b24e61517 100644 --- a/src/core/arm/interpreter/armmmu.h +++ b/src/core/arm/interpreter/armmmu.h @@ -172,18 +172,18 @@ typedef struct mmu_ops_s } mmu_ops_t; -#include "arm/mmu/tlb.h" -#include "arm/mmu/rb.h" -#include "arm/mmu/wb.h" -#include "arm/mmu/cache.h" +#include "core/arm/mmu/tlb.h" +#include "core/arm/mmu/rb.h" +#include "core/arm/mmu/wb.h" +#include "core/arm/mmu/cache.h" /*special process mmu.h*/ -//#include "arm/mmu/sa_mmu.h" -//#include "arm/mmu/arm7100_mmu.h" -//#include "arm/mmu/arm920t_mmu.h" -//#include "arm/mmu/arm926ejs_mmu.h" -#include "arm/mmu/arm1176jzf_s_mmu.h" -//#include "arm/mmu/cortex_a9_mmu.h" +//#include "core/arm/mmu/sa_mmu.h" +//#include "core/arm/mmu/arm7100_mmu.h" +//#include "core/arm/mmu/arm920t_mmu.h" +//#include "core/arm/mmu/arm926ejs_mmu.h" +#include "core/arm/mmu/arm1176jzf_s_mmu.h" +//#include "core/arm/mmu/cortex_a9_mmu.h" typedef struct mmu_state_t { diff --git a/src/core/arm/interpreter/skyeye_defs.h b/src/core/arm/interpreter/skyeye_defs.h index 6562e595a7..b6713ebadb 100644 --- a/src/core/arm/interpreter/skyeye_defs.h +++ b/src/core/arm/interpreter/skyeye_defs.h @@ -1,7 +1,7 @@ #ifndef CORE_ARM_SKYEYE_DEFS_H_ #define CORE_ARM_SKYEYE_DEFS_H_ -#include "common.h" +#include "common/common.h" #define MODE32 #define MODET diff --git a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp index 0a3206abbd..7e7fbfbfa4 100644 --- a/src/core/arm/mmu/arm1176jzf_s_mmu.cpp +++ b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp @@ -22,11 +22,11 @@ #include #include -#include "mem_map.h" +#include "core/mem_map.h" -#include "arm/interpreter/skyeye_defs.h" +#include "core/arm/interpreter/skyeye_defs.h" -#include "arm/interpreter/armdefs.h" +#include "core/arm/interpreter/armdefs.h" //#include "bank_defs.h" #if 0 #define TLB_SIZE 1024 * 1024 diff --git a/src/core/core.cpp b/src/core/core.cpp index 540b20f27e..28f6b6c586 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "core.h" -#include "mem_map.h" -#include "hw/hw.h" -#include "arm/disassembler/arm_disasm.h" -#include "arm/interpreter/arm_interpreter.h" +#include "common/common_types.h" +#include "common/log.h" +#include "core/core.h" + +#include "core/mem_map.h" +#include "core/hw/hw.h" +#include "core/arm/disassembler/arm_disasm.h" +#include "core/arm/interpreter/arm_interpreter.h" namespace Core { diff --git a/src/core/core.h b/src/core/core.h index bae9f3e3d2..4b42dabcbd 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -4,8 +4,8 @@ #pragma once -#include "arm/arm_interface.h" -#include "arm/interpreter/armdefs.h" +#include "core/arm/arm_interface.h" +#include "core/arm/interpreter/armdefs.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 2edb51214a..1800b55129 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -137,59 +137,59 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 0cd208dd69..2efac81272 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -1,58 +1,5 @@  - - - - arm\disassembler - - - - - - file_sys - - - file_sys - - - - - elf - - - arm\mmu - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - hw - - - hw - - {b84ab55c-588b-45f0-a5ba-f9ebb0442f13} @@ -66,93 +13,143 @@ {7f618562-73d1-4f55-9628-887497c27654} - - {671d3218-3771-4218-b142-1f9a1cc24a51} - - - {794616f8-739f-4643-9c3f-869e50831d4f} - {cca8b763-8a80-4478-9bcc-3c979293c357} {d1158fc4-3e0f-431f-9d3b-f30bbfeb4ad5} + + {7ae34319-6d72-4d12-bc62-9b438ba9241f} + - + + arm\disassembler + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\mmu + + + file_sys + + + file_sys + + + hw + + + hw + + + elf + + + + + + + + + + arm\disassembler - - - + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + + arm\interpreter + + arm\mmu - + arm\mmu - + arm\mmu - + arm\mmu - + arm\mmu - - + file_sys - + file_sys - + file_sys - - - + + hw + + + hw + + elf - + elf - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - - arm\interpreter - - + arm - - arm\interpreter - - - hw - - - hw - + + + + + - + \ No newline at end of file diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 78bbaafe2d..a4fc0aaa40 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -5,12 +5,13 @@ #include #include -#include "msg_handler.h" -#include "std_mutex.h" -#include "atomic.h" -#include "core_timing.h" -#include "core.h" -#include "chunk_file.h" +#include "common/msg_handler.h" +#include "common/std_mutex.h" +#include "common/atomic.h" +#include "common/chunk_file.h" + +#include "core/core_timing.h" +#include "core/core.h" int g_clock_rate_arm11 = 268123480; diff --git a/src/core/core_timing.h b/src/core/core_timing.h index b62acea6c3..09fdf7a908 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -17,7 +17,7 @@ // inside callback: // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") -#include "common.h" +#include "common/common.h" class PointerWrap; diff --git a/src/core/elf/elf_reader.cpp b/src/core/elf/elf_reader.cpp index aef7c13e93..2b03caa0ff 100644 --- a/src/core/elf/elf_reader.cpp +++ b/src/core/elf/elf_reader.cpp @@ -4,10 +4,11 @@ #include -#include "common.h" -#include "mem_map.h" +#include "common/common.h" + +#include "core/mem_map.h" +#include "core/elf/elf_reader.h" -#include "elf/elf_reader.h" //#include "Core/Debugger/Debugger_SymbolMap.h" //#include "Core/HW/Memmap.h" //#include "Core/PowerPC/PPCSymbolDB.h" diff --git a/src/core/elf/elf_reader.h b/src/core/elf/elf_reader.h index 9393a589d3..3e2869f87d 100644 --- a/src/core/elf/elf_reader.h +++ b/src/core/elf/elf_reader.h @@ -4,7 +4,7 @@ #pragma once -#include "elf/elf_types.h" +#include "core/elf/elf_types.h" enum KnownElfTypes { diff --git a/src/core/file_sys/directory_file_system.cpp b/src/core/file_sys/directory_file_system.cpp index 29369eec41..6c6f33c2b3 100644 --- a/src/core/file_sys/directory_file_system.cpp +++ b/src/core/file_sys/directory_file_system.cpp @@ -15,13 +15,11 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "chunk_file.h" -#include "file_util.h" -#include "directory_file_system.h" -//#include "ISOFileSystem.h" -//#include "Core/HLE/sceKernel.h" -//#include "file/zip_read.h" -#include "utf8.h" +#include "common/chunk_file.h" +#include "common/file_util.h" +#include "common/utf8.h" + +#include "core/file_sys/directory_file_system.h" #if EMU_PLATFORM == PLATFORM_WINDOWS #include diff --git a/src/core/file_sys/directory_file_system.h b/src/core/file_sys/directory_file_system.h index a11331a27b..9af2854a2a 100644 --- a/src/core/file_sys/directory_file_system.h +++ b/src/core/file_sys/directory_file_system.h @@ -15,14 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#ifndef CORE_FILE_SYS_DIRECTORY_H_ -#define CORE_FILE_SYS_DIRECTORY_H_ +#pragma once // TODO: Remove the Windows-specific code, FILE is fine there too. #include -#include "file_sys.h" +#include "core/file_sys/file_sys.h" #ifdef _WIN32 typedef void * HANDLE; @@ -154,5 +153,3 @@ private: std::string GetLocalPath(std::string localpath); }; - -#endif // CORE_FILE_SYS_DIRECTORY_H_ diff --git a/src/core/file_sys/file_sys.h b/src/core/file_sys/file_sys.h index b27e36c80a..bb8503e62f 100644 --- a/src/core/file_sys/file_sys.h +++ b/src/core/file_sys/file_sys.h @@ -17,8 +17,8 @@ #pragma once -#include "common.h" -#include "chunk_file.h" +#include "common/common.h" +#include "common/chunk_file.h" enum FileAccess { FILEACCESS_NONE=0, diff --git a/src/core/file_sys/meta_file_system.cpp b/src/core/file_sys/meta_file_system.cpp index f86c3cb18d..01048e4986 100644 --- a/src/core/file_sys/meta_file_system.cpp +++ b/src/core/file_sys/meta_file_system.cpp @@ -17,10 +17,9 @@ #include #include -#include "string_util.h" -#include "file_sys/meta_file_system.h" -//#include "Core/HLE/sceKernelThread.h" -//#include "Core/Reporting.h" + +#include "common/string_util.h" +#include "core/file_sys/meta_file_system.h" static bool ApplyPathStringToComponentsVector(std::vector &vector, const std::string &pathString) { diff --git a/src/core/file_sys/meta_file_system.h b/src/core/file_sys/meta_file_system.h index 0de23d49c1..961f75cda4 100644 --- a/src/core/file_sys/meta_file_system.h +++ b/src/core/file_sys/meta_file_system.h @@ -17,8 +17,9 @@ #pragma once -#include "std_mutex.h" -#include "file_sys.h" +#include "common/std_mutex.h" + +#include "core/file_sys/file_sys.h" class MetaFileSystem : public IHandleAllocator, public IFileSystem { diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 57be4d6a84..44625e3af3 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -2,9 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "hw/hw.h" -#include "hw/hw_lcd.h" +#include "common/common_types.h" +#include "common/log.h" + +#include "core/hw/hw.h" +#include "core/hw/hw_lcd.h" namespace HW { diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h index 5b0cc8c872..92e9304cac 100644 --- a/src/core/hw/hw.h +++ b/src/core/hw/hw.h @@ -4,7 +4,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" namespace HW { diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/hw_lcd.cpp index ad346c7945..fd783a84a5 100644 --- a/src/core/hw/hw_lcd.cpp +++ b/src/core/hw/hw_lcd.cpp @@ -2,10 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "log.h" -#include "core.h" -#include "hw_lcd.h" -#include "video_core.h" +#include "common/common_types.h" +#include "common/log.h" + +#include "core/core.h" +#include "core/hw/hw_lcd.h" + +#include "video_core/video_core.h" namespace LCD { diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/hw_lcd.h index 30e347ccb5..386ed6004a 100644 --- a/src/core/hw/hw_lcd.h +++ b/src/core/hw/hw_lcd.h @@ -4,7 +4,7 @@ #pragma once -#include "common_types.h" +#include "common/common_types.h" namespace LCD { diff --git a/src/core/loader.cpp b/src/core/loader.cpp index 5d039dc942..8c6d54a689 100644 --- a/src/core/loader.cpp +++ b/src/core/loader.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "file_util.h" -#include "loader.h" -#include "system.h" -#include "core.h" -#include "file_sys/directory_file_system.h" -#include "elf/elf_reader.h" +#include "common/common_types.h" +#include "common/file_util.h" + +#include "core/loader.h" +#include "core/system.h" +#include "core/core.h" +#include "core/file_sys/directory_file_system.h" +#include "core/elf/elf_reader.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/loader.h b/src/core/loader.h index 46525fcf8e..3dd8c471de 100644 --- a/src/core/loader.h +++ b/src/core/loader.h @@ -4,7 +4,7 @@ #pragma once -#include "common.h" +#include "common/common.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 96f77d32ec..96f8d0440b 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -2,11 +2,11 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "mem_arena.h" +#include "common/common.h" +#include "common/mem_arena.h" -#include "mem_map.h" -#include "core.h" +#include "core/mem_map.h" +#include "core/core.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map.h b/src/core/mem_map.h index ad5abd16d6..1a3bd7234e 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -6,8 +6,8 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -#include "common.h" -#include "common_types.h" +#include "common/common.h" +#include "common/common_types.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 7d8ae2915b..4c0e08b3fb 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" +#include "common/common.h" -#include "mem_map.h" -#include "hw/hw.h" +#include "core/mem_map.h" +#include "core/hw/hw.h" namespace Memory { diff --git a/src/core/system.cpp b/src/core/system.cpp index 1fc272d701..edb07fef57 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "core.h" -#include "hw/hw.h" -#include "core_timing.h" -#include "mem_map.h" -#include "system.h" -#include "video_core.h" +#include "core/core.h" +#include "core/core_timing.h" +#include "core/mem_map.h" +#include "core/system.h" +#include "core/hw/hw.h" + +#include "video_core/video_core.h" namespace System { diff --git a/src/core/system.h b/src/core/system.h index 8e94e5252b..09f1f6ebe4 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -4,8 +4,8 @@ #pragma once -#include "emu_window.h" -#include "file_sys/meta_file_system.h" +#include "common/emu_window.h" +#include "core/file_sys/meta_file_system.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 94748d6907..bc65bf0ce0 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -4,8 +4,7 @@ #pragma once -#include "common.h" -#include "hash.h" +#include "common/common.h" class RendererBase { public: diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 6010bcbc3b..97f84c248f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,9 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "mem_map.h" -#include "video_core.h" -#include "renderer_opengl/renderer_opengl.h" +#include "video_core/video_core.h" +#include "video_core/renderer_opengl/renderer_opengl.h" + +#include "core/mem_map.h" /// RendererOpenGL constructor diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 86dc7b70ee..00aa17649f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -6,10 +6,10 @@ #include -#include "common.h" -#include "emu_window.h" +#include "common/common.h" +#include "common/emu_window.h" -#include "renderer_base.h" +#include "video_core/renderer_base.h" class RendererOpenGL : virtual public RendererBase { diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index a6dd1e02c4..67d74a2d83 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp @@ -5,7 +5,7 @@ #include #include -#include "utils.h" +#include "video_core/utils.h" namespace VideoCore { diff --git a/src/video_core/utils.h b/src/video_core/utils.h index c417342e16..20d4ec9e0f 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -6,7 +6,7 @@ #include -#include "common_types.h" +#include "common/common_types.h" namespace FormatPrecision { diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 6c0c415f5f..e227b6795f 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -2,15 +2,15 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "common.h" -#include "emu_window.h" -#include "log.h" +#include "common/common.h" +#include "common/emu_window.h" +#include "common/log.h" -#include "core.h" +#include "core/core.h" -#include "video_core.h" -#include "renderer_base.h" -#include "renderer_opengl/renderer_opengl.h" +#include "video_core/video_core.h" +#include "video_core/renderer_base.h" +#include "video_core/renderer_opengl/renderer_opengl.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Video Core namespace diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index 19bf49dd72..d227b6aa42 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h @@ -4,8 +4,9 @@ #pragma once -#include "common.h" -#include "emu_window.h" +#include "common/common.h" +#include "common/emu_window.h" + #include "renderer_base.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj index 5c56e9b71a..d8c53271eb 100644 --- a/src/video_core/video_core.vcxproj +++ b/src/video_core/video_core.vcxproj @@ -19,15 +19,15 @@ - - - + + + - - - - + + + + diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters index e796fbe219..4eb2ef0a4d 100644 --- a/src/video_core/video_core.vcxproj.filters +++ b/src/video_core/video_core.vcxproj.filters @@ -1,26 +1,26 @@  - - - - - renderer_opengl - - - - - - - - renderer_opengl - - - - - {e0245557-dbd4-423e-9399-513d5e99f1e4} + + + renderer_opengl + + + + + + + renderer_opengl + + + + + + + + \ No newline at end of file diff --git a/vsprops/base.props b/vsprops/base.props index 6241bd44b8..7eedacc744 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\video_core\src;%(AdditionalIncludeDirectories) + $(SolutionDir)src;%(AdditionalIncludeDirectories) false