Skip to content

Commit bf209dd

Browse files
Jonas YangJonas Yang
Jonas Yang
authored and
Jonas Yang
committed
Merge default and joyang branch.
2 parents 0bb0a59 + 62f6e85 commit bf209dd

File tree

97 files changed

+213
-428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+213
-428
lines changed

‎.hgignore‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
syntax: glob
2-
*.obj
3-
*.tlog
4-
*.sbr
5-
*.pdb
6-
*.log
7-
*.db
8-
*~
9-
*.swp
2+
out/
3+
# *.obj
4+
# *.tlog
5+
# *.sbr
6+
# *.pdb
7+
# *.log
8+
# *.db
9+
# *~
10+
# *.swp

‎Prototype/SPlayerNewGui/splayer/splayer.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<PropertyGroup Label="Globals">
1414
<ProjectGuid>{BD0569B4-084B-40D2-B968-F28904716FCF}</ProjectGuid>
1515
<RootNamespace>splayer</RootNamespace>
16+
<ProjectName>splayer_prototype</ProjectName>
1617
</PropertyGroup>
1718
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1819
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -35,9 +36,11 @@
3536
<Import Project="..\..\..\Thirdparty\yaml-cpp\yaml-cpp.props" />
3637
<Import Project="..\..\..\Thirdparty\libpng.props" />
3738
<Import Project="..\..\..\Thirdparty\zlib.props" />
39+
<Import Project="..\..\..\src\common.props" />
3840
</ImportGroup>
3941
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
4042
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
43+
<Import Project="..\..\..\src\common.props" />
4144
</ImportGroup>
4245
<PropertyGroup Label="UserMacros" />
4346
<PropertyGroup>

‎Thirdparty/jsoncpp/makefiles/vs71/lib_json.vcxproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@
6161
<OutDir>../../build/vs71/debug/lib_json\</OutDir>
6262
<IntDir>../../build/vs71/debug/lib_json\</IntDir>
6363
</PropertyGroup>
64-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
65-
<OutDir>../../build/vs71/release/lib_json\</OutDir>
66-
<IntDir>../../build/vs71/release/lib_json\</IntDir>
67-
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
6865
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dummy|Win32'">
6966
<OutDir>$(Configuration)\</OutDir>
7067
<IntDir>$(Configuration)\</IntDir>

‎Thirdparty/librhash.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AdditionalIncludeDirectories>$(SolutionDir)ThirdParty\librhash\librhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1212
</ClCompile>
1313
<Link>
14-
<AdditionalDependencies>$(SolutionDir)Release\librhash.lib;%(AdditionalDependencies)</AdditionalDependencies>
14+
<AdditionalDependencies>librhash.lib;%(AdditionalDependencies)</AdditionalDependencies>
1515
</Link>
1616
</ItemDefinitionGroup>
1717
<ItemGroup />

‎Thirdparty/librhash/librhash/librhash.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3434
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3535
<Import Project="..\..\boost.props" />
36+
<Import Project="..\..\..\src\common.props" />
3637
</ImportGroup>
3738
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3839
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
40+
<Import Project="..\..\..\src\common.props" />
3941
</ImportGroup>
4042
<PropertyGroup Label="UserMacros" />
4143
<PropertyGroup>
@@ -45,10 +47,7 @@
4547
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
4648
<IntDir>$(Configuration)\</IntDir>
4749
</PropertyGroup>
48-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
49-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
50-
<IntDir>$(Configuration)\</IntDir>
51-
</PropertyGroup>
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
5251
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5352
<ClCompile>
5453
<Optimization>Disabled</Optimization>

