From a7bbafe436200051db37b1d8af3c6b42cfb95330 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Fri, 13 Aug 2021 16:18:09 +0800
Subject: [PATCH] 1

---
 .gitignore                                         |  4 +++-
 server/gameserver/win32/gameserver.vcxproj         | 11 ++++++-----
 server/gameserver/win32/gameserver.vcxproj.filters |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13f7d83..3330f56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@ __pycache__
 .user
 game.py
 *.cxx
-compile_commands.json
\ No newline at end of file
+compile_commands.json
+x64
+*.vcxproj.user
\ No newline at end of file
diff --git a/server/gameserver/win32/gameserver.vcxproj b/server/gameserver/win32/gameserver.vcxproj
index e749c48..93a92e4 100644
--- a/server/gameserver/win32/gameserver.vcxproj
+++ b/server/gameserver/win32/gameserver.vcxproj
@@ -80,6 +80,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>C:\a8_env;..;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -115,8 +116,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>false</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;GAME_ID=2005;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
@@ -266,7 +267,7 @@
     <ClCompile Include="..\team.cc" />
     <ClCompile Include="..\trigger.cc" />
     <ClCompile Include="..\typeconvert.cc" />
-    <ClCompile Include="..\types_bk.cc" />
+    <ClCompile Include="..\types.cc" />
     <ClCompile Include="..\weakptr.cc" />
     <ClCompile Include="..\zombiemode.ai.cc" />
     <ClCompile Include="C:\a8_env\a8\asynctcpclient.cc" />
@@ -284,7 +285,7 @@
     <ClCompile Include="C:\a8_env\a8\mutable_xobject.cc" />
     <ClCompile Include="C:\a8_env\a8\mysql.cc" />
     <ClCompile Include="C:\a8_env\a8\openssl.cc" />
-    <ClCompile Include="C:\a8_env\a8\perfmonitor.cc" />
+    <ClCompile Include="C:\a8_env\a8\a8_perfmonitor.cc" />
     <ClCompile Include="C:\a8_env\a8\pyengine.cc" />
     <ClCompile Include="C:\a8_env\a8\redis.cc" />
     <ClCompile Include="C:\a8_env\a8\stringlist.cc" />
@@ -315,7 +316,7 @@
     <ClCompile Include="C:\a8_env\framework\cpp\scriptengine.cc" />
     <ClCompile Include="C:\a8_env\framework\cpp\tglog.cc" />
     <ClCompile Include="C:\a8_env\framework\cpp\tiledmap.cc" />
-    <ClCompile Include="C:\a8_env\framework\cpp\types.cc" />
+    <ClCompile Include="C:\a8_env\framework\cpp\f8_types.cc" />
     <ClCompile Include="C:\a8_env\framework\cpp\utils.cc" />
     <ClCompile Include="C:\a8_env\google\protobuf\any.cc" />
     <ClCompile Include="C:\a8_env\google\protobuf\any.pb.cc" />
diff --git a/server/gameserver/win32/gameserver.vcxproj.filters b/server/gameserver/win32/gameserver.vcxproj.filters
index 2fa2fd6..e7d78fa 100644
--- a/server/gameserver/win32/gameserver.vcxproj.filters
+++ b/server/gameserver/win32/gameserver.vcxproj.filters
@@ -404,7 +404,7 @@
     <ClCompile Include="..\typeconvert.cc">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="..\types_bk.cc">
+    <ClCompile Include="..\types.cc">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="..\weakptr.cc">
@@ -560,7 +560,7 @@
     <ClCompile Include="C:\a8_env\a8\openssl.cc">
       <Filter>third_party\a8</Filter>
     </ClCompile>
-    <ClCompile Include="C:\a8_env\a8\perfmonitor.cc">
+    <ClCompile Include="C:\a8_env\a8\a8_perfmonitor.cc">
       <Filter>third_party\a8</Filter>
     </ClCompile>
     <ClCompile Include="C:\a8_env\a8\pyengine.cc">
@@ -653,7 +653,7 @@
     <ClCompile Include="C:\a8_env\framework\cpp\tiledmap.cc">
       <Filter>third_party\f8</Filter>
     </ClCompile>
-    <ClCompile Include="C:\a8_env\framework\cpp\types.cc">
+    <ClCompile Include="C:\a8_env\framework\cpp\f8_types.cc">
       <Filter>third_party\f8</Filter>
     </ClCompile>
     <ClCompile Include="C:\a8_env\framework\cpp\utils.cc">