diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/common/common.vcxproj | 224 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 68 | ||||
| -rw-r--r-- | src/common/log.h | 2 | ||||
| -rw-r--r-- | src/common/scm_rev_gen.js | 74 | ||||
| -rw-r--r-- | src/common/scm_rev_gen.vcxproj | 87 |
6 files changed, 18 insertions, 460 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index aae183393..f8a55c2a7 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | # Generate cpp with Git revision from template | ||
| 1 | configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY) | 2 | configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY) |
| 2 | 3 | ||
| 3 | set(SRCS break_points.cpp | 4 | set(SRCS |
| 5 | break_points.cpp | ||
| 4 | console_listener.cpp | 6 | console_listener.cpp |
| 5 | extended_trace.cpp | 7 | extended_trace.cpp |
| 6 | file_search.cpp | 8 | file_search.cpp |
| @@ -12,23 +14,25 @@ set(SRCS break_points.cpp | |||
| 12 | memory_util.cpp | 14 | memory_util.cpp |
| 13 | misc.cpp | 15 | misc.cpp |
| 14 | msg_handler.cpp | 16 | msg_handler.cpp |
| 15 | string_util.cpp | ||
| 16 | scm_rev.cpp | 17 | scm_rev.cpp |
| 18 | string_util.cpp | ||
| 17 | symbols.cpp | 19 | symbols.cpp |
| 18 | thread.cpp | 20 | thread.cpp |
| 19 | timer.cpp | 21 | timer.cpp |
| 20 | utf8.cpp) | 22 | utf8.cpp |
| 23 | ) | ||
| 21 | 24 | ||
| 22 | set(HEADERS atomic.h | 25 | set(HEADERS |
| 26 | atomic.h | ||
| 23 | atomic_gcc.h | 27 | atomic_gcc.h |
| 24 | atomic_win32.h | 28 | atomic_win32.h |
| 25 | bit_field.h | 29 | bit_field.h |
| 26 | break_points.h | 30 | break_points.h |
| 27 | chunk_file.h | 31 | chunk_file.h |
| 32 | common.h | ||
| 28 | common_funcs.h | 33 | common_funcs.h |
| 29 | common_paths.h | 34 | common_paths.h |
| 30 | common_types.h | 35 | common_types.h |
| 31 | common.h | ||
| 32 | console_listener.h | 36 | console_listener.h |
| 33 | cpu_detect.h | 37 | cpu_detect.h |
| 34 | debug_interface.h | 38 | debug_interface.h |
| @@ -37,10 +41,11 @@ set(HEADERS atomic.h | |||
| 37 | fifo_queue.h | 41 | fifo_queue.h |
| 38 | file_search.h | 42 | file_search.h |
| 39 | file_util.h | 43 | file_util.h |
| 44 | fixed_size_queue.h | ||
| 40 | hash.h | 45 | hash.h |
| 41 | linear_disk_cache.h | 46 | linear_disk_cache.h |
| 42 | log_manager.h | ||
| 43 | log.h | 47 | log.h |
| 48 | log_manager.h | ||
| 44 | math_util.h | 49 | math_util.h |
| 45 | mem_arena.h | 50 | mem_arena.h |
| 46 | memory_util.h | 51 | memory_util.h |
| @@ -54,8 +59,12 @@ set(HEADERS atomic.h | |||
| 54 | swap.h | 59 | swap.h |
| 55 | symbols.h | 60 | symbols.h |
| 56 | thread.h | 61 | thread.h |
| 62 | thread_queue_list.h | ||
| 57 | thunk.h | 63 | thunk.h |
| 58 | timer.h | 64 | timer.h |
| 59 | utf8.h) | 65 | utf8.h |
| 66 | ) | ||
| 67 | |||
| 68 | create_directory_groups(${SRCS} ${HEADERS}) | ||
| 60 | 69 | ||
| 61 | add_library(common STATIC ${SRCS} ${HEADERS}) | 70 | add_library(common STATIC ${SRCS} ${HEADERS}) |
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj deleted file mode 100644 index 341d3a813..000000000 --- a/src/common/common.vcxproj +++ /dev/null | |||
| @@ -1,224 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Win32</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|x64"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>x64</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Release|Win32"> | ||
| 13 | <Configuration>Release</Configuration> | ||
| 14 | <Platform>Win32</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|x64"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>x64</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | </ItemGroup> | ||
| 21 | <PropertyGroup Label="Globals"> | ||
| 22 | <ProjectGuid>{DFE335FC-755D-4BAA-8452-94434F8A1EDB}</ProjectGuid> | ||
| 23 | <RootNamespace>common</RootNamespace> | ||
| 24 | </PropertyGroup> | ||
| 25 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 26 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 27 | <UseDebugLibraries>true</UseDebugLibraries> | ||
| 28 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 29 | <CharacterSet>MultiByte</CharacterSet> | ||
| 30 | <PlatformToolset>v120</PlatformToolset> | ||
| 31 | </PropertyGroup> | ||
| 32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 33 | <UseDebugLibraries>true</UseDebugLibraries> | ||
| 34 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 35 | <CharacterSet>MultiByte</CharacterSet> | ||
| 36 | <PlatformToolset>v120</PlatformToolset> | ||
| 37 | </PropertyGroup> | ||
| 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 39 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 40 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 41 | <CharacterSet>Unicode</CharacterSet> | ||
| 42 | <PlatformToolset>v120</PlatformToolset> | ||
| 43 | </PropertyGroup> | ||
| 44 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration"> | ||
| 45 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 46 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 47 | <CharacterSet>MultiByte</CharacterSet> | ||
| 48 | </PropertyGroup> | ||
| 49 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 50 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 51 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 52 | <CharacterSet>Unicode</CharacterSet> | ||
| 53 | <PlatformToolset>v120</PlatformToolset> | ||
| 54 | </PropertyGroup> | ||
| 55 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration"> | ||
| 56 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 57 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 58 | <CharacterSet>MultiByte</CharacterSet> | ||
| 59 | </PropertyGroup> | ||
| 60 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 61 | <ImportGroup Label="ExtensionSettings"> | ||
| 62 | </ImportGroup> | ||
| 63 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 64 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 65 | <Import Project="..\..\vsprops\base.props" /> | ||
| 66 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 67 | <Import Project="..\..\vsprops\code_generation_debug.props" /> | ||
| 68 | <Import Project="..\..\vsprops\optimization_debug.props" /> | ||
| 69 | </ImportGroup> | ||
| 70 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 71 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 72 | <Import Project="..\..\vsprops\base.props" /> | ||
| 73 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 74 | <Import Project="..\..\vsprops\code_generation_debug.props" /> | ||
| 75 | <Import Project="..\..\vsprops\optimization_debug.props" /> | ||
| 76 | </ImportGroup> | ||
| 77 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 78 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 79 | <Import Project="..\..\vsprops\base.props" /> | ||
| 80 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 81 | <Import Project="..\..\vsprops\code_generation_release.props" /> | ||
| 82 | <Import Project="..\..\vsprops\optimization_release.props" /> | ||
| 83 | </ImportGroup> | ||
| 84 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 85 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 86 | <Import Project="..\..\vsprops\base.props" /> | ||
| 87 | <Import Project="..\..\vsprops\externals.props" /> | ||
| 88 | <Import Project="..\..\vsprops\code_generation_release.props" /> | ||
| 89 | <Import Project="..\..\vsprops\optimization_release.props" /> | ||
| 90 | </ImportGroup> | ||
| 91 | <PropertyGroup Label="UserMacros" /> | ||
| 92 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 93 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 94 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 95 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 96 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 97 | <ClCompile /> | ||
| 98 | <Link> | ||
| 99 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 100 | </Link> | ||
| 101 | <Lib /> | ||
| 102 | <ClCompile> | ||
| 103 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 104 | </ClCompile> | ||
| 105 | </ItemDefinitionGroup> | ||
| 106 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 107 | <ClCompile /> | ||
| 108 | <Link> | ||
| 109 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 110 | </Link> | ||
| 111 | <Lib /> | ||
| 112 | </ItemDefinitionGroup> | ||
| 113 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 114 | <ClCompile /> | ||
| 115 | <Link> | ||
| 116 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 117 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 118 | <OptimizeReferences>true</OptimizeReferences> | ||
| 119 | </Link> | ||
| 120 | <Lib /> | ||
| 121 | </ItemDefinitionGroup> | ||
| 122 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'"> | ||
| 123 | <ClCompile /> | ||
| 124 | <Link> | ||
| 125 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 126 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 127 | <OptimizeReferences>true</OptimizeReferences> | ||
| 128 | </Link> | ||
| 129 | <Lib /> | ||
| 130 | </ItemDefinitionGroup> | ||
| 131 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 132 | <ClCompile /> | ||
| 133 | <Link> | ||
| 134 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 135 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 136 | <OptimizeReferences>true</OptimizeReferences> | ||
| 137 | </Link> | ||
| 138 | <Lib /> | ||
| 139 | </ItemDefinitionGroup> | ||
| 140 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'"> | ||
| 141 | <ClCompile /> | ||
| 142 | <Link> | ||
| 143 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 144 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 145 | <OptimizeReferences>true</OptimizeReferences> | ||
| 146 | </Link> | ||
| 147 | <Lib /> | ||
| 148 | </ItemDefinitionGroup> | ||
| 149 | <ItemGroup> | ||
| 150 | <Reference Include="System" /> | ||
| 151 | <Reference Include="System.Data" /> | ||
| 152 | <Reference Include="System.Drawing" /> | ||
| 153 | <Reference Include="System.Windows.Forms" /> | ||
| 154 | <Reference Include="System.Xml" /> | ||
| 155 | </ItemGroup> | ||
| 156 | <ItemGroup> | ||
| 157 | <ClInclude Include="atomic.h" /> | ||
| 158 | <ClInclude Include="atomic_gcc.h" /> | ||
| 159 | <ClInclude Include="atomic_win32.h" /> | ||
| 160 | <ClInclude Include="bit_field.h" /> | ||
| 161 | <ClInclude Include="break_points.h" /> | ||
| 162 | <ClInclude Include="chunk_file.h" /> | ||
| 163 | <ClInclude Include="common.h" /> | ||
| 164 | <ClInclude Include="common_funcs.h" /> | ||
| 165 | <ClInclude Include="common_paths.h" /> | ||
| 166 | <ClInclude Include="common_types.h" /> | ||
| 167 | <ClInclude Include="console_listener.h" /> | ||
| 168 | <ClInclude Include="cpu_detect.h" /> | ||
| 169 | <ClInclude Include="debug_interface.h" /> | ||
| 170 | <ClInclude Include="emu_window.h" /> | ||
| 171 | <ClInclude Include="extended_trace.h" /> | ||
| 172 | <ClInclude Include="fifo_queue.h" /> | ||
| 173 | <ClInclude Include="file_search.h" /> | ||
| 174 | <ClInclude Include="file_util.h" /> | ||
| 175 | <ClInclude Include="fixed_size_queue.h" /> | ||
| 176 | <ClInclude Include="hash.h" /> | ||
| 177 | <ClInclude Include="linear_disk_cache.h" /> | ||
| 178 | <ClInclude Include="log.h" /> | ||
| 179 | <ClInclude Include="log_manager.h" /> | ||
| 180 | <ClInclude Include="math_util.h" /> | ||
| 181 | <ClInclude Include="memory_util.h" /> | ||
| 182 | <ClInclude Include="mem_arena.h" /> | ||
| 183 | <ClInclude Include="msg_handler.h" /> | ||
| 184 | <ClInclude Include="platform.h" /> | ||
| 185 | <ClInclude Include="scm_rev.h" /> | ||
| 186 | <ClInclude Include="std_condition_variable.h" /> | ||
| 187 | <ClInclude Include="std_mutex.h" /> | ||
| 188 | <ClInclude Include="std_thread.h" /> | ||
| 189 | <ClInclude Include="string_util.h" /> | ||
| 190 | <ClInclude Include="swap.h" /> | ||
| 191 | <ClInclude Include="symbols.h" /> | ||
| 192 | <ClInclude Include="thread.h" /> | ||
| 193 | <ClInclude Include="thread_queue_list.h" /> | ||
| 194 | <ClInclude Include="thunk.h" /> | ||
| 195 | <ClInclude Include="timer.h" /> | ||
| 196 | <ClInclude Include="utf8.h" /> | ||
| 197 | </ItemGroup> | ||
| 198 | <ItemGroup> | ||
| 199 | <ClCompile Include="break_points.cpp" /> | ||
| 200 | <ClCompile Include="console_listener.cpp" /> | ||
| 201 | <ClCompile Include="extended_trace.cpp" /> | ||
| 202 | <ClCompile Include="file_search.cpp" /> | ||
| 203 | <ClCompile Include="file_util.cpp" /> | ||
| 204 | <ClCompile Include="hash.cpp" /> | ||
| 205 | <ClCompile Include="log_manager.cpp" /> | ||
| 206 | <ClCompile Include="math_util.cpp" /> | ||
| 207 | <ClCompile Include="memory_util.cpp" /> | ||
| 208 | <ClCompile Include="mem_arena.cpp" /> | ||
| 209 | <ClCompile Include="misc.cpp" /> | ||
| 210 | <ClCompile Include="msg_handler.cpp" /> | ||
| 211 | <ClCompile Include="scm_rev.cpp" /> | ||
| 212 | <ClCompile Include="string_util.cpp" /> | ||
| 213 | <ClCompile Include="symbols.cpp" /> | ||
| 214 | <ClCompile Include="thread.cpp" /> | ||
| 215 | <ClCompile Include="timer.cpp" /> | ||
| 216 | <ClCompile Include="utf8.cpp" /> | ||
| 217 | </ItemGroup> | ||
| 218 | <ItemGroup> | ||
| 219 | <Text Include="CMakeLists.txt" /> | ||
| 220 | </ItemGroup> | ||
| 221 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 222 | <ImportGroup Label="ExtensionTargets"> | ||
| 223 | </ImportGroup> | ||
| 224 | </Project> | ||
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters deleted file mode 100644 index 59268ce5a..000000000 --- a/src/common/common.vcxproj.filters +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <ClInclude Include="atomic.h" /> | ||
| 5 | <ClInclude Include="atomic_gcc.h" /> | ||
| 6 | <ClInclude Include="atomic_win32.h" /> | ||
| 7 | <ClInclude Include="bit_field.h" /> | ||
| 8 | <ClInclude Include="break_points.h" /> | ||
| 9 | <ClInclude Include="chunk_file.h" /> | ||
| 10 | <ClInclude Include="common.h" /> | ||
| 11 | <ClInclude Include="common_funcs.h" /> | ||
| 12 | <ClInclude Include="common_paths.h" /> | ||
| 13 | <ClInclude Include="common_types.h" /> | ||
| 14 | <ClInclude Include="console_listener.h" /> | ||
| 15 | <ClInclude Include="cpu_detect.h" /> | ||
| 16 | <ClInclude Include="debug_interface.h" /> | ||
| 17 | <ClInclude Include="emu_window.h" /> | ||
| 18 | <ClInclude Include="extended_trace.h" /> | ||
| 19 | <ClInclude Include="fifo_queue.h" /> | ||
| 20 | <ClInclude Include="file_search.h" /> | ||
| 21 | <ClInclude Include="file_util.h" /> | ||
| 22 | <ClInclude Include="fixed_size_queue.h" /> | ||
| 23 | <ClInclude Include="hash.h" /> | ||
| 24 | <ClInclude Include="linear_disk_cache.h" /> | ||
| 25 | <ClInclude Include="log.h" /> | ||
| 26 | <ClInclude Include="log_manager.h" /> | ||
| 27 | <ClInclude Include="math_util.h" /> | ||
| 28 | <ClInclude Include="mem_arena.h" /> | ||
| 29 | <ClInclude Include="memory_util.h" /> | ||
| 30 | <ClInclude Include="msg_handler.h" /> | ||
| 31 | <ClInclude Include="platform.h" /> | ||
| 32 | <ClInclude Include="std_condition_variable.h" /> | ||
| 33 | <ClInclude Include="std_mutex.h" /> | ||
| 34 | <ClInclude Include="std_thread.h" /> | ||
| 35 | <ClInclude Include="string_util.h" /> | ||
| 36 | <ClInclude Include="swap.h" /> | ||
| 37 | <ClInclude Include="thread.h" /> | ||
| 38 | <ClInclude Include="thunk.h" /> | ||
| 39 | <ClInclude Include="timer.h" /> | ||
| 40 | <ClInclude Include="utf8.h" /> | ||
| 41 | <ClInclude Include="symbols.h" /> | ||
| 42 | <ClInclude Include="scm_rev.h" /> | ||
| 43 | <ClInclude Include="thread_queue_list.h" /> | ||
| 44 | </ItemGroup> | ||
| 45 | <ItemGroup> | ||
| 46 | <ClCompile Include="break_points.cpp" /> | ||
| 47 | <ClCompile Include="console_listener.cpp" /> | ||
| 48 | <ClCompile Include="extended_trace.cpp" /> | ||
| 49 | <ClCompile Include="file_search.cpp" /> | ||
| 50 | <ClCompile Include="file_util.cpp" /> | ||
| 51 | <ClCompile Include="hash.cpp" /> | ||
| 52 | <ClCompile Include="log_manager.cpp" /> | ||
| 53 | <ClCompile Include="math_util.cpp" /> | ||
| 54 | <ClCompile Include="mem_arena.cpp" /> | ||
| 55 | <ClCompile Include="memory_util.cpp" /> | ||
| 56 | <ClCompile Include="misc.cpp" /> | ||
| 57 | <ClCompile Include="msg_handler.cpp" /> | ||
| 58 | <ClCompile Include="string_util.cpp" /> | ||
| 59 | <ClCompile Include="thread.cpp" /> | ||
| 60 | <ClCompile Include="timer.cpp" /> | ||
| 61 | <ClCompile Include="utf8.cpp" /> | ||
| 62 | <ClCompile Include="symbols.cpp" /> | ||
| 63 | <ClCompile Include="scm_rev.cpp" /> | ||
| 64 | </ItemGroup> | ||
| 65 | <ItemGroup> | ||
| 66 | <Text Include="CMakeLists.txt" /> | ||
| 67 | </ItemGroup> | ||
| 68 | </Project> | ||
diff --git a/src/common/log.h b/src/common/log.h index f1f6ffae6..291534c67 100644 --- a/src/common/log.h +++ b/src/common/log.h | |||
| @@ -4,7 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #ifndef LOGGING | ||
| 7 | #define LOGGING | 8 | #define LOGGING |
| 9 | #endif | ||
| 8 | 10 | ||
| 9 | enum { | 11 | enum { |
| 10 | OS_LEVEL, // Printed by the emulated operating system | 12 | OS_LEVEL, // Printed by the emulated operating system |
diff --git a/src/common/scm_rev_gen.js b/src/common/scm_rev_gen.js deleted file mode 100644 index 98313e376..000000000 --- a/src/common/scm_rev_gen.js +++ /dev/null | |||
| @@ -1,74 +0,0 @@ | |||
| 1 | var wshShell = new ActiveXObject("WScript.Shell") | ||
| 2 | var oFS = new ActiveXObject("Scripting.FileSystemObject"); | ||
| 3 | |||
| 4 | var outfile = "scm_rev.cpp"; | ||
| 5 | var cmd_revision = " rev-parse HEAD"; | ||
| 6 | var cmd_describe = " describe --always --long --dirty"; | ||
| 7 | var cmd_branch = " rev-parse --abbrev-ref HEAD"; | ||
| 8 | |||
| 9 | var git_search_paths = { | ||
| 10 | "git.cmd": 1, | ||
| 11 | "git": 1, | ||
| 12 | "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1, | ||
| 13 | "C:\\Program Files\\Git\\bin\\git.exe": 1 | ||
| 14 | }; | ||
| 15 | |||
| 16 | function GetGitExe() { | ||
| 17 | for (var gitexe in git_search_paths) { | ||
| 18 | try { | ||
| 19 | wshShell.Exec(gitexe); | ||
| 20 | return gitexe; | ||
| 21 | } catch (e) { | ||
| 22 | } | ||
| 23 | } | ||
| 24 | |||
| 25 | WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + | ||
| 26 | wshShell.ExpandEnvironmentStrings("%PATH%")); | ||
| 27 | WScript.Quit(1); | ||
| 28 | } | ||
| 29 | |||
| 30 | function GetFirstStdOutLine(cmd) { | ||
| 31 | try { | ||
| 32 | return wshShell.Exec(cmd).StdOut.ReadLine(); | ||
| 33 | } catch (e) { | ||
| 34 | // catch "the system cannot find the file specified" error | ||
| 35 | WScript.Echo("Failed to exec " + cmd + " this should never happen"); | ||
| 36 | WScript.Quit(1); | ||
| 37 | } | ||
| 38 | } | ||
| 39 | |||
| 40 | function GetFileContents(f) { | ||
| 41 | try { | ||
| 42 | return oFS.OpenTextFile(f).ReadAll(); | ||
| 43 | } catch (e) { | ||
| 44 | // file doesn't exist | ||
| 45 | return ""; | ||
| 46 | } | ||
| 47 | } | ||
| 48 | |||
| 49 | // get info from git | ||
| 50 | var gitexe = GetGitExe(); | ||
| 51 | var revision = GetFirstStdOutLine(gitexe + cmd_revision); | ||
| 52 | var describe = GetFirstStdOutLine(gitexe + cmd_describe); | ||
| 53 | var branch = GetFirstStdOutLine(gitexe + cmd_branch); | ||
| 54 | var isMaster = +("master" == branch); | ||
| 55 | |||
| 56 | // remove hash (and trailing "-0" if needed) from description | ||
| 57 | describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); | ||
| 58 | |||
| 59 | var out_contents = | ||
| 60 | "#include \"common/scm_rev.h\"\n" + | ||
| 61 | "namespace Common {\n" + | ||
| 62 | " const char g_scm_rev[] = \"" + revision + "\";\n" + | ||
| 63 | " const char g_scm_branch[] = \"" + branch + "\";\n" + | ||
| 64 | " const char g_scm_desc[] = \"" + describe + "\";\n" + | ||
| 65 | "}\n"; | ||
| 66 | |||
| 67 | // check if file needs updating | ||
| 68 | if (out_contents == GetFileContents(outfile)) { | ||
| 69 | WScript.Echo(outfile + " current at " + describe); | ||
| 70 | } else { | ||
| 71 | // needs updating - writeout current info | ||
| 72 | oFS.CreateTextFile(outfile, true).Write(out_contents); | ||
| 73 | WScript.Echo(outfile + " updated to " + describe); | ||
| 74 | } | ||
diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj deleted file mode 100644 index f4f2a6239..000000000 --- a/src/common/scm_rev_gen.vcxproj +++ /dev/null | |||
| @@ -1,87 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Win32</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|x64"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>x64</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Release|Win32"> | ||
| 13 | <Configuration>Release</Configuration> | ||
| 14 | <Platform>Win32</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|x64"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>x64</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | </ItemGroup> | ||
| 21 | <ItemGroup> | ||
| 22 | <ClInclude Include="force_rebuild.h" /> | ||
| 23 | </ItemGroup> | ||
| 24 | <ItemGroup> | ||
| 25 | <None Include="scm_rev_gen.js" /> | ||
| 26 | </ItemGroup> | ||
| 27 | <PropertyGroup Label="Globals"> | ||
| 28 | <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> | ||
| 29 | <RootNamespace>scm_rev_gen</RootNamespace> | ||
| 30 | <ProjectName>scm_rev_gen</ProjectName> | ||
| 31 | </PropertyGroup> | ||
| 32 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 33 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 34 | <ConfigurationType>Utility</ConfigurationType> | ||
| 35 | <UseDebugLibraries>false</UseDebugLibraries> | ||
| 36 | <CharacterSet>Unicode</CharacterSet> | ||
| 37 | <PlatformToolset>v120</PlatformToolset> | ||
| 38 | </PropertyGroup> | ||
| 39 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 40 | <PlatformToolset>v120</PlatformToolset> | ||
| 41 | </PropertyGroup> | ||
| 42 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 43 | <PlatformToolset>v120</PlatformToolset> | ||
| 44 | </PropertyGroup> | ||
| 45 | <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 46 | <PlatformToolset>v120</PlatformToolset> | ||
| 47 | </PropertyGroup> | ||
| 48 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 49 | <ImportGroup Label="ExtensionSettings"> | ||
| 50 | </ImportGroup> | ||
| 51 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 52 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 53 | <Import Project="..\..\vsprops\base.props" /> | ||
| 54 | </ImportGroup> | ||
| 55 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 56 | <Import Project="..\..\vsprops\base.props" /> | ||
| 57 | </ImportGroup> | ||
| 58 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 59 | <Import Project="..\..\vsprops\base.props" /> | ||
| 60 | </ImportGroup> | ||
| 61 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 62 | <Import Project="..\..\vsprops\base.props" /> | ||
| 63 | </ImportGroup> | ||
| 64 | <PropertyGroup Label="UserMacros" /> | ||
| 65 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 66 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 67 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 68 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 69 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 70 | <PreBuildEvent> | ||
| 71 | <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> | ||
| 72 | </PreBuildEvent> | ||
| 73 | </ItemDefinitionGroup> | ||
| 74 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 75 | <PreBuildEvent> | ||
| 76 | <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> | ||
| 77 | </PreBuildEvent> | ||
| 78 | </ItemDefinitionGroup> | ||
| 79 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 80 | <PreBuildEvent> | ||
| 81 | <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> | ||
| 82 | </PreBuildEvent> | ||
| 83 | </ItemDefinitionGroup> | ||
| 84 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 85 | <ImportGroup Label="ExtensionTargets"> | ||
| 86 | </ImportGroup> | ||
| 87 | </Project> \ No newline at end of file | ||