summaryrefslogtreecommitdiff
path: root/vcproj-10
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-13 01:19:04 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-13 01:19:04 +0000
commit526217d77d50dc27b0815e3d5895df7bfa38ff76 (patch)
tree9fb6152ef59b7d08e7f226fbdc47eb6ba9617cc6 /vcproj-10
parent87469dc59de62990878ce6ccd29769ebd5b7d675 (diff)
downloadhercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.gz
hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.bz2
hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.xz
hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.zip
- Added `libconfig` (configuration file library: http://www.hyperrealm.com/libconfig/):
- Updated VS9/10 project files. - Updated `configure` & `Makefile`s. - New GM, Commands & Permissions system: - '''This is a backwards compatibility breaking update''', please read tid:58877 - Replaced GM levels with Player Groups. - Commands permissions & other privileges now depend on group, not GM level. - `@help` command improvements: requires "commandname" param and shows more detailed info about commands. - Modified GM whisper system to deliver messages basing on permissions, not GM level. - Remote trade request is now possible only if player is allowed to use `@trade` command as well. - Added a proper permission to use `/changemaptype` command. - `clif_displaymessage` is now capable of displaying multiline messages. - All `ACMD_FUNC`s are static now, and the only way to invoke them is with `is_atcommand()`; all client commands (starting with `/`) are now translated into corresponding atcommands (with exception of `/kick` used on monster, as there is no atcommand to kill single monster). - Removed nonsense "bot check" triggering when player blocked (`/ex`) Server. - Merged `@monster`, `@monsterbig` and `@monstersmall`. - Improved flow of atcommand execution to avoid revealing info about online players or existing commands to non-privileged players. - Merged `atcommand` and `charcommand` script functions (`charcommand` is aliased to `atcommand`). - Fixed `atcommand` script function reading unknown memory area (possible access violation). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15572 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'vcproj-10')
-rw-r--r--vcproj-10/char-server_sql.vcxproj20
-rw-r--r--vcproj-10/char-server_sql.vcxproj.filters54
-rw-r--r--vcproj-10/login-server_sql.vcxproj20
-rw-r--r--vcproj-10/login-server_sql.vcxproj.filters54
-rw-r--r--vcproj-10/map-server_sql.vcxproj24
-rw-r--r--vcproj-10/map-server_sql.vcxproj.filters85
-rw-r--r--vcproj-10/mapcache.vcxproj8
7 files changed, 225 insertions, 40 deletions
diff --git a/vcproj-10/char-server_sql.vcxproj b/vcproj-10/char-server_sql.vcxproj
index e7fd17017..afa7f85d3 100644
--- a/vcproj-10/char-server_sql.vcxproj
+++ b/vcproj-10/char-server_sql.vcxproj
@@ -51,8 +51,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<ExceptionHandling>
@@ -94,8 +94,8 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LIBCONFIG_STATIC;YY_USE_CONST;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>
@@ -127,6 +127,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h" />
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h" />
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
+ <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
<ClInclude Include="..\src\common\cbasetypes.h" />
<ClInclude Include="..\src\common\core.h" />
@@ -159,6 +166,11 @@
<ClInclude Include="..\src\char\inter.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c" />
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
+ <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
+ <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
<ClCompile Include="..\src\common\core.c" />
<ClCompile Include="..\src\common\db.c" />
diff --git a/vcproj-10/char-server_sql.vcxproj.filters b/vcproj-10/char-server_sql.vcxproj.filters
index 189c72e79..3b11113ee 100644
--- a/vcproj-10/char-server_sql.vcxproj.filters
+++ b/vcproj-10/char-server_sql.vcxproj.filters
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
- <Filter>3rdparty</Filter>
- </ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
@@ -79,11 +76,26 @@
<ClCompile Include="..\src\char\inter.c">
<Filter>char_sql</Filter>
</ClCompile>
+ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanner.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\strbuf.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
- <Filter>3rdparty</Filter>
- </ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
</ClInclude>
@@ -171,6 +183,30 @@
<ClInclude Include="..\src\char\int_storage.h">
<Filter>char_sql</Filter>
</ClInclude>
+ <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\wincompat.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
@@ -182,5 +218,11 @@
<Filter Include="3rdparty">
<UniqueIdentifier>{b3f5c857-79c0-4a55-b8c5-7e7f56a8f948}</UniqueIdentifier>
</Filter>
+ <Filter Include="3rdparty\mt19937ar">
+ <UniqueIdentifier>{847768ab-8c4b-431b-8667-00f8ae3b915c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="3rdparty\libconfig">
+ <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/vcproj-10/login-server_sql.vcxproj b/vcproj-10/login-server_sql.vcxproj
index 34f5a33af..6cd25c88c 100644
--- a/vcproj-10/login-server_sql.vcxproj
+++ b/vcproj-10/login-server_sql.vcxproj
@@ -51,8 +51,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<ExceptionHandling>
@@ -94,8 +94,8 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>
@@ -131,6 +131,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h" />
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h" />
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
+ <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
<ClInclude Include="..\src\login\account.h" />
<ClInclude Include="..\src\login\ipban.h" />
<ClInclude Include="..\src\login\login.h" />
@@ -156,6 +163,11 @@
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c" />
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
+ <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
+ <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
<ClCompile Include="..\src\login\account_sql.c" />
<ClCompile Include="..\src\login\ipban_sql.c" />
<ClCompile Include="..\src\login\login.c" />
diff --git a/vcproj-10/login-server_sql.vcxproj.filters b/vcproj-10/login-server_sql.vcxproj.filters
index 4171d33cd..4af055584 100644
--- a/vcproj-10/login-server_sql.vcxproj.filters
+++ b/vcproj-10/login-server_sql.vcxproj.filters
@@ -13,9 +13,6 @@
<ClCompile Include="..\src\login\loginlog_sql.c">
<Filter>login_sql</Filter>
</ClCompile>
- <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
- <Filter>3rdparty</Filter>
- </ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
@@ -58,6 +55,24 @@
<ClCompile Include="..\src\common\utils.c">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanner.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\strbuf.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\login\account.h">
@@ -72,9 +87,6 @@
<ClInclude Include="..\src\login\login.h">
<Filter>login_sql</Filter>
</ClInclude>
- <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
- <Filter>3rdparty</Filter>
- </ClInclude>
<ClInclude Include="..\src\common\cbasetypes.h">
<Filter>common</Filter>
</ClInclude>
@@ -129,6 +141,30 @@
<ClInclude Include="..\src\common\utils.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\wincompat.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
@@ -140,5 +176,11 @@
<Filter Include="3rdparty">
<UniqueIdentifier>{ab5c90ec-923d-4847-a214-45b40818211e}</UniqueIdentifier>
</Filter>
+ <Filter Include="3rdparty\mt19937ar">
+ <UniqueIdentifier>{68e3bcee-28d9-4b2d-8701-614d50f32999}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="3rdparty\libconfig">
+ <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj
index daa739ba0..55ad74671 100644
--- a/vcproj-10/map-server_sql.vcxproj
+++ b/vcproj-10/map-server_sql.vcxproj
@@ -50,8 +50,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<ExceptionHandling>
@@ -93,8 +93,8 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>
@@ -126,8 +126,16 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h" />
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h" />
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h" />
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
+ <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\core.h" />
<ClInclude Include="..\src\common\db.h" />
<ClInclude Include="..\src\common\des.h" />
@@ -172,6 +180,7 @@
<ClInclude Include="..\src\map\party.h" />
<ClInclude Include="..\src\map\path.h" />
<ClInclude Include="..\src\map\pc.h" />
+ <ClInclude Include="..\src\map\pc_groups.h" />
<ClInclude Include="..\src\map\pet.h" />
<ClInclude Include="..\src\map\quest.h" />
<ClInclude Include="..\src\map\config\Core.h" />
@@ -191,7 +200,13 @@
<ClInclude Include="..\src\map\vending.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c" />
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
+ <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\core.c" />
<ClCompile Include="..\src\common\db.c" />
<ClCompile Include="..\src\common\des.c" />
@@ -234,6 +249,7 @@
<ClCompile Include="..\src\map\party.c" />
<ClCompile Include="..\src\map\path.c" />
<ClCompile Include="..\src\map\pc.c" />
+ <ClCompile Include="..\src\map\pc_groups.c" />
<ClCompile Include="..\src\map\pet.c" />
<ClCompile Include="..\src\map\quest.c" />
<ClCompile Include="..\src\map\script.c" />
diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server_sql.vcxproj.filters
index 818de17b7..a1b51acce 100644
--- a/vcproj-10/map-server_sql.vcxproj.filters
+++ b/vcproj-10/map-server_sql.vcxproj.filters
@@ -88,9 +88,6 @@
<ClCompile Include="..\src\map\searchstore.c">
<Filter>map_sql</Filter>
</ClCompile>
- <ClCompile Include="..\src\common\showmsg.c">
- <Filter>map_sql</Filter>
- </ClCompile>
<ClCompile Include="..\src\map\skill.c">
<Filter>map_sql</Filter>
</ClCompile>
@@ -109,9 +106,6 @@
<ClCompile Include="..\src\map\vending.c">
<Filter>map_sql</Filter>
</ClCompile>
- <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
- <Filter>3rdparty</Filter>
- </ClCompile>
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
@@ -160,6 +154,33 @@
<ClCompile Include="..\src\common\utils.c">
<Filter>common</Filter>
</ClCompile>
+ <ClCompile Include="..\src\common\conf.c">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\map\pc_groups.c">
+ <Filter>map_sql</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\common\showmsg.c">
+ <Filter>common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\grammar.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\libconfig.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanctx.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\scanner.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
+ <ClCompile Include="..\3rdparty\libconfig\strbuf.c">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\map\atcommand.h">
@@ -246,9 +267,6 @@
<ClInclude Include="..\src\map\searchstore.h">
<Filter>map_sql</Filter>
</ClInclude>
- <ClInclude Include="..\src\common\showmsg.h">
- <Filter>map_sql</Filter>
- </ClInclude>
<ClInclude Include="..\src\map\skill.h">
<Filter>map_sql</Filter>
</ClInclude>
@@ -267,9 +285,6 @@
<ClInclude Include="..\src\map\vending.h">
<Filter>map_sql</Filter>
</ClInclude>
- <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
- <Filter>3rdparty</Filter>
- </ClInclude>
<ClInclude Include="..\src\common\version.h">
<Filter>common</Filter>
</ClInclude>
@@ -330,6 +345,46 @@
<ClInclude Include="..\src\common\utils.h">
<Filter>common</Filter>
</ClInclude>
+ <ClInclude Include="..\src\map\config\Core.h" />
+ <ClInclude Include="..\src\map\config\Renewal.h" />
+ <ClInclude Include="..\src\map\config\Secure.h" />
+ <ClInclude Include="..\src\map\config\Data\Const.h" />
+ <ClInclude Include="..\src\map\config\Skills\General.h" />
+ <ClInclude Include="..\src\map\config\Skills\Mage_Classes.h" />
+ <ClInclude Include="..\src\map\config\Skills\Swordsman_Classes.h" />
+ <ClInclude Include="..\src\common\conf.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\map\pc_groups.h">
+ <Filter>map_sql</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\common\showmsg.h">
+ <Filter>common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
+ <Filter>3rdparty\mt19937ar</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\grammar.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\libconfig.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\parsectx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanctx.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\scanner.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\strbuf.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
+ <ClInclude Include="..\3rdparty\libconfig\wincompat.h">
+ <Filter>3rdparty\libconfig</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
@@ -341,5 +396,11 @@
<Filter Include="3rdparty">
<UniqueIdentifier>{c4845ea8-bcc7-411b-af29-e3842adb6714}</UniqueIdentifier>
</Filter>
+ <Filter Include="3rdparty\mt19937ar">
+ <UniqueIdentifier>{fcf23386-ddba-4a72-9b41-62f8e2d0e6c0}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="3rdparty\libconfig">
+ <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/vcproj-10/mapcache.vcxproj b/vcproj-10/mapcache.vcxproj
index 15a010c15..b0f58b70b 100644
--- a/vcproj-10/mapcache.vcxproj
+++ b/vcproj-10/mapcache.vcxproj
@@ -49,8 +49,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<ExceptionHandling>
@@ -91,8 +91,8 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>