‎Thirdparty/pcid/pcid/pcid.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
</ImportGroup>
3535
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
3636
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
37+
<Import Project="..\..\..\src\common.props" />
3738
</ImportGroup>
3839
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
3940
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41+
<Import Project="..\..\..\src\common.props" />
4042
</ImportGroup>
4143
<PropertyGroup Label="UserMacros" />
4244
<PropertyGroup>
@@ -46,10 +48,7 @@
4648
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
4749
<IntDir>$(Configuration)\</IntDir>
4850
</PropertyGroup>
49-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
50-
<OutDir>..\..\pcid\bin\</OutDir>
51-
<IntDir>$(Configuration)\</IntDir>
52-
</PropertyGroup>
51+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
5352
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5453
<ClCompile>
5554
<Optimization>Disabled</Optimization>

‎Thirdparty/sqlitepp.vcxproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,19 @@
4545
</ImportGroup>
4646
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-utf16|Win32'" Label="PropertySheets">
4747
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48+
<Import Project="..\src\common.props" />
4849
</ImportGroup>
4950
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug-utf16|Win32'" Label="PropertySheets">
5051
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="..\src\common.props" />
5153
</ImportGroup>
5254
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release-utf8|Win32'" Label="PropertySheets">
5355
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="..\src\common.props" />
5457
</ImportGroup>
5558
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug-utf8|Win32'" Label="PropertySheets">
5659
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
<Import Project="..\src\common.props" />
5761
</ImportGroup>
5862
<PropertyGroup Label="UserMacros" />
5963
<PropertyGroup>
@@ -71,10 +75,7 @@
7175
<OutDir>..\..\lib\</OutDir>
7276
<IntDir>..\..\bin\$(Configuration)\$(ProjectName)\</IntDir>
7377
</PropertyGroup>
74-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-utf16|Win32'">
75-
<OutDir>bin\</OutDir>
76-
<IntDir>bin\$(Configuration)\$(ProjectName)\</IntDir>
77-
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release-utf16|Win32'" />
7879
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug-utf8|Win32'">
7980
<ClCompile>
8081
<Optimization>Disabled</Optimization>

‎Thirdparty/wavpack-ds-wavpack-directshow/wavpack/libwavpack.vcxproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
4444
<IntDir>$(Configuration)\</IntDir>
4545
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
48-
<IntDir>$(Configuration)\</IntDir>
49-
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
5047
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5148
<ClCompile>
5249
<Optimization>Disabled</Optimization>

‎Thirdparty/yaml-cpp/yamlcpp.vcxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@
8080
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
8181
<DisableSpecificWarnings>4127;4355;4715;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8282
</ClCompile>
83-
<Lib>
84-
<OutputFile>lib\$(ProjectName).lib</OutputFile>
85-
</Lib>
83+
<Lib />
8684
</ItemDefinitionGroup>
8785
<ItemGroup>
8886
<ClCompile Include="src\parser.cpp" />

‎Thirdparty/zeromq/libzmq.vcxproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@
4141
</ImportGroup>
4242
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'" Label="PropertySheets">
4343
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
44+
<Import Project="..\..\src\common.props" />
4445
</ImportGroup>
4546
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
4647
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48+
<Import Project="..\..\src\common.props" />
4749
</ImportGroup>
4850
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
4951
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="..\..\src\common.props" />
5053
</ImportGroup>
5154
<PropertyGroup Label="UserMacros" />
5255
<PropertyGroup>
@@ -56,10 +59,7 @@
5659
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
5760
<IntDir>$(Configuration)\</IntDir>
5861
</PropertyGroup>
59-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
60-
<OutDir>..\zeromq\release\</OutDir>
61-
<IntDir>$(Configuration)\</IntDir>
62-
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WithOpenPGM|Win32'">
6464
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
6565
<IntDir>$(Configuration)\</IntDir>
@@ -99,9 +99,7 @@
9999
<WarningLevel>Level3</WarningLevel>
100100
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
101101
</ClCompile>
102-
<Lib>
103-
<OutputFile>../../lib/$(ProjectName).lib</OutputFile>
104-
</Lib>
102+
<Lib />
105103
<PostBuildEvent>
106104
<Command />
107105
</PostBuildEvent>

0 commit comments

Comments
 (0)