From 6509af19cb4dbba9d8af7489301e58dc8c6ca9f7 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Thu, 2 May 2013 20:10:06 -0300 Subject: Follow-up to HPM. * Fixed small warning * Added support for Visual Studio 2010. Signed-off-by: Matheus Macabu --- .gitignore | 3 + Hercules-10.sln | 6 ++ src/common/console.c | 2 +- vcproj-10/char-server.vcxproj | 14 ++-- vcproj-10/char-server.vcxproj.filters | 14 ++-- vcproj-10/login-server.vcxproj | 6 +- vcproj-10/login-server.vcxproj.filters | 10 ++- vcproj-10/plugin-sample.vcxproj | 118 +++++++++++++++++++++++++++++++++ 8 files changed, 158 insertions(+), 15 deletions(-) create mode 100644 vcproj-10/plugin-sample.vcxproj diff --git a/.gitignore b/.gitignore index 7d981021d..480ac1fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,7 @@ /vcproj-12/mapcache /vcproj-12/map-server_sql /vcproj-12/*.user +/vcproj-12/plugin-sample/ # /vcproj-10/ /vcproj-10/map-server @@ -97,6 +98,7 @@ /vcproj-10/mapcache /vcproj-10/map-server_sql /vcproj-10/*.user +/vcproj-10/plugin-sample/ # /vcproj-9/ /vcproj-9/*.user @@ -107,3 +109,4 @@ /vcproj-9/login-server_sql /vcproj-9/map-server_sql /vcproj-9/mapcache +/vcproj-9/plugin-sample/ diff --git a/Hercules-10.sln b/Hercules-10.sln index a740ee0b1..997df68af 100644 --- a/Hercules-10.sln +++ b/Hercules-10.sln @@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-10\map EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-10\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-10\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -30,6 +32,10 @@ Global {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E7E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Debug|Win32.Build.0 = Debug|Win32 + {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.ActiveCfg = Release|Win32 + {E64C56D3-CDFB-483B-900B-A62D216B6D2F}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/common/console.c b/src/common/console.c index db914db98..c228ab790 100644 --- a/src/common/console.c +++ b/src/common/console.c @@ -377,7 +377,7 @@ void console_init (void) { } void console_final(void) { #ifdef CONSOLE_INPUT - int i; + unsigned int i; console->parse_final(); for( i = 0; i < console->cmd_count; i++ ) { if( console->cmds[i]->next_count ) diff --git a/vcproj-10/char-server.vcxproj b/vcproj-10/char-server.vcxproj index e07954292..46438b3aa 100644 --- a/vcproj-10/char-server.vcxproj +++ b/vcproj-10/char-server.vcxproj @@ -138,12 +138,13 @@ + - + - - + + @@ -171,7 +172,7 @@ - + @@ -181,8 +182,9 @@ + - + @@ -212,7 +214,7 @@ - + diff --git a/vcproj-10/char-server.vcxproj.filters b/vcproj-10/char-server.vcxproj.filters index 13788df95..3f3c2f6ac 100644 --- a/vcproj-10/char-server.vcxproj.filters +++ b/vcproj-10/char-server.vcxproj.filters @@ -4,7 +4,7 @@ common - + common @@ -82,7 +82,7 @@ char_sql - + char_sql @@ -115,6 +115,9 @@ common + + common + @@ -123,7 +126,7 @@ common - + common @@ -174,7 +177,7 @@ char_sql - + char_sql @@ -249,6 +252,9 @@ common + + common + diff --git a/vcproj-10/login-server.vcxproj b/vcproj-10/login-server.vcxproj index 20c780902..7cf90854d 100644 --- a/vcproj-10/login-server.vcxproj +++ b/vcproj-10/login-server.vcxproj @@ -138,6 +138,7 @@ + @@ -149,7 +150,7 @@ - + @@ -173,6 +174,7 @@ + @@ -182,7 +184,7 @@ - + diff --git a/vcproj-10/login-server.vcxproj.filters b/vcproj-10/login-server.vcxproj.filters index 0ce4b8b6e..46f4efbc4 100644 --- a/vcproj-10/login-server.vcxproj.filters +++ b/vcproj-10/login-server.vcxproj.filters @@ -16,7 +16,7 @@ common - + common @@ -88,6 +88,9 @@ common + + common + @@ -108,7 +111,7 @@ common - + common @@ -195,6 +198,9 @@ common + + common + diff --git a/vcproj-10/plugin-sample.vcxproj b/vcproj-10/plugin-sample.vcxproj new file mode 100644 index 000000000..4bb437cda --- /dev/null +++ b/vcproj-10/plugin-sample.vcxproj @@ -0,0 +1,118 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E64C56D3-CDFB-483B-900B-A62D216B6D2F} + plugin-sample + Win32Proj + plugin-sample + + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + plugin-sample + plugin-sample + + + + /MP %(AdditionalOptions) + Disabled + ..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level3 + ProgramDatabase + 4996;%(DisableSpecificWarnings) + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0417 + + + $(OutDir)$(TargetName).dll + + + true + $(IntDir)$(TargetName).pdb + false + $(IntDir)$(TargetName).lib + MachineX86 + + + + + /MP %(AdditionalOptions) + MaxSpeed + ..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0417 + + + $(OutDir)$(TargetName).dll + + + true + $(IntDir)$(TargetName).pdb + true + true + false + $(IntDir)$(TargetName).lib + MachineX86 + + + + + + + + + \ No newline at end of file -- cgit v1.2.3-70-g09d2