Skip to content

Commit 5d6d381

Browse files
author
James Chen
committed
Merge pull request cocos2d#26 from cocos2d/master
Update with upstream
2 parents 3ead804 + cd9ba95 commit 5d6d381

File tree

714 files changed

+108105
-6061
lines changed

Some content is hidden

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

714 files changed

+108105
-6061
lines changed

‎.gitignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Thumbs.db
77
*.pdb
88
*.aps
99
*.vcproj.*.user
10+
*.vcxproj.user
1011
*.vspscc
1112
*_i.c
1213
*.i
@@ -30,6 +31,9 @@ _ReSharper*/
3031
[Tt]est[Rr]esult*
3132
ipch/
3233
*.opensdf
34+
Generated Files
35+
AppPackages
36+
*.hps
3337

3438
# Ignore files build by ndk and eclipse
3539
libs/
@@ -39,6 +43,22 @@ gen/
3943
assets/
4044
local.properties
4145

46+
# Ignore specific winrt files
47+
cocos2dx/platform/third_party/winrt/freetype/src
48+
cocos2dx/platform/third_party/winrt/libpng/lpng142
49+
cocos2dx/platform/third_party/winrt/libjpeg/jpeg-8b
50+
cocos2dx/platform/third_party/winrt/libtiff/tiff-4.0.1
51+
cocos2dx/platform/third_party/winrt/zlib/zlib-1.2.5
52+
cocos2dx/platform/third_party/wp8/freetype/src
53+
cocos2dx/platform/third_party/wp8/libpng/lpng142
54+
cocos2dx/platform/third_party/wp8/libjpeg/jpeg-8b
55+
cocos2dx/platform/third_party/wp8/libtiff/tiff-4.0.1
56+
cocos2dx/platform/third_party/wp8/zlib/zlib-1.2.5
57+
samples/Cpp/HelloCpp/proj.winrt/Assets/Resources/
58+
samples/Cpp/TestCpp/proj.winrt/Assets/Resources/
59+
samples/Cpp/HelloCpp/proj.wp8/Assets/Resources/
60+
samples/Cpp/TestCpp/proj.wp8/Assets/Resources/
61+
4262
# Ignore files built by NaCl
4363
samples/Cpp/HelloCpp/proj.nacl/Resources/
4464
samples/Cpp/TestCpp/proj.nacl/Resources/

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
[submodule "plugin"]
1717
path = plugin
1818
url = https://github.com/cocos2d-x/plugin-x.git
19+
[submodule "cocos2dx/platform/third_party/winrt/angleproject"]
20+
path = cocos2dx/platform/third_party/winrt/angleproject
21+
url = https://github.com/stammen/angleproject

‎CHANGELOG‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
cocos2d-x-2.2.0 @Sep.25 2013
2+
[All platforms]
3+
[NEW] CocoStudio GUI
4+
[NEW] CocoStudio parser
5+
[Android]
6+
[FIX] Cocos2dxBitmap.java: divideStringWithMaxWidth method index out of range
7+
[iOS]
8+
[FIX] Can not hide status bar on iOS 7
9+
[FIX] Missing iOS 7 icons
10+
[Javascript binding]
11+
[NEW] XMLHttpRequest support reading binary data
12+
[NEW] Binded CCControlColourPicker CCControlHuePicker CCControlPotentiometer CCControlSlider CCControlStepper CCControlSwitch CCControlUtils
13+
CCControlSaturationBrightnessPicker CCTextFieldTTF
14+
[NEW] Binded these functions: CCNode::setScale(float, float) CCBAnimationManager::addDocumentCallbackControlEvents/getDocumentCallbackControlEvents
15+
CCBReader::getOwnerCallbackControlEvents/addDocumentCallbackControlEvents
16+
[NEW] Supported Armature
17+
[Lua binding]
18+
[NEW] Binded CCTableView and CCScrollView
19+
20+
cocos2d-x-2.1.5 @Aug.23 2013 hotfix for v2.1.4
21+
[All platforms]
22+
[FIX] CCLabelBMFont crashes in glDrawElements of CCTextureAtlas::drawNumberOfQuads sometimes
23+
[FIX] Crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad
24+
[FIX] Sprite becomes white block in CCControlSwitchTest
25+
[Android]
26+
[FIX] Black screen when application resumes from background
27+
[Javascript binding]
28+
[FIX] EditBox doesn't show any text in TestJavascript/ExtensionsTest/EditBoxTest on iOS
29+
[FIX] Crash appears when extending cc.ScrollView in JS
30+
131
2.1rc0-x-2.1.4 @Jnue.12 2013
232
[all platforms]
333
Bug #2098: fix TouchPriority issue of CCScrollView

