Skip to content
This repository was archived by the owner on Jan 4, 2025. It is now read-only.

Commit b8d0fbb

Browse files
MinmusLinMinmusLin
committed
Update cocos2d
1 parent 903e474 commit b8d0fbb

File tree

9 files changed

+23
-5
lines changed

9 files changed

+23
-5
lines changed

‎Server/Server.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ClCompile>
7575
<WarningLevel>Level3</WarningLevel>
7676
<SDLCheck>true</SDLCheck>
77-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
77+
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
7878
<ConformanceMode>true</ConformanceMode>
7979
</ClCompile>
8080
<Link>

‎Server/ServerMain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************
22
MIT License
33
4-
Copyright (c) 2024 Jishen Lin, Shuyi Liu, Zhaozhen Yang, Yukun Yang
4+
Copyright (c) 2023 Jishen Lin, Shuyi Liu, Zhaozhen Yang, Yukun Yang
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎cocos2d/cocos/2d/libcocos2d.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ProjectGuid>{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}</ProjectGuid>
1616
<RootNamespace>cocos2d-x.win32</RootNamespace>
1717
<Keyword>Win32Proj</Keyword>
18-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
18+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -27,6 +27,7 @@
2727
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
2828
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
2929
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
30+
<PlatformToolset>v143</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3233
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -37,6 +38,7 @@
3738
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
3839
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
3940
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
41+
<PlatformToolset>v143</PlatformToolset>
4042
</PropertyGroup>
4143
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4244
<ImportGroup Label="ExtensionSettings">

‎cocos2d/cocos/2d/libcocos2d.vcxproj.user

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎cocos2d/cocos/editor-support/spine/proj.win32/libSpine.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<PropertyGroup Label="Globals">
113113
<ProjectGuid>{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}</ProjectGuid>
114114
<RootNamespace>libSpine</RootNamespace>
115-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
115+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
116116
</PropertyGroup>
117117
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
118118
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -125,6 +125,7 @@
125125
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
126126
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
127127
<CharacterSet>Unicode</CharacterSet>
128+
<PlatformToolset>v143</PlatformToolset>
128129
</PropertyGroup>
129130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
130131
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -137,6 +138,7 @@
137138
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
138139
<WholeProgramOptimization>true</WholeProgramOptimization>
139140
<CharacterSet>Unicode</CharacterSet>
141+
<PlatformToolset>v143</PlatformToolset>
140142
</PropertyGroup>
141143
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
142144
<ImportGroup Label="ExtensionSettings">

‎cocos2d/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎cocos2d/external/recast/proj.win32/librecast.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
6767
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
6868
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
69+
<PlatformToolset>v143</PlatformToolset>
6970
</PropertyGroup>
7071
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7172
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -76,6 +77,7 @@
7677
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v140_xp</PlatformToolset>
7778
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
7879
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v141_xp</PlatformToolset>
80+
<PlatformToolset>v143</PlatformToolset>
7981
</PropertyGroup>
8082
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8183
<ImportGroup Label="ExtensionSettings">

‎cocos2d/external/recast/proj.win32/librecast.vcxproj.user

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎proj.win32/GameMain.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/****************************************************************
22
MIT License
33
4-
Copyright (c) 2024 Jishen Lin, Shuyi Liu, Zhaozhen Yang, Yukun Yang
4+
Copyright (c) 2023 Jishen Lin, Shuyi Liu, Zhaozhen Yang, Yukun Yang
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)