diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common.vcxproj | 224 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 68 | ||||
| -rw-r--r-- | src/common/scm_rev_gen.js | 74 | ||||
| -rw-r--r-- | src/common/scm_rev_gen.vcxproj | 87 | 
4 files changed, 0 insertions, 453 deletions
| 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -  <ItemGroup Label="ProjectConfigurations"> -    <ProjectConfiguration Include="Debug|Win32"> -      <Configuration>Debug</Configuration> -      <Platform>Win32</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Debug|x64"> -      <Configuration>Debug</Configuration> -      <Platform>x64</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Release|Win32"> -      <Configuration>Release</Configuration> -      <Platform>Win32</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Release|x64"> -      <Configuration>Release</Configuration> -      <Platform>x64</Platform> -    </ProjectConfiguration> -  </ItemGroup> -  <PropertyGroup Label="Globals"> -    <ProjectGuid>{DFE335FC-755D-4BAA-8452-94434F8A1EDB}</ProjectGuid> -    <RootNamespace>common</RootNamespace> -  </PropertyGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -    <UseDebugLibraries>true</UseDebugLibraries> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <CharacterSet>MultiByte</CharacterSet> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> -    <UseDebugLibraries>true</UseDebugLibraries> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <CharacterSet>MultiByte</CharacterSet> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> -    <UseDebugLibraries>false</UseDebugLibraries> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <CharacterSet>Unicode</CharacterSet> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration"> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <UseDebugLibraries>false</UseDebugLibraries> -    <CharacterSet>MultiByte</CharacterSet> -  </PropertyGroup> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -    <UseDebugLibraries>false</UseDebugLibraries> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <CharacterSet>Unicode</CharacterSet> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration"> -    <ConfigurationType>StaticLibrary</ConfigurationType> -    <UseDebugLibraries>false</UseDebugLibraries> -    <CharacterSet>MultiByte</CharacterSet> -  </PropertyGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -  <ImportGroup Label="ExtensionSettings"> -  </ImportGroup> -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -    <Import Project="..\..\vsprops\base.props" /> -    <Import Project="..\..\vsprops\externals.props" /> -    <Import Project="..\..\vsprops\code_generation_debug.props" /> -    <Import Project="..\..\vsprops\optimization_debug.props" /> -  </ImportGroup> -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -    <Import Project="..\..\vsprops\base.props" /> -    <Import Project="..\..\vsprops\externals.props" /> -    <Import Project="..\..\vsprops\code_generation_debug.props" /> -    <Import Project="..\..\vsprops\optimization_debug.props" /> -  </ImportGroup> -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -    <Import Project="..\..\vsprops\base.props" /> -    <Import Project="..\..\vsprops\externals.props" /> -    <Import Project="..\..\vsprops\code_generation_release.props" /> -    <Import Project="..\..\vsprops\optimization_release.props" /> -  </ImportGroup> -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -    <Import Project="..\..\vsprops\base.props" /> -    <Import Project="..\..\vsprops\externals.props" /> -    <Import Project="..\..\vsprops\code_generation_release.props" /> -    <Import Project="..\..\vsprops\optimization_release.props" /> -  </ImportGroup> -  <PropertyGroup Label="UserMacros" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -    </Link> -    <Lib /> -    <ClCompile> -      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> -    </ClCompile> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -    </Link> -    <Lib /> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -      <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <OptimizeReferences>true</OptimizeReferences> -    </Link> -    <Lib /> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -      <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <OptimizeReferences>true</OptimizeReferences> -    </Link> -    <Lib /> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -      <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <OptimizeReferences>true</OptimizeReferences> -    </Link> -    <Lib /> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'"> -    <ClCompile /> -    <Link> -      <GenerateDebugInformation>true</GenerateDebugInformation> -      <EnableCOMDATFolding>true</EnableCOMDATFolding> -      <OptimizeReferences>true</OptimizeReferences> -    </Link> -    <Lib /> -  </ItemDefinitionGroup> -  <ItemGroup> -    <Reference Include="System" /> -    <Reference Include="System.Data" /> -    <Reference Include="System.Drawing" /> -    <Reference Include="System.Windows.Forms" /> -    <Reference Include="System.Xml" /> -  </ItemGroup> -  <ItemGroup> -    <ClInclude Include="atomic.h" /> -    <ClInclude Include="atomic_gcc.h" /> -    <ClInclude Include="atomic_win32.h" /> -    <ClInclude Include="bit_field.h" /> -    <ClInclude Include="break_points.h" /> -    <ClInclude Include="chunk_file.h" /> -    <ClInclude Include="common.h" /> -    <ClInclude Include="common_funcs.h" /> -    <ClInclude Include="common_paths.h" /> -    <ClInclude Include="common_types.h" /> -    <ClInclude Include="console_listener.h" /> -    <ClInclude Include="cpu_detect.h" /> -    <ClInclude Include="debug_interface.h" /> -    <ClInclude Include="emu_window.h" /> -    <ClInclude Include="extended_trace.h" /> -    <ClInclude Include="fifo_queue.h" /> -    <ClInclude Include="file_search.h" /> -    <ClInclude Include="file_util.h" /> -    <ClInclude Include="fixed_size_queue.h" /> -    <ClInclude Include="hash.h" /> -    <ClInclude Include="linear_disk_cache.h" /> -    <ClInclude Include="log.h" /> -    <ClInclude Include="log_manager.h" /> -    <ClInclude Include="math_util.h" /> -    <ClInclude Include="memory_util.h" /> -    <ClInclude Include="mem_arena.h" /> -    <ClInclude Include="msg_handler.h" /> -    <ClInclude Include="platform.h" /> -    <ClInclude Include="scm_rev.h" /> -    <ClInclude Include="std_condition_variable.h" /> -    <ClInclude Include="std_mutex.h" /> -    <ClInclude Include="std_thread.h" /> -    <ClInclude Include="string_util.h" /> -    <ClInclude Include="swap.h" /> -    <ClInclude Include="symbols.h" /> -    <ClInclude Include="thread.h" /> -    <ClInclude Include="thread_queue_list.h" /> -    <ClInclude Include="thunk.h" /> -    <ClInclude Include="timer.h" /> -    <ClInclude Include="utf8.h" /> -  </ItemGroup> -  <ItemGroup> -    <ClCompile Include="break_points.cpp" /> -    <ClCompile Include="console_listener.cpp" /> -    <ClCompile Include="extended_trace.cpp" /> -    <ClCompile Include="file_search.cpp" /> -    <ClCompile Include="file_util.cpp" /> -    <ClCompile Include="hash.cpp" /> -    <ClCompile Include="log_manager.cpp" /> -    <ClCompile Include="math_util.cpp" /> -    <ClCompile Include="memory_util.cpp" /> -    <ClCompile Include="mem_arena.cpp" /> -    <ClCompile Include="misc.cpp" /> -    <ClCompile Include="msg_handler.cpp" /> -    <ClCompile Include="scm_rev.cpp" /> -    <ClCompile Include="string_util.cpp" /> -    <ClCompile Include="symbols.cpp" /> -    <ClCompile Include="thread.cpp" /> -    <ClCompile Include="timer.cpp" /> -    <ClCompile Include="utf8.cpp" /> -  </ItemGroup> -  <ItemGroup> -    <Text Include="CMakeLists.txt" /> -  </ItemGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -  <ImportGroup Label="ExtensionTargets"> -  </ImportGroup> -</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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -  <ItemGroup> -    <ClInclude Include="atomic.h" /> -    <ClInclude Include="atomic_gcc.h" /> -    <ClInclude Include="atomic_win32.h" /> -    <ClInclude Include="bit_field.h" /> -    <ClInclude Include="break_points.h" /> -    <ClInclude Include="chunk_file.h" /> -    <ClInclude Include="common.h" /> -    <ClInclude Include="common_funcs.h" /> -    <ClInclude Include="common_paths.h" /> -    <ClInclude Include="common_types.h" /> -    <ClInclude Include="console_listener.h" /> -    <ClInclude Include="cpu_detect.h" /> -    <ClInclude Include="debug_interface.h" /> -    <ClInclude Include="emu_window.h" /> -    <ClInclude Include="extended_trace.h" /> -    <ClInclude Include="fifo_queue.h" /> -    <ClInclude Include="file_search.h" /> -    <ClInclude Include="file_util.h" /> -    <ClInclude Include="fixed_size_queue.h" /> -    <ClInclude Include="hash.h" /> -    <ClInclude Include="linear_disk_cache.h" /> -    <ClInclude Include="log.h" /> -    <ClInclude Include="log_manager.h" /> -    <ClInclude Include="math_util.h" /> -    <ClInclude Include="mem_arena.h" /> -    <ClInclude Include="memory_util.h" /> -    <ClInclude Include="msg_handler.h" /> -    <ClInclude Include="platform.h" /> -    <ClInclude Include="std_condition_variable.h" /> -    <ClInclude Include="std_mutex.h" /> -    <ClInclude Include="std_thread.h" /> -    <ClInclude Include="string_util.h" /> -    <ClInclude Include="swap.h" /> -    <ClInclude Include="thread.h" /> -    <ClInclude Include="thunk.h" /> -    <ClInclude Include="timer.h" /> -    <ClInclude Include="utf8.h" /> -    <ClInclude Include="symbols.h" /> -    <ClInclude Include="scm_rev.h" /> -    <ClInclude Include="thread_queue_list.h" /> -  </ItemGroup> -  <ItemGroup> -    <ClCompile Include="break_points.cpp" /> -    <ClCompile Include="console_listener.cpp" /> -    <ClCompile Include="extended_trace.cpp" /> -    <ClCompile Include="file_search.cpp" /> -    <ClCompile Include="file_util.cpp" /> -    <ClCompile Include="hash.cpp" /> -    <ClCompile Include="log_manager.cpp" /> -    <ClCompile Include="math_util.cpp" /> -    <ClCompile Include="mem_arena.cpp" /> -    <ClCompile Include="memory_util.cpp" /> -    <ClCompile Include="misc.cpp" /> -    <ClCompile Include="msg_handler.cpp" /> -    <ClCompile Include="string_util.cpp" /> -    <ClCompile Include="thread.cpp" /> -    <ClCompile Include="timer.cpp" /> -    <ClCompile Include="utf8.cpp" /> -    <ClCompile Include="symbols.cpp" /> -    <ClCompile Include="scm_rev.cpp" /> -  </ItemGroup> -  <ItemGroup> -    <Text Include="CMakeLists.txt" /> -  </ItemGroup> -</Project> 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 @@ -var wshShell        = new ActiveXObject("WScript.Shell") -var oFS             = new ActiveXObject("Scripting.FileSystemObject"); - -var outfile         = "scm_rev.cpp"; -var cmd_revision    = " rev-parse HEAD"; -var cmd_describe    = " describe --always --long --dirty"; -var cmd_branch      = " rev-parse --abbrev-ref HEAD"; - -var git_search_paths = { -    "git.cmd": 1, -    "git": 1, -    "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1, -    "C:\\Program Files\\Git\\bin\\git.exe": 1 -}; - -function GetGitExe() { -    for (var gitexe in git_search_paths) { -        try { -            wshShell.Exec(gitexe); -            return gitexe; -        } catch (e) { -        } -    } - -    WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + -        wshShell.ExpandEnvironmentStrings("%PATH%")); -    WScript.Quit(1); -} - -function GetFirstStdOutLine(cmd) { -    try { -        return wshShell.Exec(cmd).StdOut.ReadLine(); -    } catch (e) { -        // catch "the system cannot find the file specified" error -        WScript.Echo("Failed to exec " + cmd + " this should never happen"); -        WScript.Quit(1); -    } -} - -function GetFileContents(f) { -    try { -        return oFS.OpenTextFile(f).ReadAll(); -    } catch (e) { -        // file doesn't exist -        return ""; -    } -} - -// get info from git -var gitexe      = GetGitExe(); -var revision    = GetFirstStdOutLine(gitexe + cmd_revision); -var describe    = GetFirstStdOutLine(gitexe + cmd_describe); -var branch      = GetFirstStdOutLine(gitexe + cmd_branch); -var isMaster    = +("master" == branch); - -// remove hash (and trailing "-0" if needed) from description -describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); - -var out_contents = -    "#include \"common/scm_rev.h\"\n" + -    "namespace Common {\n" + -    "    const char g_scm_rev[]      = \"" + revision + "\";\n" + -    "    const char g_scm_branch[]   = \"" + branch + "\";\n" + -    "    const char g_scm_desc[]     = \"" + describe + "\";\n" + -    "}\n"; - -// check if file needs updating -if (out_contents == GetFileContents(outfile)) { -    WScript.Echo(outfile + " current at " + describe); -} else { -    // needs updating - writeout current info -    oFS.CreateTextFile(outfile, true).Write(out_contents); -    WScript.Echo(outfile + " updated to " + describe); -} diff --git a/src/common/scm_rev_gen.vcxproj b/src/common/scm_rev_gen.vcxproj deleted file mode 100644 index f4f2a6239..000000000 --- a/src/common/scm_rev_gen.vcxproj +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -  <ItemGroup Label="ProjectConfigurations"> -    <ProjectConfiguration Include="Debug|Win32"> -      <Configuration>Debug</Configuration> -      <Platform>Win32</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Debug|x64"> -      <Configuration>Debug</Configuration> -      <Platform>x64</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Release|Win32"> -      <Configuration>Release</Configuration> -      <Platform>Win32</Platform> -    </ProjectConfiguration> -    <ProjectConfiguration Include="Release|x64"> -      <Configuration>Release</Configuration> -      <Platform>x64</Platform> -    </ProjectConfiguration> -  </ItemGroup> -  <ItemGroup> -    <ClInclude Include="force_rebuild.h" /> -  </ItemGroup> -  <ItemGroup> -    <None Include="scm_rev_gen.js" /> -  </ItemGroup> -  <PropertyGroup Label="Globals"> -    <ProjectGuid>{69F00340-5C3D-449F-9A80-958435C6CF06}</ProjectGuid> -    <RootNamespace>scm_rev_gen</RootNamespace> -    <ProjectName>scm_rev_gen</ProjectName> -  </PropertyGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> -    <ConfigurationType>Utility</ConfigurationType> -    <UseDebugLibraries>false</UseDebugLibraries> -    <CharacterSet>Unicode</CharacterSet> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -    <PlatformToolset>v120</PlatformToolset> -  </PropertyGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> -  <ImportGroup Label="ExtensionSettings"> -  </ImportGroup> -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> -    <Import Project="..\..\vsprops\base.props" /> -  </ImportGroup> -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <Import Project="..\..\vsprops\base.props" /> -  </ImportGroup> -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> -    <Import Project="..\..\vsprops\base.props" /> -  </ImportGroup> -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -    <Import Project="..\..\vsprops\base.props" /> -  </ImportGroup> -  <PropertyGroup Label="UserMacros" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <PreBuildEvent> -      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> -    </PreBuildEvent> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> -    <PreBuildEvent> -      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> -    </PreBuildEvent> -  </ItemDefinitionGroup> -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> -    <PreBuildEvent> -      <Command>cscript /nologo /E:JScript "scm_rev_gen.js"</Command> -    </PreBuildEvent> -  </ItemDefinitionGroup> -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> -  <ImportGroup Label="ExtensionTargets"> -  </ImportGroup> -</Project>
\ No newline at end of file | 