‎CocosDenshion/include/Export.h‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1+
/****************************************************************************
2+
Copyright (c) 2010-2013 cocos2d-x.org
3+
Copyright (c) Microsoft Open Technologies, Inc.
4+
5+
http://www.cocos2d-x.org
6+
7+
Permission is hereby granted, free of charge, to any person obtaining a copy
8+
of this software and associated documentation files (the "Software"), to deal
9+
in the Software without restriction, including without limitation the rights
10+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the Software is
12+
furnished to do so, subject to the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included in
15+
all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
THE SOFTWARE.
24+
****************************************************************************/
25+
126
#ifndef __EXPORT_COMMON__
227
#define __EXPORT_COMMON__
328

429
#if defined(SHP)
530
#include <FBaseConfig.h>
631
#define EXPORT_DLL _EXPORT_
7-
#elif defined(_WIN32)
32+
#elif defined(_WIN32) || defined(_WINRT) || defined(_WP8)
833
#if defined(_EXPORT_DLL_)
934
#define EXPORT_DLL __declspec(dllexport)
1035
#elif defined(IGNORE_EXPORT)

‎CocosDenshion/proj.winrt/CocosDenshion.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2012
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion", "CocosDenshion.vcxproj", "{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|ARM = Debug|ARM
9+
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
11+
Release|ARM = Release|ARM
12+
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|ARM.ActiveCfg = Debug|ARM
17+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|ARM.Build.0 = Debug|ARM
18+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|Win32.Build.0 = Debug|Win32
20+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|x64.ActiveCfg = Debug|x64
21+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Debug|x64.Build.0 = Debug|x64
22+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|ARM.ActiveCfg = Release|ARM
23+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|ARM.Build.0 = Release|ARM
24+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|Win32.ActiveCfg = Release|Win32
25+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|Win32.Build.0 = Release|Win32
26+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|x64.ActiveCfg = Release|x64
27+
{886FB3F1-CDBC-4B60-94C8-0F02EB583A1E}.Release|x64.Build.0 = Release|x64
28+
EndGlobalSection
29+
GlobalSection(SolutionProperties) = preSolution
30+
HideSolutionNode = FALSE
31+
EndGlobalSection
32+
EndGlobal

‎CocosDenshion/proj.winrt/CocosDenshion.vcxproj‎

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|Win32">
9+
<Configuration>Debug</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|ARM">
17+
<Configuration>Release</Configuration>
18+
<Platform>ARM</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="Release|Win32">
21+
<Configuration>Release</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
</ItemGroup>
29+
<ItemGroup>
30+
<ClCompile Include="..\winrt\Audio.cpp" />
31+
<ClCompile Include="..\winrt\MediaStreamer.cpp" />
32+
<ClCompile Include="..\winrt\SimpleAudioEngine.cpp" />
33+
</ItemGroup>
34+
<ItemGroup>
35+
<ClInclude Include="..\winrt\Audio.h" />
36+
<ClInclude Include="..\winrt\MediaStreamer.h" />
37+
</ItemGroup>
38+
<PropertyGroup Label="Globals">
39+
<ProjectGuid>{886fb3f1-cdbc-4b60-94c8-0f02eb583a1e}</ProjectGuid>
40+
<Keyword>Win32Proj</Keyword>
41+
<ProjectName>CocosDenshion</ProjectName>
42+
<RootNamespace>CocosDenshion</RootNamespace>
43+
<DefaultLanguage>en-US</DefaultLanguage>
44+
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
45+
<AppContainerApplication>true</AppContainerApplication>
46+
</PropertyGroup>
47+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
49+
<ConfigurationType>DynamicLibrary</ConfigurationType>
50+
<UseDebugLibraries>true</UseDebugLibraries>
51+
<PlatformToolset>v110</PlatformToolset>
52+
<WholeProgramOptimization>true</WholeProgramOptimization>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
55+
<ConfigurationType>DynamicLibrary</ConfigurationType>
56+
<UseDebugLibraries>true</UseDebugLibraries>
57+
<PlatformToolset>v110</PlatformToolset>
58+
<WholeProgramOptimization>true</WholeProgramOptimization>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
61+
<ConfigurationType>DynamicLibrary</ConfigurationType>
62+
<UseDebugLibraries>true</UseDebugLibraries>
63+
<PlatformToolset>v110</PlatformToolset>
64+
<WholeProgramOptimization>true</WholeProgramOptimization>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
67+
<ConfigurationType>DynamicLibrary</ConfigurationType>
68+
<UseDebugLibraries>false</UseDebugLibraries>
69+
<WholeProgramOptimization>true</WholeProgramOptimization>
70+
<PlatformToolset>v110</PlatformToolset>
71+
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
73+
<ConfigurationType>DynamicLibrary</ConfigurationType>
74+
<UseDebugLibraries>false</UseDebugLibraries>
75+
<WholeProgramOptimization>true</WholeProgramOptimization>
76+
<PlatformToolset>v110</PlatformToolset>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
79+
<ConfigurationType>DynamicLibrary</ConfigurationType>
80+
<UseDebugLibraries>false</UseDebugLibraries>
81+
<WholeProgramOptimization>true</WholeProgramOptimization>
82+
<PlatformToolset>v110</PlatformToolset>
83+
</PropertyGroup>
84+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
85+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
87+
</ImportGroup>
88+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
89+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
90+
</ImportGroup>
91+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
92+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93+
</ImportGroup>
94+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
95+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
96+
</ImportGroup>
97+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
99+
</ImportGroup>
100+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
101+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
102+
</ImportGroup>
103+
<PropertyGroup Label="UserMacros" />
104+
<PropertyGroup />
105+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
106+
<GenerateManifest>false</GenerateManifest>
107+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
108+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
109+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
110+
<LinkIncremental>false</LinkIncremental>
111+
</PropertyGroup>
112+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
113+
<GenerateManifest>false</GenerateManifest>
114+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
115+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
116+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
117+
<LinkIncremental>false</LinkIncremental>
118+
</PropertyGroup>
119+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
120+
<GenerateManifest>false</GenerateManifest>
121+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
122+
<LinkIncremental>false</LinkIncremental>
123+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
124+
</PropertyGroup>
125+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
126+
<GenerateManifest>false</GenerateManifest>
127+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
128+
<LinkIncremental>false</LinkIncremental>
129+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
130+
</PropertyGroup>
131+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
132+
<GenerateManifest>false</GenerateManifest>
133+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
134+
<LinkIncremental>false</LinkIncremental>
135+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
136+
</PropertyGroup>
137+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
138+
<GenerateManifest>false</GenerateManifest>
139+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
140+
<LinkIncremental>false</LinkIncremental>
141+
<OutDir>$(SolutionDir)WinRT\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
142+
</PropertyGroup>
143+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
144+
<ClCompile>
145+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
146+
<CompileAsWinRT>true</CompileAsWinRT>
147+
<WholeProgramOptimization>true</WholeProgramOptimization>
148+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
149+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151+
</ClCompile>
152+
<Link>
153+
<SubSystem>Console</SubSystem>
154+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
155+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
156+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
157+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
158+
</Link>
159+
</ItemDefinitionGroup>
160+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
161+
<ClCompile>
162+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
163+
<CompileAsWinRT>true</CompileAsWinRT>
164+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
165+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166+
</ClCompile>
167+
<Link>
168+
<SubSystem>Console</SubSystem>
169+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
170+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
171+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
172+
</Link>
173+
</ItemDefinitionGroup>
174+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
175+
<ClCompile>
176+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
177+
<CompileAsWinRT>true</CompileAsWinRT>
178+
<WholeProgramOptimization>true</WholeProgramOptimization>
179+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181+
</ClCompile>
182+
<Link>
183+
<SubSystem>Console</SubSystem>
184+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
185+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
186+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
187+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
188+
</Link>
189+
</ItemDefinitionGroup>
190+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
191+
<ClCompile>
192+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
193+
<CompileAsWinRT>true</CompileAsWinRT>
194+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
195+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196+
</ClCompile>
197+
<Link>
198+
<SubSystem>Console</SubSystem>
199+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
200+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
201+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
202+
</Link>
203+
</ItemDefinitionGroup>
204+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
205+
<ClCompile>
206+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
207+
<CompileAsWinRT>true</CompileAsWinRT>
208+
<WholeProgramOptimization>true</WholeProgramOptimization>
209+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
210+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211+
</ClCompile>
212+
<Link>
213+
<SubSystem>Console</SubSystem>
214+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
215+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
216+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
217+
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
218+
</Link>
219+
</ItemDefinitionGroup>
220+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
221+
<ClCompile>
222+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
223+
<CompileAsWinRT>true</CompileAsWinRT>
224+
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225+
<PreprocessorDefinitions>WINRT;_WINRT;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
226+
</ClCompile>
227+
<Link>
228+
<SubSystem>Console</SubSystem>
229+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
230+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
231+
<AdditionalDependencies>xaudio2.lib;xinput.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;mfuuid.lib</AdditionalDependencies>
232+
</Link>
233+
</ItemDefinitionGroup>
234+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
235+
<ImportGroup Label="ExtensionTargets">
236+
</ImportGroup>
237+
</Project>

0 commit comments

Comments
 (0)