diff options
author | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
---|---|---|
committer | Happy <markaizer@gmail.com> | 2014-08-21 04:50:46 +0800 |
commit | f52e1007fe08c67003c0bc4c78231904dd3fd5cc (patch) | |
tree | 99907d827264e501774e58ab4630e41fa7103c02 /vcproj-12 | |
parent | 2410110dece79b4598c12f1c953219f1d0d1904a (diff) | |
parent | 769b1d05aa5cfa8cddfe7d21b35d5c5e4da3bbd6 (diff) | |
download | hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.gz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.bz2 hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.tar.xz hercules-f52e1007fe08c67003c0bc4c78231904dd3fd5cc.zip |
Merge pull request #1 from HerculesWS/master
Update from original
Diffstat (limited to 'vcproj-12')
-rw-r--r-- | vcproj-12/char-server.vcxproj | 25 | ||||
-rw-r--r-- | vcproj-12/char-server.vcxproj.filters | 18 | ||||
-rw-r--r-- | vcproj-12/login-server.vcxproj | 16 | ||||
-rw-r--r-- | vcproj-12/login-server.vcxproj.filters | 18 | ||||
-rw-r--r-- | vcproj-12/map-server.vcxproj | 20 | ||||
-rw-r--r-- | vcproj-12/map-server.vcxproj.filters | 24 | ||||
-rw-r--r-- | vcproj-12/mapcache.vcxproj | 14 | ||||
-rw-r--r-- | vcproj-12/mapcache.vcxproj.filters | 16 | ||||
-rw-r--r-- | vcproj-12/plugin-HPMHooking.vcxproj | 120 | ||||
-rw-r--r-- | vcproj-12/plugin-sample.vcxproj | 120 |
10 files changed, 315 insertions, 76 deletions
diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index 126f15ea4..d281c2961 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -14,19 +14,18 @@ <ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid> <RootNamespace>char-server</RootNamespace> <Keyword>Win32Proj</Keyword> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -141,25 +140,24 @@ <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> <ClInclude Include="..\src\common\cbasetypes.h" /> - <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> <ClInclude Include="..\src\common\HPMi.h" /> <ClInclude Include="..\src\common\malloc.h" /> <ClInclude Include="..\src\common\mapindex.h" /> - <ClInclude Include="..\src\common\mempool.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\mutex.h" /> <ClInclude Include="..\src\common\nullpo.h" /> - <ClInclude Include="..\src\common\raconf.h" /> <ClInclude Include="..\src\common\random.h" /> <ClInclude Include="..\src\common\showmsg.h" /> <ClInclude Include="..\src\common\socket.h" /> <ClInclude Include="..\src\common\sql.h" /> <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\sysinfo.h" /> <ClInclude Include="..\src\common\thread.h" /> <ClInclude Include="..\src\common\timer.h" /> <ClInclude Include="..\src\common\utils.h" /> @@ -175,7 +173,7 @@ <ClInclude Include="..\src\char\int_quest.h" /> <ClInclude Include="..\src\char\int_storage.h" /> <ClInclude Include="..\src\char\inter.h" /> - <ClInclude Include="..\src\char\pincode.h" /> + <ClInclude Include="..\src\char\pincode.h" /> <ClInclude Include="..\src\common\winapi.h" /> </ItemGroup> <ItemGroup> @@ -185,23 +183,22 @@ <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> - <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> <ClCompile Include="..\src\common\malloc.c" /> <ClCompile Include="..\src\common\mapindex.c" /> - <ClCompile Include="..\src\common\mempool.c" /> <ClCompile Include="..\src\common\mutex.c" /> <ClCompile Include="..\src\common\nullpo.c" /> - <ClCompile Include="..\src\common\raconf.c" /> <ClCompile Include="..\src\common\random.c" /> <ClCompile Include="..\src\common\showmsg.c" /> <ClCompile Include="..\src\common\socket.c" /> <ClCompile Include="..\src\common\sql.c" /> <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\sysinfo.c" /> <ClCompile Include="..\src\common\thread.c" /> <ClCompile Include="..\src\common\timer.c" /> <ClCompile Include="..\src\common\utils.c" /> @@ -217,7 +214,7 @@ <ClCompile Include="..\src\char\int_quest.c" /> <ClCompile Include="..\src\char\int_storage.c" /> <ClCompile Include="..\src\char\inter.c" /> - <ClCompile Include="..\src\char\pincode.c" /> + <ClCompile Include="..\src\char\pincode.c" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/vcproj-12/char-server.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters index 5e536aada..7034b8abc 100644 --- a/vcproj-12/char-server.vcxproj.filters +++ b/vcproj-12/char-server.vcxproj.filters @@ -43,6 +43,9 @@ <ClCompile Include="..\src\common\strlib.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\sysinfo.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\timer.c"> <Filter>common</Filter> </ClCompile> @@ -112,12 +115,6 @@ <ClCompile Include="..\src\common\mutex.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\mempool.c"> - <Filter>common</Filter> - </ClCompile> - <ClCompile Include="..\src\common\raconf.c"> - <Filter>common</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\common\cbasetypes.h"> @@ -171,6 +168,9 @@ <ClInclude Include="..\src\common\strlib.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\src\common\sysinfo.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\src\common\timer.h"> <Filter>common</Filter> </ClInclude> @@ -249,12 +249,6 @@ <ClInclude Include="..\src\common\mutex.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\mempool.h"> - <Filter>common</Filter> - </ClInclude> - <ClInclude Include="..\src\common\raconf.h"> - <Filter>common</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="common"> diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj index 48c79d285..671df4024 100644 --- a/vcproj-12/login-server.vcxproj +++ b/vcproj-12/login-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -142,9 +142,7 @@ <ClInclude Include="..\3rdparty\libconfig\scanner.h" /> <ClInclude Include="..\3rdparty\libconfig\strbuf.h" /> <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> - <ClInclude Include="..\src\common\mempool.h" /> <ClInclude Include="..\src\common\mutex.h" /> - <ClInclude Include="..\src\common\raconf.h" /> <ClInclude Include="..\src\common\thread.h" /> <ClInclude Include="..\src\common\winapi.h" /> <ClInclude Include="..\src\login\account.h" /> @@ -154,7 +152,7 @@ <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> @@ -168,6 +166,7 @@ <ClInclude Include="..\src\common\socket.h" /> <ClInclude Include="..\src\common\sql.h" /> <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\sysinfo.h" /> <ClInclude Include="..\src\common\timer.h" /> <ClInclude Include="..\src\common\utils.h" /> <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> @@ -178,9 +177,7 @@ <ClCompile Include="..\3rdparty\libconfig\scanctx.c" /> <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> - <ClCompile Include="..\src\common\mempool.c" /> <ClCompile Include="..\src\common\mutex.c" /> - <ClCompile Include="..\src\common\raconf.c" /> <ClCompile Include="..\src\common\thread.c" /> <ClCompile Include="..\src\login\account_sql.c" /> <ClCompile Include="..\src\login\ipban_sql.c" /> @@ -188,7 +185,7 @@ <ClCompile Include="..\src\login\loginlog_sql.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> @@ -200,6 +197,7 @@ <ClCompile Include="..\src\common\socket.c" /> <ClCompile Include="..\src\common\sql.c" /> <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\sysinfo.c" /> <ClCompile Include="..\src\common\timer.c" /> <ClCompile Include="..\src\common\utils.c" /> <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> diff --git a/vcproj-12/login-server.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters index 4574ee7c1..3e338dfda 100644 --- a/vcproj-12/login-server.vcxproj.filters +++ b/vcproj-12/login-server.vcxproj.filters @@ -55,6 +55,9 @@ <ClCompile Include="..\src\common\strlib.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\sysinfo.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\timer.c"> <Filter>common</Filter> </ClCompile> @@ -85,12 +88,6 @@ <ClCompile Include="..\src\common\mutex.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\mempool.c"> - <Filter>common</Filter> - </ClCompile> - <ClCompile Include="..\src\common\raconf.c"> - <Filter>common</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\login\account.h"> @@ -156,6 +153,9 @@ <ClInclude Include="..\src\common\strlib.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\src\common\sysinfo.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\src\common\timer.h"> <Filter>common</Filter> </ClInclude> @@ -195,12 +195,6 @@ <ClInclude Include="..\src\common\mutex.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\mempool.h"> - <Filter>common</Filter> - </ClInclude> - <ClInclude Include="..\src\common\raconf.h"> - <Filter>common</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="common"> diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj index 931f7d11d..9cf4ea72a 100644 --- a/vcproj-12/map-server.vcxproj +++ b/vcproj-12/map-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -141,7 +141,7 @@ <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\des.h" /> <ClInclude Include="..\src\common\ers.h" /> @@ -151,16 +151,15 @@ <ClInclude Include="..\src\common\malloc.h" /> <ClInclude Include="..\src\common\mapindex.h" /> <ClInclude Include="..\src\common\md5calc.h" /> - <ClInclude Include="..\src\common\mempool.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\mutex.h" /> <ClInclude Include="..\src\common\nullpo.h" /> - <ClInclude Include="..\src\common\raconf.h" /> <ClInclude Include="..\src\common\random.h" /> <ClInclude Include="..\src\common\showmsg.h" /> <ClInclude Include="..\src\common\socket.h" /> <ClInclude Include="..\src\common\sql.h" /> <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\sysinfo.h" /> <ClInclude Include="..\src\common\thread.h" /> <ClInclude Include="..\src\common\timer.h" /> <ClInclude Include="..\src\common\utils.h" /> @@ -184,6 +183,7 @@ <ClInclude Include="..\src\map\map.h" /> <ClInclude Include="..\src\map\mapreg.h" /> <ClInclude Include="..\src\map\homunculus.h" /> + <ClInclude Include="..\src\map\HPMmap.h" /> <ClInclude Include="..\src\map\instance.h" /> <ClInclude Include="..\src\map\mercenary.h" /> <ClInclude Include="..\src\map\mob.h" /> @@ -219,7 +219,7 @@ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> <ClCompile Include="..\src\common\ers.c" /> @@ -228,15 +228,14 @@ <ClCompile Include="..\src\common\malloc.c" /> <ClCompile Include="..\src\common\mapindex.c" /> <ClCompile Include="..\src\common\md5calc.c" /> - <ClCompile Include="..\src\common\mempool.c" /> <ClCompile Include="..\src\common\mutex.c" /> <ClCompile Include="..\src\common\nullpo.c" /> - <ClCompile Include="..\src\common\raconf.c" /> <ClCompile Include="..\src\common\random.c" /> <ClCompile Include="..\src\common\showmsg.c" /> <ClCompile Include="..\src\common\socket.c" /> <ClCompile Include="..\src\common\sql.c" /> <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\sysinfo.c" /> <ClCompile Include="..\src\common\thread.c" /> <ClCompile Include="..\src\common\timer.c" /> <ClCompile Include="..\src\common\utils.c" /> @@ -259,6 +258,7 @@ <ClCompile Include="..\src\map\map.c" /> <ClCompile Include="..\src\map\mapreg_sql.c" /> <ClCompile Include="..\src\map\homunculus.c" /> + <ClCompile Include="..\src\map\HPMmap.c" /> <ClCompile Include="..\src\map\instance.c" /> <ClCompile Include="..\src\map\mercenary.c" /> <ClCompile Include="..\src\map\mob.c" /> @@ -293,4 +293,4 @@ <Copy SourceFiles="..\conf\import-tmpl\packet_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\packet_conf.txt')" /> <Copy SourceFiles="..\conf\import-tmpl\script_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\script_conf.txt')" /> </Target> -</Project> +</Project>
\ No newline at end of file diff --git a/vcproj-12/map-server.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters index 2b04a4211..4bdbf6012 100644 --- a/vcproj-12/map-server.vcxproj.filters +++ b/vcproj-12/map-server.vcxproj.filters @@ -37,6 +37,9 @@ <ClCompile Include="..\src\map\homunculus.c"> <Filter>map_sql</Filter> </ClCompile> + <ClCompile Include="..\src\map\HPMmap.c"> + <Filter>map_sql</Filter> + </ClCompile> <ClCompile Include="..\src\map\instance.c"> <Filter>map_sql</Filter> </ClCompile> @@ -157,6 +160,9 @@ <ClCompile Include="..\src\common\strlib.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\sysinfo.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\timer.c"> <Filter>common</Filter> </ClCompile> @@ -196,12 +202,6 @@ <ClCompile Include="..\src\common\mutex.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\mempool.c"> - <Filter>common</Filter> - </ClCompile> - <ClCompile Include="..\src\common\raconf.c"> - <Filter>common</Filter> - </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\map\atcommand.h"> @@ -240,6 +240,9 @@ <ClInclude Include="..\src\map\homunculus.h"> <Filter>map_sql</Filter> </ClInclude> + <ClInclude Include="..\src\map\HPMmap.h"> + <Filter>map_sql</Filter> + </ClInclude> <ClInclude Include="..\src\map\instance.h"> <Filter>map_sql</Filter> </ClInclude> @@ -372,6 +375,9 @@ <ClInclude Include="..\src\common\strlib.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\src\common\sysinfo.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\src\common\timer.h"> <Filter>common</Filter> </ClInclude> @@ -425,12 +431,6 @@ <ClInclude Include="..\src\common\mutex.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\mempool.h"> - <Filter>common</Filter> - </ClInclude> - <ClInclude Include="..\src\common\raconf.h"> - <Filter>common</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="common"> diff --git a/vcproj-12/mapcache.vcxproj b/vcproj-12/mapcache.vcxproj index 390e0cc65..46f621966 100644 --- a/vcproj-12/mapcache.vcxproj +++ b/vcproj-12/mapcache.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -128,27 +128,31 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\des.c" /> <ClCompile Include="..\src\common\grfio.c" /> <ClCompile Include="..\src\common\malloc.c" /> <ClCompile Include="..\src\common\showmsg.c" /> <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\sysinfo.c" /> <ClCompile Include="..\src\common\utils.c" /> + <ClCompile Include="..\src\common\nullpo.c" /> <ClCompile Include="..\src\tool\mapcache.c" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\des.h" /> <ClInclude Include="..\src\common\grfio.h" /> <ClInclude Include="..\src\common\malloc.h" /> <ClInclude Include="..\src\common\mmo.h" /> <ClInclude Include="..\src\common\showmsg.h" /> <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\sysinfo.h" /> <ClInclude Include="..\src\common\utils.h" /> <ClInclude Include="..\src\common\winapi.h" /> + <ClInclude Include="..\src\common\nullpo.h" /> <ClInclude Include="..\src\config\renewal.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/vcproj-12/mapcache.vcxproj.filters b/vcproj-12/mapcache.vcxproj.filters index dea00ce79..d5c2fbb83 100644 --- a/vcproj-12/mapcache.vcxproj.filters +++ b/vcproj-12/mapcache.vcxproj.filters @@ -4,7 +4,7 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> - <ClCompile Include="..\src\common\console.c"> + <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> <ClCompile Include="..\src\common\des.c"> @@ -22,9 +22,15 @@ <ClCompile Include="..\src\common\strlib.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\sysinfo.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\utils.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\nullpo.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\tool\mapcache.c"> <Filter>mapcache</Filter> </ClCompile> @@ -36,7 +42,7 @@ <ClInclude Include="..\src\common\core.h"> <Filter>common</Filter> </ClInclude> - <ClInclude Include="..\src\common\console.h"> + <ClInclude Include="..\src\common\console.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\des.h"> @@ -57,12 +63,18 @@ <ClInclude Include="..\src\common\strlib.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\src\common\sysinfo.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\src\common\utils.h"> <Filter>common</Filter> </ClInclude> <ClInclude Include="..\src\common\winapi.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\src\common\nullpo.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\src\config\renewal.h" /> </ItemGroup> <ItemGroup> diff --git a/vcproj-12/plugin-HPMHooking.vcxproj b/vcproj-12/plugin-HPMHooking.vcxproj new file mode 100644 index 000000000..1357697b8 --- /dev/null +++ b/vcproj-12/plugin-HPMHooking.vcxproj @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.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="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{745D4A8C-6A68-4721-A43A-D81BF59860A1}</ProjectGuid> + <RootNamespace>plugin-HPMHooking</RootNamespace> + <Keyword>Win32Proj</Keyword> + <ProjectName>plugin-HPMHooking</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </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)'=='Debug|Win32'" 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> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">HPMHooking</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">HPMHooking</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\src\plugins\HPMHooking.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-12/plugin-sample.vcxproj b/vcproj-12/plugin-sample.vcxproj new file mode 100644 index 000000000..64f15725b --- /dev/null +++ b/vcproj-12/plugin-sample.vcxproj @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.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="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{E64C56D3-CDFB-483B-900B-A62D216B6D2F}</ProjectGuid> + <RootNamespace>plugin-sample</RootNamespace> + <Keyword>Win32Proj</Keyword> + <ProjectName>plugin-sample</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </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)'=='Debug|Win32'" 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> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">plugin-sample</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">plugin-sample</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\src\plugins\sample.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file |