Skip to content

Commit

Permalink
Merge pull request #120 from idealvin/dev
Browse files Browse the repository at this point in the history
update vs project
  • Loading branch information
idealvin authored Oct 10, 2020
2 parents 8924443 + 1e0c9c8 commit 47e942b
Show file tree
Hide file tree
Showing 97 changed files with 3,286 additions and 1,405 deletions.
4 changes: 4 additions & 0 deletions makevsprj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
xmake project -k vs2015 -m "debug;release" vs
xmake project -k vs2017 -m "debug;release" vs
xmake project -k vs2019 -m "debug;release" vs
165 changes: 102 additions & 63 deletions vs/vs2015/co.sln

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions vs/vs2015/co/co.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{2C50D6A1-10D9-427B-9807-35AD79CD9117}</ProjectGuid>
<RootNamespace>co</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -90,7 +90,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x86\\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
Expand All @@ -107,7 +107,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x64\\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
Expand All @@ -124,7 +124,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x86\\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
Expand All @@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x64\\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
Expand All @@ -157,11 +157,11 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\test\co_test.cc">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">..\..\..\build\.objs\co\windows\x86\release\test\co_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\..\build\.objs\co\windows\x64\debug\test\co_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\..\build\.objs\co\windows\x64\release\test\co_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">..\..\..\build\.objs\co\windows\x86\debug\test\co_test.cc.obj</ObjectFileName>
<ClCompile Include="..\..\..\test\co.cc">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">..\..\..\build\.objs\co\windows\x86\release\test\co.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\..\build\.objs\co\windows\x64\debug\test\co.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\..\build\.objs\co\windows\x64\release\test\co.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">..\..\..\build\.objs\co\windows\x86\debug\test\co.cc.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
172 changes: 172 additions & 0 deletions vs/vs2015/easy/easy.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.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>{F4BAD167-E85B-412D-8D56-C9E1ABB23905}</ProjectGuid>
<RootNamespace>easy</RootNamespace>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</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" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</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" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<OutDir>..\..\..\build\windows\x86\debug\</OutDir>
<IntDir>..\..\..\build\.objs\easy\windows\x86\debug\</IntDir>
<TargetName>easy</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<OutDir>..\..\..\build\windows\x64\debug\</OutDir>
<IntDir>..\..\..\build\.objs\easy\windows\x64\debug\</IntDir>
<TargetName>easy</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<OutDir>..\..\..\build\windows\x86\release\</OutDir>
<IntDir>..\..\..\build\.objs\easy\windows\x86\release\</IntDir>
<TargetName>easy</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<OutDir>..\..\..\build\windows\x64\release\</OutDir>
<IntDir>..\..\..\build\.objs\easy\windows\x64\release\</IntDir>
<TargetName>easy</TargetName>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<Link>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>__config_debug__;__config_Win32__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>
<AdditionalOptions>-FS -EHsc -nologo %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<Link>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>__config_debug__;__config_x64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>
<AdditionalOptions>-FS -EHsc -nologo %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<Link>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>__config_release__;__config_Win32__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>
<AdditionalOptions>-FS -EHsc -nologo %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<Link>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>__config_release__;__config_x64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>
<AdditionalOptions>-FS -EHsc -nologo %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\test\so\easy.cc">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\..\build\.objs\easy\windows\x64\release\test\so\easy.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">..\..\..\build\.objs\easy\windows\x86\release\test\so\easy.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">..\..\..\build\.objs\easy\windows\x86\debug\test\so\easy.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\..\build\.objs\easy\windows\x64\debug\test\so\easy.cc.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
15 changes: 15 additions & 0 deletions vs/vs2015/easy/easy.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="so">
<UniqueIdentifier>{E04A2E16-8116-4430-9E09-BF1A414D90D8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\test\so\easy.cc">
<Filter>so</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions vs/vs2015/fast/fast.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{B65A1BF7-4ADC-420B-89B2-443C60F05F52}</ProjectGuid>
<RootNamespace>fast</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -90,7 +90,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x86\\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
Expand All @@ -107,7 +107,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x64\\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\debug co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
Expand All @@ -124,7 +124,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x86\\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x86\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
Expand All @@ -141,7 +141,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<Link>
<AdditionalOptions>/libpath:..\\..\\..\\build\\windows\\x64\\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/libpath:..\..\..\build\windows\x64\release co.lib -nologo -dynamicbase -nxcompat %(AdditionalOptions)</AdditionalOptions>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
Expand All @@ -157,11 +157,11 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\test\fast_test.cc">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\..\build\.objs\fast\windows\x64\release\test\fast_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\..\build\.objs\fast\windows\x64\debug\test\fast_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">..\..\..\build\.objs\fast\windows\x86\debug\test\fast_test.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">..\..\..\build\.objs\fast\windows\x86\release\test\fast_test.cc.obj</ObjectFileName>
<ClCompile Include="..\..\..\test\fast.cc">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\..\build\.objs\fast\windows\x64\release\test\fast.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">..\..\..\build\.objs\fast\windows\x86\debug\test\fast.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">..\..\..\build\.objs\fast\windows\x86\release\test\fast.cc.obj</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\..\build\.objs\fast\windows\x64\debug\test\fast.cc.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit 47e942b

Please sign in to comment.