summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/common/atomic.h4
-rw-r--r--src/common/atomic_gcc.h2
-rw-r--r--src/common/atomic_win32.h2
-rw-r--r--src/common/break_points.cpp6
-rw-r--r--src/common/break_points.h2
-rw-r--r--src/common/chunk_file.h4
-rw-r--r--src/common/common.h12
-rw-r--r--src/common/common.vcxproj119
-rw-r--r--src/common/common.vcxproj.filters109
-rw-r--r--src/common/common_paths.h2
-rw-r--r--src/common/common_types.h2
-rw-r--r--src/common/console_listener.cpp6
-rw-r--r--src/common/console_listener.h2
-rw-r--r--src/common/emu_window.h2
-rw-r--r--src/common/extended_trace.cpp4
-rw-r--r--src/common/fifo_queue.h2
-rw-r--r--src/common/file_search.cpp9
-rw-r--r--src/common/file_util.cpp10
-rw-r--r--src/common/file_util.h4
-rw-r--r--src/common/hash.cpp4
-rw-r--r--src/common/hash.h2
-rw-r--r--src/common/linear_disk_cache.h2
-rw-r--r--src/common/log_manager.cpp13
-rw-r--r--src/common/log_manager.h8
-rw-r--r--src/common/math_util.cpp4
-rw-r--r--src/common/math_util.h2
-rw-r--r--src/common/mem_arena.cpp8
-rw-r--r--src/common/mem_arena.h2
-rw-r--r--src/common/memory_util.cpp6
-rw-r--r--src/common/misc.cpp2
-rw-r--r--src/common/msg_handler.cpp4
-rw-r--r--src/common/platform.h2
-rw-r--r--src/common/scm_rev_gen.vcxproj7
-rw-r--r--src/common/std_condition_variable.h2
-rw-r--r--src/common/string_util.cpp6
-rw-r--r--src/common/string_util.h2
-rw-r--r--src/common/thread.cpp4
-rw-r--r--src/common/thread.h8
-rw-r--r--src/common/thunk.h3
-rw-r--r--src/common/timer.cpp6
-rw-r--r--src/common/timer.h2
-rw-r--r--src/common/utf8.cpp4
-rw-r--r--src/common/utf8.h2
-rw-r--r--src/common/version.cpp4
44 files changed, 201 insertions, 211 deletions
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 883bc14fb..ff2fb23d3 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -7,12 +7,12 @@
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9 9
10#include "atomic_win32.h" 10#include "common/atomic_win32.h"
11 11
12#else 12#else
13 13
14// GCC-compatible compiler assumed! 14// GCC-compatible compiler assumed!
15#include "atomic_gcc.h" 15#include "common/atomic_gcc.h"
16 16
17#endif 17#endif
18 18
diff --git a/src/common/atomic_gcc.h b/src/common/atomic_gcc.h
index 2eb38697b..953c82c6c 100644
--- a/src/common/atomic_gcc.h
+++ b/src/common/atomic_gcc.h
@@ -5,7 +5,7 @@
5#ifndef _ATOMIC_GCC_H_ 5#ifndef _ATOMIC_GCC_H_
6#define _ATOMIC_GCC_H_ 6#define _ATOMIC_GCC_H_
7 7
8#include "common.h" 8#include "common/common.h"
9 9
10// Atomic operations are performed in a single step by the CPU. It is 10// Atomic operations are performed in a single step by the CPU. It is
11// impossible for other threads to see the operation "half-done." 11// 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 760b16d4d..f8ec80520 100644
--- a/src/common/atomic_win32.h
+++ b/src/common/atomic_win32.h
@@ -5,7 +5,7 @@
5#ifndef _ATOMIC_WIN32_H_ 5#ifndef _ATOMIC_WIN32_H_
6#define _ATOMIC_WIN32_H_ 6#define _ATOMIC_WIN32_H_
7 7
8#include "common.h" 8#include "common/common.h"
9#include <intrin.h> 9#include <intrin.h>
10#include <Windows.h> 10#include <Windows.h>
11 11
diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp
index 787263f79..25d34a21a 100644
--- a/src/common/break_points.cpp
+++ b/src/common/break_points.cpp
@@ -2,9 +2,9 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "debug_interface.h" 6#include "common/debug_interface.h"
7#include "break_points.h" 7#include "common/break_points.h"
8 8
9#include <sstream> 9#include <sstream>
10#include <algorithm> 10#include <algorithm>
diff --git a/src/common/break_points.h b/src/common/break_points.h
index dc771ba01..46df34665 100644
--- a/src/common/break_points.h
+++ b/src/common/break_points.h
@@ -8,7 +8,7 @@
8#include <vector> 8#include <vector>
9#include <string> 9#include <string>
10 10
11#include "common.h" 11#include "common/common.h"
12 12
13class DebugInterface; 13class DebugInterface;
14 14
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index 68c2943ab..a41205857 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -41,8 +41,8 @@
41#endif 41#endif
42#endif 42#endif
43 43
44#include "common.h" 44#include "common/common.h"
45#include "file_util.h" 45#include "common/file_util.h"
46//#include "../ext/snappy/snappy-c.h" 46//#include "../ext/snappy/snappy-c.h"
47 47
48#if defined(IOS) || defined(MACGNUSTD) 48#if defined(IOS) || defined(MACGNUSTD)
diff --git a/src/common/common.h b/src/common/common.h
index 3b71d9b3d..8795c8a0e 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -43,12 +43,12 @@ private:
43}; 43};
44#endif 44#endif
45 45
46#include "log.h" 46#include "common/log.h"
47#include "common_types.h" 47#include "common/common_types.h"
48#include "msg_handler.h" 48#include "common/msg_handler.h"
49#include "common_funcs.h" 49#include "common/common_funcs.h"
50#include "common_paths.h" 50#include "common/common_paths.h"
51#include "platform.h" 51#include "common/platform.h"
52 52
53#ifdef __APPLE__ 53#ifdef __APPLE__
54// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries. 54// 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 f9033fa57..32d735a09 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -147,72 +147,71 @@
147 <Lib /> 147 <Lib />
148 </ItemDefinitionGroup> 148 </ItemDefinitionGroup>
149 <ItemGroup> 149 <ItemGroup>
150 <ClInclude Include="src\atomic.h" /> 150 <Reference Include="System" />
151 <ClInclude Include="src\atomic_gcc.h" /> 151 <Reference Include="System.Data" />
152 <ClInclude Include="src\atomic_win32.h" /> 152 <Reference Include="System.Drawing" />
153 <ClInclude Include="src\break_points.h" /> 153 <Reference Include="System.Windows.Forms" />
154 <ClInclude Include="src\chunk_file.h" /> 154 <Reference Include="System.Xml" />
155 <ClInclude Include="src\common.h" />
156 <ClInclude Include="src\common_funcs.h" />
157 <ClInclude Include="src\common_paths.h" />
158 <ClInclude Include="src\common_types.h" />
159 <ClInclude Include="src\console_listener.h" />
160 <ClInclude Include="src\cpu_detect.h" />
161 <ClInclude Include="src\debug_interface.h" />
162 <ClInclude Include="src\emu_window.h" />
163 <ClInclude Include="src\extended_trace.h" />
164 <ClInclude Include="src\fifo_queue.h" />
165 <ClInclude Include="src\file_search.h" />
166 <ClInclude Include="src\file_util.h" />
167 <ClInclude Include="src\fixed_size_queue.h" />
168 <ClInclude Include="src\hash.h" />
169 <ClInclude Include="src\linear_disk_cache.h" />
170 <ClInclude Include="src\log.h" />
171 <ClInclude Include="src\log_manager.h" />
172 <ClInclude Include="src\math_util.h" />
173 <ClInclude Include="src\memory_util.h" />
174 <ClInclude Include="src\mem_arena.h" />
175 <ClInclude Include="src\msg_handler.h" />
176 <ClInclude Include="src\platform.h" />
177 <ClInclude Include="src\scm_rev.h" />
178 <ClInclude Include="src\std_condition_variable.h" />
179 <ClInclude Include="src\std_mutex.h" />
180 <ClInclude Include="src\std_thread.h" />
181 <ClInclude Include="src\string_util.h" />
182 <ClInclude Include="src\swap.h" />
183 <ClInclude Include="src\thread.h" />
184 <ClInclude Include="src\thunk.h" />
185 <ClInclude Include="src\timer.h" />
186 <ClInclude Include="src\utf8.h" />
187 </ItemGroup> 155 </ItemGroup>
188 <ItemGroup> 156 <ItemGroup>
189 <ClCompile Include="src\break_points.cpp" /> 157 <ClInclude Include="atomic.h" />
190 <ClCompile Include="src\console_listener.cpp" /> 158 <ClInclude Include="atomic_gcc.h" />
191 <ClCompile Include="src\extended_trace.cpp" /> 159 <ClInclude Include="atomic_win32.h" />
192 <ClCompile Include="src\file_search.cpp" /> 160 <ClInclude Include="break_points.h" />
193 <ClCompile Include="src\file_util.cpp" /> 161 <ClInclude Include="chunk_file.h" />
194 <ClCompile Include="src\hash.cpp" /> 162 <ClInclude Include="common.h" />
195 <ClCompile Include="src\log_manager.cpp" /> 163 <ClInclude Include="common_funcs.h" />
196 <ClCompile Include="src\math_util.cpp" /> 164 <ClInclude Include="common_paths.h" />
197 <ClCompile Include="src\memory_util.cpp" /> 165 <ClInclude Include="common_types.h" />
198 <ClCompile Include="src\mem_arena.cpp" /> 166 <ClInclude Include="console_listener.h" />
199 <ClCompile Include="src\misc.cpp" /> 167 <ClInclude Include="cpu_detect.h" />
200 <ClCompile Include="src\msg_handler.cpp" /> 168 <ClInclude Include="debug_interface.h" />
201 <ClCompile Include="src\string_util.cpp" /> 169 <ClInclude Include="emu_window.h" />
202 <ClCompile Include="src\thread.cpp" /> 170 <ClInclude Include="extended_trace.h" />
203 <ClCompile Include="src\timer.cpp" /> 171 <ClInclude Include="fifo_queue.h" />
204 <ClCompile Include="src\utf8.cpp" /> 172 <ClInclude Include="file_search.h" />
205 <ClCompile Include="src\version.cpp" /> 173 <ClInclude Include="file_util.h" />
174 <ClInclude Include="fixed_size_queue.h" />
175 <ClInclude Include="hash.h" />
176 <ClInclude Include="linear_disk_cache.h" />
177 <ClInclude Include="log.h" />
178 <ClInclude Include="log_manager.h" />
179 <ClInclude Include="math_util.h" />
180 <ClInclude Include="memory_util.h" />
181 <ClInclude Include="mem_arena.h" />
182 <ClInclude Include="msg_handler.h" />
183 <ClInclude Include="platform.h" />
184 <ClInclude Include="std_condition_variable.h" />
185 <ClInclude Include="std_mutex.h" />
186 <ClInclude Include="std_thread.h" />
187 <ClInclude Include="string_util.h" />
188 <ClInclude Include="swap.h" />
189 <ClInclude Include="thread.h" />
190 <ClInclude Include="thunk.h" />
191 <ClInclude Include="timer.h" />
192 <ClInclude Include="utf8.h" />
206 </ItemGroup> 193 </ItemGroup>
207 <ItemGroup> 194 <ItemGroup>
208 <None Include="CMakeLists.txt" /> 195 <ClCompile Include="break_points.cpp" />
196 <ClCompile Include="console_listener.cpp" />
197 <ClCompile Include="extended_trace.cpp" />
198 <ClCompile Include="file_search.cpp" />
199 <ClCompile Include="file_util.cpp" />
200 <ClCompile Include="hash.cpp" />
201 <ClCompile Include="log_manager.cpp" />
202 <ClCompile Include="math_util.cpp" />
203 <ClCompile Include="memory_util.cpp" />
204 <ClCompile Include="mem_arena.cpp" />
205 <ClCompile Include="misc.cpp" />
206 <ClCompile Include="msg_handler.cpp" />
207 <ClCompile Include="string_util.cpp" />
208 <ClCompile Include="thread.cpp" />
209 <ClCompile Include="timer.cpp" />
210 <ClCompile Include="utf8.cpp" />
211 <ClCompile Include="version.cpp" />
209 </ItemGroup> 212 </ItemGroup>
210 <ItemGroup> 213 <ItemGroup>
211 <Reference Include="System" /> 214 <Text Include="CMakeLists.txt" />
212 <Reference Include="System.Data" />
213 <Reference Include="System.Drawing" />
214 <Reference Include="System.Windows.Forms" />
215 <Reference Include="System.Xml" />
216 </ItemGroup> 215 </ItemGroup>
217 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 216 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
218 <ImportGroup Label="ExtensionTargets"> 217 <ImportGroup Label="ExtensionTargets">
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index ccc15d613..3bdaa973f 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -1,64 +1,63 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup> 3 <ItemGroup>
4 <ClCompile Include="src\break_points.cpp" /> 4 <ClInclude Include="atomic.h" />
5 <ClCompile Include="src\console_listener.cpp" /> 5 <ClInclude Include="atomic_gcc.h" />
6 <ClCompile Include="src\extended_trace.cpp" /> 6 <ClInclude Include="atomic_win32.h" />
7 <ClCompile Include="src\file_search.cpp" /> 7 <ClInclude Include="break_points.h" />
8 <ClCompile Include="src\file_util.cpp" /> 8 <ClInclude Include="chunk_file.h" />
9 <ClCompile Include="src\hash.cpp" /> 9 <ClInclude Include="common.h" />
10 <ClCompile Include="src\log_manager.cpp" /> 10 <ClInclude Include="common_funcs.h" />
11 <ClCompile Include="src\math_util.cpp" /> 11 <ClInclude Include="common_paths.h" />
12 <ClCompile Include="src\memory_util.cpp" /> 12 <ClInclude Include="common_types.h" />
13 <ClCompile Include="src\mem_arena.cpp" /> 13 <ClInclude Include="console_listener.h" />
14 <ClCompile Include="src\misc.cpp" /> 14 <ClInclude Include="cpu_detect.h" />
15 <ClCompile Include="src\msg_handler.cpp" /> 15 <ClInclude Include="debug_interface.h" />
16 <ClCompile Include="src\string_util.cpp" /> 16 <ClInclude Include="emu_window.h" />
17 <ClCompile Include="src\thread.cpp" /> 17 <ClInclude Include="extended_trace.h" />
18 <ClCompile Include="src\timer.cpp" /> 18 <ClInclude Include="fifo_queue.h" />
19 <ClCompile Include="src\version.cpp" /> 19 <ClInclude Include="file_search.h" />
20 <ClCompile Include="src\utf8.cpp" /> 20 <ClInclude Include="file_util.h" />
21 <ClInclude Include="fixed_size_queue.h" />
22 <ClInclude Include="hash.h" />
23 <ClInclude Include="linear_disk_cache.h" />
24 <ClInclude Include="log.h" />
25 <ClInclude Include="log_manager.h" />
26 <ClInclude Include="math_util.h" />
27 <ClInclude Include="mem_arena.h" />
28 <ClInclude Include="memory_util.h" />
29 <ClInclude Include="msg_handler.h" />
30 <ClInclude Include="platform.h" />
31 <ClInclude Include="std_condition_variable.h" />
32 <ClInclude Include="std_mutex.h" />
33 <ClInclude Include="std_thread.h" />
34 <ClInclude Include="string_util.h" />
35 <ClInclude Include="swap.h" />
36 <ClInclude Include="thread.h" />
37 <ClInclude Include="thunk.h" />
38 <ClInclude Include="timer.h" />
39 <ClInclude Include="utf8.h" />
21 </ItemGroup> 40 </ItemGroup>
22 <ItemGroup> 41 <ItemGroup>
23 <ClInclude Include="src\atomic.h" /> 42 <ClCompile Include="break_points.cpp" />
24 <ClInclude Include="src\break_points.h" /> 43 <ClCompile Include="console_listener.cpp" />
25 <ClInclude Include="src\chunk_file.h" /> 44 <ClCompile Include="extended_trace.cpp" />
26 <ClInclude Include="src\common.h" /> 45 <ClCompile Include="file_search.cpp" />
27 <ClInclude Include="src\common_funcs.h" /> 46 <ClCompile Include="file_util.cpp" />
28 <ClInclude Include="src\common_paths.h" /> 47 <ClCompile Include="hash.cpp" />
29 <ClInclude Include="src\common_types.h" /> 48 <ClCompile Include="log_manager.cpp" />
30 <ClInclude Include="src\console_listener.h" /> 49 <ClCompile Include="math_util.cpp" />
31 <ClInclude Include="src\cpu_detect.h" /> 50 <ClCompile Include="mem_arena.cpp" />
32 <ClInclude Include="src\debug_interface.h" /> 51 <ClCompile Include="memory_util.cpp" />
33 <ClInclude Include="src\extended_trace.h" /> 52 <ClCompile Include="misc.cpp" />
34 <ClInclude Include="src\fifo_queue.h" /> 53 <ClCompile Include="msg_handler.cpp" />
35 <ClInclude Include="src\file_search.h" /> 54 <ClCompile Include="string_util.cpp" />
36 <ClInclude Include="src\file_util.h" /> 55 <ClCompile Include="thread.cpp" />
37 <ClInclude Include="src\fixed_size_queue.h" /> 56 <ClCompile Include="timer.cpp" />
38 <ClInclude Include="src\hash.h" /> 57 <ClCompile Include="utf8.cpp" />
39 <ClInclude Include="src\linear_disk_cache.h" /> 58 <ClCompile Include="version.cpp" />
40 <ClInclude Include="src\log.h" />
41 <ClInclude Include="src\log_manager.h" />
42 <ClInclude Include="src\math_util.h" />
43 <ClInclude Include="src\memory_util.h" />
44 <ClInclude Include="src\mem_arena.h" />
45 <ClInclude Include="src\msg_handler.h" />
46 <ClInclude Include="src\scm_rev.h" />
47 <ClInclude Include="src\std_condition_variable.h" />
48 <ClInclude Include="src\std_mutex.h" />
49 <ClInclude Include="src\std_thread.h" />
50 <ClInclude Include="src\string_util.h" />
51 <ClInclude Include="src\thread.h" />
52 <ClInclude Include="src\thunk.h" />
53 <ClInclude Include="src\timer.h" />
54 <ClInclude Include="src\atomic_gcc.h" />
55 <ClInclude Include="src\atomic_win32.h" />
56 <ClInclude Include="src\emu_window.h" />
57 <ClInclude Include="src\platform.h" />
58 <ClInclude Include="src\swap.h" />
59 <ClInclude Include="src\utf8.h" />
60 </ItemGroup> 59 </ItemGroup>
61 <ItemGroup> 60 <ItemGroup>
62 <None Include="CMakeLists.txt" /> 61 <Text Include="CMakeLists.txt" />
63 </ItemGroup> 62 </ItemGroup>
64</Project> \ No newline at end of file 63</Project> \ No newline at end of file
diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index 9ccb87d82..252e93fa9 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -6,7 +6,7 @@
6#define _COMMON_PATHS_H_ 6#define _COMMON_PATHS_H_
7 7
8// Make sure we pick up USER_DIR if set in config.h 8// Make sure we pick up USER_DIR if set in config.h
9#include "common.h" 9#include "common/common.h"
10 10
11// Directory seperators, do we need this? 11// Directory seperators, do we need this?
12#define DIR_SEP "/" 12#define DIR_SEP "/"
diff --git a/src/common/common_types.h b/src/common/common_types.h
index af1cd0e21..4289b88d3 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
62typedef float f32; ///< 32-bit floating point 62typedef float f32; ///< 32-bit floating point
63typedef double f64; ///< 64-bit floating point 63typedef double f64; ///< 64-bit floating point
64 64
65#include "swap.h" 65#include "common/swap.h"
66 66
67/// Union for fast 16-bit type casting 67/// Union for fast 16-bit type casting
68union t16 { 68union t16 {
diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp
index 270ad9ce9..b5f32d1bd 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -13,9 +13,9 @@
13#include <stdarg.h> 13#include <stdarg.h>
14#endif 14#endif
15 15
16#include "common.h" 16#include "common/common.h"
17#include "log_manager.h" // Common 17#include "common/log_manager.h" // Common
18#include "console_listener.h" // Common 18#include "common/console_listener.h" // Common
19 19
20ConsoleListener::ConsoleListener() 20ConsoleListener::ConsoleListener()
21{ 21{
diff --git a/src/common/console_listener.h b/src/common/console_listener.h
index a2936050d..224d17017 100644
--- a/src/common/console_listener.h
+++ b/src/common/console_listener.h
@@ -5,7 +5,7 @@
5#ifndef _CONSOLELISTENER_H 5#ifndef _CONSOLELISTENER_H
6#define _CONSOLELISTENER_H 6#define _CONSOLELISTENER_H
7 7
8#include "log_manager.h" 8#include "common/log_manager.h"
9 9
10#ifdef _WIN32 10#ifdef _WIN32
11#include <windows.h> 11#include <windows.h>
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index f49367057..7f68c9237 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -25,7 +25,7 @@
25#ifndef CORE_EMUWINDOW_H_ 25#ifndef CORE_EMUWINDOW_H_
26#define CORE_EMUWINDOW_H_ 26#define CORE_EMUWINDOW_H_
27 27
28#include "common.h" 28#include "common/common.h"
29 29
30//namespace input_common 30//namespace input_common
31//{ 31//{
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp
index 9f717dba3..77425bd0d 100644
--- a/src/common/extended_trace.cpp
+++ b/src/common/extended_trace.cpp
@@ -16,8 +16,8 @@
16 16
17#include <windows.h> 17#include <windows.h>
18#include <stdio.h> 18#include <stdio.h>
19#include "extended_trace.h" 19#include "common/extended_trace.h"
20#include "string_util.h" 20#include "common/string_util.h"
21using namespace std; 21using namespace std;
22 22
23#include <tchar.h> 23#include <tchar.h>
diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h
index 57efcd839..4e80f53b4 100644
--- a/src/common/fifo_queue.h
+++ b/src/common/fifo_queue.h
@@ -5,7 +5,7 @@
5// a simple lockless thread-safe, 5// a simple lockless thread-safe,
6// single reader, single writer queue 6// single reader, single writer queue
7 7
8#include "atomic.h" 8#include "common/atomic.h"
9 9
10namespace Common 10namespace Common
11{ 11{
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp
index 59f640109..a9d19477d 100644
--- a/src/common/file_search.cpp
+++ b/src/common/file_search.cpp
@@ -3,8 +3,8 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "common_paths.h" 7#include "common/common_paths.h"
8#ifndef _WIN32 8#ifndef _WIN32
9#include <sys/types.h> 9#include <sys/types.h>
10#include <dirent.h> 10#include <dirent.h>
@@ -15,9 +15,8 @@
15#include <string> 15#include <string>
16#include <algorithm> 16#include <algorithm>
17 17
18#include "file_search.h" 18#include "common/file_search.h"
19 19#include "common/string_util.h"
20#include "string_util.h"
21 20
22 21
23CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories) 22CFileSearch::CFileSearch(const CFileSearch::XStringVector& _rSearchStrings, const CFileSearch::XStringVector& _rDirectories)
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 8b47cb3e5..d36304d91 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -3,10 +3,10 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "common_paths.h" 7#include "common/common_paths.h"
8#include "file_util.h" 8#include "common/file_util.h"
9#include "string_util.h" 9#include "common/string_util.h"
10 10
11#ifdef _WIN32 11#ifdef _WIN32
12#include <windows.h> 12#include <windows.h>
@@ -32,7 +32,7 @@
32#include <algorithm> 32#include <algorithm>
33#include <sys/stat.h> 33#include <sys/stat.h>
34 34
35#include "string_util.h" 35#include "common/string_util.h"
36 36
37#ifndef S_ISDIR 37#ifndef S_ISDIR
38#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) 38#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
diff --git a/src/common/file_util.h b/src/common/file_util.h
index f4ef949d8..5edb43f6a 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -12,8 +12,8 @@
12#include <vector> 12#include <vector>
13#include <string.h> 13#include <string.h>
14 14
15#include "common.h" 15#include "common/common.h"
16#include "string_util.h" 16#include "common/string_util.h"
17 17
18// User directory indices for GetUserPath 18// User directory indices for GetUserPath
19enum { 19enum {
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 5303f07b5..d2ebc7341 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -3,9 +3,9 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "hash.h" 6#include "common/hash.h"
7#if _M_SSE >= 0x402 7#if _M_SSE >= 0x402
8#include "cpu_detect.h" 8#include "common/cpu_detect.h"
9#include <nmmintrin.h> 9#include <nmmintrin.h>
10#endif 10#endif
11 11
diff --git a/src/common/hash.h b/src/common/hash.h
index addfa4b5f..c69908415 100644
--- a/src/common/hash.h
+++ b/src/common/hash.h
@@ -6,7 +6,7 @@
6#ifndef _HASH_H_ 6#ifndef _HASH_H_
7#define _HASH_H_ 7#define _HASH_H_
8 8
9#include "common.h" 9#include "common/common.h"
10 10
11u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. 11u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
12u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower 12u32 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 da5d6b9b4..a24687615 100644
--- a/src/common/linear_disk_cache.h
+++ b/src/common/linear_disk_cache.h
@@ -6,7 +6,7 @@
6#ifndef _LINEAR_DISKCACHE 6#ifndef _LINEAR_DISKCACHE
7#define _LINEAR_DISKCACHE 7#define _LINEAR_DISKCACHE
8 8
9#include "common.h" 9#include "common/common.h"
10#include <fstream> 10#include <fstream>
11 11
12// defined in Version.cpp 12// defined in Version.cpp
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index b5b034846..245760d0d 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -4,14 +4,11 @@
4 4
5#include <algorithm> 5#include <algorithm>
6 6
7#ifdef ANDROID 7#include "common/log_manager.h"
8#include "Host.h" 8#include "common/console_listener.h"
9#endif 9#include "common/timer.h"
10#include "log_manager.h" 10#include "common/thread.h"
11#include "console_listener.h" 11#include "common/file_util.h"
12#include "timer.h"
13#include "thread.h"
14#include "file_util.h"
15 12
16void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, 13void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
17 const char *file, int line, const char* fmt, ...) 14 const char *file, int line, const char* fmt, ...)
diff --git a/src/common/log_manager.h b/src/common/log_manager.h
index 579198ff6..580860b4d 100644
--- a/src/common/log_manager.h
+++ b/src/common/log_manager.h
@@ -5,10 +5,10 @@
5#ifndef _LOGMANAGER_H_ 5#ifndef _LOGMANAGER_H_
6#define _LOGMANAGER_H_ 6#define _LOGMANAGER_H_
7 7
8#include "log.h" 8#include "common/log.h"
9#include "string_util.h" 9#include "common/string_util.h"
10#include "thread.h" 10#include "common/thread.h"
11#include "file_util.h" 11#include "common/file_util.h"
12 12
13#include <set> 13#include <set>
14#include <string.h> 14#include <string.h>
diff --git a/src/common/math_util.cpp b/src/common/math_util.cpp
index da90f8d74..82eceab00 100644
--- a/src/common/math_util.cpp
+++ b/src/common/math_util.cpp
@@ -3,8 +3,8 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "math_util.h" 7#include "common/math_util.h"
8 8
9#include <cmath> 9#include <cmath>
10#include <numeric> 10#include <numeric>
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 4410c5e01..9167d2012 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -6,7 +6,7 @@
6#ifndef _MATH_UTIL_H_ 6#ifndef _MATH_UTIL_H_
7#define _MATH_UTIL_H_ 7#define _MATH_UTIL_H_
8 8
9#include "common.h" 9#include "common/common.h"
10 10
11#include <vector> 11#include <vector>
12 12
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index 1a6fcf44d..b918eb568 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -17,12 +17,10 @@
17 17
18#include <string> 18#include <string>
19 19
20#include "memory_util.h" 20#include "common/memory_util.h"
21#include "mem_arena.h" 21#include "common/mem_arena.h"
22 22
23#ifdef _WIN32 23#ifndef _WIN32
24//#include "CommonWindows.h"
25#else
26#include <sys/stat.h> 24#include <sys/stat.h>
27#include <fcntl.h> 25#include <fcntl.h>
28#include <unistd.h> 26#include <unistd.h>
diff --git a/src/common/mem_arena.h b/src/common/mem_arena.h
index 8bdf9f189..667efbea9 100644
--- a/src/common/mem_arena.h
+++ b/src/common/mem_arena.h
@@ -26,7 +26,7 @@
26#include <e32std.h> 26#include <e32std.h>
27#endif 27#endif
28 28
29#include "common.h" 29#include "common/common.h"
30 30
31// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. 31// This class lets you create a block of anonymous RAM, and then arbitrarily map views into it.
32// Multiple views can mirror the same section of the block, which makes it very convient for emulating 32// 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 cc6e77b35..71ef159c3 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -3,9 +3,9 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5 5
6#include "common.h" 6#include "common/common.h"
7#include "memory_util.h" 7#include "common/memory_util.h"
8#include "string_util.h" 8#include "common/string_util.h"
9 9
10#ifdef _WIN32 10#ifdef _WIN32
11#include <windows.h> 11#include <windows.h>
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 935805478..cf6df44e8 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -2,7 +2,7 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6 6
7#ifdef _WIN32 7#ifdef _WIN32
8#include <windows.h> 8#include <windows.h>
diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp
index 8e9fe218e..c1386cdaa 100644
--- a/src/common/msg_handler.cpp
+++ b/src/common/msg_handler.cpp
@@ -4,8 +4,8 @@
4 4
5#include <stdio.h> // System 5#include <stdio.h> // System
6 6
7#include "common.h" // Local 7#include "common/common.h" // Local
8#include "string_util.h" 8#include "common/string_util.h"
9 9
10bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); 10bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
11static MsgAlertHandler msg_handler = DefaultMsgHandler; 11static MsgAlertHandler msg_handler = DefaultMsgHandler;
diff --git a/src/common/platform.h b/src/common/platform.h
index 84c6b6365..633f1d694 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -25,7 +25,7 @@
25#ifndef COMMON_PLATFORM_H_ 25#ifndef COMMON_PLATFORM_H_
26#define COMMON_PLATFORM_H_ 26#define COMMON_PLATFORM_H_
27 27
28#include "common_types.h" 28#include "common/common_types.h"
29 29
30//////////////////////////////////////////////////////////////////////////////////////////////////// 30////////////////////////////////////////////////////////////////////////////////////////////////////
31// Platform definitions 31// Platform definitions
diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj
index d2d9b7fbb..6b81c9055 100644
--- a/src/common/scm_rev_gen.vcxproj
+++ b/src/common/scm_rev_gen.vcxproj
@@ -19,12 +19,11 @@
19 </ProjectConfiguration> 19 </ProjectConfiguration>
20 </ItemGroup> 20 </ItemGroup>
21 <ItemGroup> 21 <ItemGroup>
22 <None Include="scm_rev_gen.js"> 22 <ClInclude Include="force_rebuild.h" />
23 </None> 23 <ClInclude Include="scm_rev.h" />
24 </ItemGroup> 24 </ItemGroup>
25 <ItemGroup> 25 <ItemGroup>
26 <ClInclude Include="force_rebuild.h" /> 26 <None Include="scm_rev_gen.js" />
27 <ClInclude Include="src\scm_rev.h" />
28 </ItemGroup> 27 </ItemGroup>
29 <PropertyGroup Label="Globals"> 28 <PropertyGroup Label="Globals">
30 <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> 29 <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid>
diff --git a/src/common/std_condition_variable.h b/src/common/std_condition_variable.h
index cee7a9dcd..8964b4f6f 100644
--- a/src/common/std_condition_variable.h
+++ b/src/common/std_condition_variable.h
@@ -29,7 +29,7 @@
29 29
30// partial std::condition_variable implementation for win32/pthread 30// partial std::condition_variable implementation for win32/pthread
31 31
32#include "std_mutex.h" 32#include "common/std_mutex.h"
33 33
34#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__) 34#if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)
35#define USE_RVALUE_REFERENCES 35#define USE_RVALUE_REFERENCES
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 415dcbbc7..a99644f11 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -6,9 +6,9 @@
6#include <stdio.h> 6#include <stdio.h>
7#include <algorithm> 7#include <algorithm>
8 8
9#include "common.h" 9#include "common/common.h"
10#include "common_paths.h" 10#include "common/common_paths.h"
11#include "string_util.h" 11#include "common/string_util.h"
12 12
13#ifdef _WIN32 13#ifdef _WIN32
14 #include <Windows.h> 14 #include <Windows.h>
diff --git a/src/common/string_util.h b/src/common/string_util.h
index fcbae4715..6b7e84797 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -12,7 +12,7 @@
12#include <sstream> 12#include <sstream>
13#include <iomanip> 13#include <iomanip>
14 14
15#include "common.h" 15#include "common/common.h"
16 16
17std::string StringFromFormat(const char* format, ...); 17std::string StringFromFormat(const char* format, ...);
18// Cheap! 18// Cheap!
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 27dbf3f93..c70ee37cf 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -2,8 +2,8 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "thread.h" 5#include "common/thread.h"
6#include "common.h" 6#include "common/common.h"
7 7
8#ifdef __APPLE__ 8#ifdef __APPLE__
9#include <mach/mach.h> 9#include <mach/mach.h>
diff --git a/src/common/thread.h b/src/common/thread.h
index 6384a44a1..d72ac7b47 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -5,12 +5,12 @@
5#ifndef _THREAD_H_ 5#ifndef _THREAD_H_
6#define _THREAD_H_ 6#define _THREAD_H_
7 7
8#include "std_condition_variable.h" 8#include "common/std_condition_variable.h"
9#include "std_mutex.h" 9#include "common/std_mutex.h"
10#include "std_thread.h" 10#include "common/std_thread.h"
11 11
12// Don't include common.h here as it will break LogManager 12// Don't include common.h here as it will break LogManager
13#include "common_types.h" 13#include "common/common_types.h"
14#include <stdio.h> 14#include <stdio.h>
15#include <string.h> 15#include <string.h>
16 16
diff --git a/src/common/thunk.h b/src/common/thunk.h
index c9e6fd39f..2c2f23cd0 100644
--- a/src/common/thunk.h
+++ b/src/common/thunk.h
@@ -7,8 +7,7 @@
7 7
8#include <map> 8#include <map>
9 9
10#include "common.h" 10#include "common/common.h"
11#include "x64Emitter.h"
12 11
13// This simple class creates a wrapper around a C/C++ function that saves all fp state 12// This simple class creates a wrapper around a C/C++ function that saves all fp state
14// before entering it, and restores it upon exit. This is required to be able to selectively 13// 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 90604292e..f8e1fadca 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -12,9 +12,9 @@
12#include <sys/time.h> 12#include <sys/time.h>
13#endif 13#endif
14 14
15#include "common.h" 15#include "common/common.h"
16#include "timer.h" 16#include "common/timer.h"
17#include "string_util.h" 17#include "common/string_util.h"
18 18
19namespace Common 19namespace Common
20{ 20{
diff --git a/src/common/timer.h b/src/common/timer.h
index 20c86762a..cfa5cf609 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -5,7 +5,7 @@
5#ifndef _TIMER_H_ 5#ifndef _TIMER_H_
6#define _TIMER_H_ 6#define _TIMER_H_
7 7
8#include "common.h" 8#include "common/common.h"
9#include <string> 9#include <string>
10 10
11namespace Common 11namespace Common
diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp
index 9aa8088ef..fe5270183 100644
--- a/src/common/utf8.cpp
+++ b/src/common/utf8.cpp
@@ -26,8 +26,8 @@
26#include <algorithm> 26#include <algorithm>
27#include <string> 27#include <string>
28 28
29#include "common_types.h" 29#include "common/common_types.h"
30#include "utf8.h" 30#include "common/utf8.h"
31 31
32// is start of UTF sequence 32// is start of UTF sequence
33inline bool isutf(char c) { 33inline bool isutf(char c) {
diff --git a/src/common/utf8.h b/src/common/utf8.h
index 36cf75713..6479ec5ad 100644
--- a/src/common/utf8.h
+++ b/src/common/utf8.h
@@ -16,7 +16,7 @@
16 16
17#pragma once 17#pragma once
18 18
19#include "common_types.h" 19#include "common/common_types.h"
20#include <string> 20#include <string>
21 21
22u32 u8_nextchar(const char *s, int *i); 22u32 u8_nextchar(const char *s, int *i);
diff --git a/src/common/version.cpp b/src/common/version.cpp
index 01890dbb6..f0df884d7 100644
--- a/src/common/version.cpp
+++ b/src/common/version.cpp
@@ -2,8 +2,8 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common.h" 5#include "common/common.h"
6#include "scm_rev.h" 6#include "common/scm_rev.h"
7 7
8#ifdef _DEBUG 8#ifdef _DEBUG
9 #define BUILD_TYPE_STR "Debug " 9 #define BUILD_TYPE_STR "Debug "
HIC SVNT DRACONES