From f352f73e381b548ede0360d4fdec91d2e6104a77 Mon Sep 17 00:00:00 2001 From: "Hercules.ws" Date: Thu, 7 Nov 2013 01:30:56 +0100 Subject: HPM Hooks Update Signed-off-by: HerculesWSAPI --- src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 4 ++++ .../HPMHooking/HPMHooking.HookingPoints.inc | 1 + src/plugins/HPMHooking/HPMHooking.Hooks.inc | 25 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index a4609ceed..cb9422a0b 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -1279,6 +1279,8 @@ struct { struct HPMHookPoint *HP_clif_bank_deposit_post; struct HPMHookPoint *HP_clif_bank_withdraw_pre; struct HPMHookPoint *HP_clif_bank_withdraw_post; + struct HPMHookPoint *HP_clif_show_modifiers_pre; + struct HPMHookPoint *HP_clif_show_modifiers_post; struct HPMHookPoint *HP_clif_pWantToConnection_pre; struct HPMHookPoint *HP_clif_pWantToConnection_post; struct HPMHookPoint *HP_clif_pLoadEndAck_pre; @@ -6206,6 +6208,8 @@ struct { int HP_clif_bank_deposit_post; int HP_clif_bank_withdraw_pre; int HP_clif_bank_withdraw_post; + int HP_clif_show_modifiers_pre; + int HP_clif_show_modifiers_post; int HP_clif_pWantToConnection_pre; int HP_clif_pWantToConnection_post; int HP_clif_pLoadEndAck_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 7e357b142..0009b0b39 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -649,6 +649,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->chsys_gleave, HP_clif_chsys_gleave) }, { HP_POP(clif->bank_deposit, HP_clif_bank_deposit) }, { HP_POP(clif->bank_withdraw, HP_clif_bank_withdraw) }, + { HP_POP(clif->show_modifiers, HP_clif_show_modifiers) }, { HP_POP(clif->pWantToConnection, HP_clif_pWantToConnection) }, { HP_POP(clif->pLoadEndAck, HP_clif_pLoadEndAck) }, { HP_POP(clif->pTickSend, HP_clif_pTickSend) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 6ad4d4199..947b51186 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -16248,6 +16248,31 @@ void HP_clif_bank_withdraw(struct map_session_data *sd, enum e_BANKING_WITHDRAW_ } return; } +void HP_clif_show_modifiers(struct map_session_data *sd) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_show_modifiers_pre ) { + void (*preHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_show_modifiers_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_show_modifiers_pre[hIndex].func; + preHookFunc(sd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.show_modifiers(sd); + } + if( HPMHooks.count.HP_clif_show_modifiers_post ) { + void (*postHookFunc) (struct map_session_data *sd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_show_modifiers_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_show_modifiers_post[hIndex].func; + postHookFunc(sd); + } + } + return; +} void HP_clif_pWantToConnection(int fd, struct map_session_data *sd) { int hIndex = 0; if( HPMHooks.count.HP_clif_pWantToConnection_pre ) { -- cgit v1.2.3-70-g09d2 From d7913a02cecadf995d05c85e51e03d5af6a13f6c Mon Sep 17 00:00:00 2001 From: Shido Date: Wed, 6 Nov 2013 14:20:55 +0800 Subject: Added _MSC_VER check. * This will check if C/C++ Compiler Version since VER 18.00 already defined Interlocked/Interlocked64. Signed-off-by: Shido --- src/common/atomic.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/atomic.h b/src/common/atomic.h index b1a4bda92..5a2ddb4f0 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -19,6 +19,9 @@ #if defined(_MSC_VER) #include "../common/winapi.h" +// This checks if C/C++ Compiler Version is 18.00 +#if _MSC_VER < 1800 + #if !defined(_M_X64) // When compiling for windows 32bit, the 8byte interlocked operations are not provided by microsoft // (because they need at least i586 so its not generic enough.. ... ) @@ -80,6 +83,8 @@ forceinline volatile int64 InterlockedExchange64(volatile int64 *target, int64 v #endif //endif 32bit windows +#endif //endif _msc_ver check + #elif defined(__GNUC__) #if !defined(__x86_64__) && !defined(__i386__) -- cgit v1.2.3-70-g09d2 From 8d2d1d21dd5e1d9ea1276471d93c3a4c4aceb3c3 Mon Sep 17 00:00:00 2001 From: Shido Date: Wed, 6 Nov 2013 14:25:43 +0800 Subject: Renamed Hercules-12.sln and vcproj-12. * Instead of -12 used for Visual Studio 2013. Signed-off-by: Shido --- Hercules-11.sln | 49 ++++ Hercules-12.sln | 49 ---- vcproj-11/char-server.vcxproj | 225 ++++++++++++++++ vcproj-11/char-server.vcxproj.filters | 276 ++++++++++++++++++++ vcproj-11/login-server.vcxproj | 210 +++++++++++++++ vcproj-11/login-server.vcxproj.filters | 222 ++++++++++++++++ vcproj-11/map-server.vcxproj | 298 +++++++++++++++++++++ vcproj-11/map-server.vcxproj.filters | 458 +++++++++++++++++++++++++++++++++ vcproj-11/mapcache.vcxproj | 157 +++++++++++ vcproj-11/mapcache.vcxproj.filters | 76 ++++++ vcproj-11/plugin-HPMHooking.vcxproj | 120 +++++++++ vcproj-11/plugin-sample.vcxproj | 120 +++++++++ vcproj-12/char-server.vcxproj | 225 ---------------- vcproj-12/char-server.vcxproj.filters | 276 -------------------- vcproj-12/login-server.vcxproj | 210 --------------- vcproj-12/login-server.vcxproj.filters | 222 ---------------- vcproj-12/map-server.vcxproj | 298 --------------------- vcproj-12/map-server.vcxproj.filters | 458 --------------------------------- vcproj-12/mapcache.vcxproj | 157 ----------- vcproj-12/mapcache.vcxproj.filters | 76 ------ vcproj-12/plugin-HPMHooking.vcxproj | 120 --------- vcproj-12/plugin-sample.vcxproj | 120 --------- 22 files changed, 2211 insertions(+), 2211 deletions(-) create mode 100644 Hercules-11.sln delete mode 100644 Hercules-12.sln create mode 100644 vcproj-11/char-server.vcxproj create mode 100644 vcproj-11/char-server.vcxproj.filters create mode 100644 vcproj-11/login-server.vcxproj create mode 100644 vcproj-11/login-server.vcxproj.filters create mode 100644 vcproj-11/map-server.vcxproj create mode 100644 vcproj-11/map-server.vcxproj.filters create mode 100644 vcproj-11/mapcache.vcxproj create mode 100644 vcproj-11/mapcache.vcxproj.filters create mode 100644 vcproj-11/plugin-HPMHooking.vcxproj create mode 100644 vcproj-11/plugin-sample.vcxproj delete mode 100644 vcproj-12/char-server.vcxproj delete mode 100644 vcproj-12/char-server.vcxproj.filters delete mode 100644 vcproj-12/login-server.vcxproj delete mode 100644 vcproj-12/login-server.vcxproj.filters delete mode 100644 vcproj-12/map-server.vcxproj delete mode 100644 vcproj-12/map-server.vcxproj.filters delete mode 100644 vcproj-12/mapcache.vcxproj delete mode 100644 vcproj-12/mapcache.vcxproj.filters delete mode 100644 vcproj-12/plugin-HPMHooking.vcxproj delete mode 100644 vcproj-12/plugin-sample.vcxproj diff --git a/Hercules-11.sln b/Hercules-11.sln new file mode 100644 index 000000000..686100c98 --- /dev/null +++ b/Hercules-11.sln @@ -0,0 +1,49 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-12\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {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 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.Build.0 = Debug|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.ActiveCfg = Release|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Hercules-12.sln b/Hercules-12.sln deleted file mode 100644 index 686100c98..000000000 --- a/Hercules-12.sln +++ /dev/null @@ -1,49 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-12\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.Build.0 = Release|Win32 - {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.Build.0 = Release|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.Build.0 = Release|Win32 - {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {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 - {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.Build.0 = Debug|Win32 - {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.ActiveCfg = Release|Win32 - {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/vcproj-11/char-server.vcxproj b/vcproj-11/char-server.vcxproj new file mode 100644 index 000000000..126f15ea4 --- /dev/null +++ b/vcproj-11/char-server.vcxproj @@ -0,0 +1,225 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E4E9646175AF} + char-server + Win32Proj + $(VCTargetsPath11) + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + char-server + char-server + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LIBCONFIG_STATIC;YY_USE_CONST;FD_SETSIZE=4096;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + Level3 + ProgramDatabase + CompileAsC + 4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-11/char-server.vcxproj.filters b/vcproj-11/char-server.vcxproj.filters new file mode 100644 index 000000000..5e536aada --- /dev/null +++ b/vcproj-11/char-server.vcxproj.filters @@ -0,0 +1,276 @@ + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {623f21b1-c166-4848-83d8-8b4fe0e2e2df} + + + {83b1ecf5-21d1-4dac-915f-95ff77a90899} + + + {b3f5c857-79c0-4a55-b8c5-7e7f56a8f948} + + + {847768ab-8c4b-431b-8667-00f8ae3b915c} + + + {9e8badd7-548f-4eb4-9e87-613e87e772ff} + + + \ No newline at end of file diff --git a/vcproj-11/login-server.vcxproj b/vcproj-11/login-server.vcxproj new file mode 100644 index 000000000..48c79d285 --- /dev/null +++ b/vcproj-11/login-server.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E5E9646175AF} + login-server + Win32Proj + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + login-server + login-server + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4100;4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + + + + + Level3 + ProgramDatabase + CompileAsC + 4100;4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-11/login-server.vcxproj.filters b/vcproj-11/login-server.vcxproj.filters new file mode 100644 index 000000000..4574ee7c1 --- /dev/null +++ b/vcproj-11/login-server.vcxproj.filters @@ -0,0 +1,222 @@ + + + + + login_sql + + + login_sql + + + login_sql + + + login_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + login_sql + + + login_sql + + + login_sql + + + login_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {b50ee803-e71d-4d41-8f7d-2dad5839df50} + + + {8eea96ed-d379-4694-ae2e-ffb0be95170c} + + + {ab5c90ec-923d-4847-a214-45b40818211e} + + + {68e3bcee-28d9-4b2d-8701-614d50f32999} + + + {779e8145-9bb2-4a88-9149-60586ab0bdd4} + + + \ No newline at end of file diff --git a/vcproj-11/map-server.vcxproj b/vcproj-11/map-server.vcxproj new file mode 100644 index 000000000..5701cd4d0 --- /dev/null +++ b/vcproj-11/map-server.vcxproj @@ -0,0 +1,298 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E6E9646175AF} + map-server + Win32Proj + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + map-server + map-server + + + + Disabled + ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4018;4100;4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + Level3 + ProgramDatabase + CompileAsC + 4018;4100;4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj-11/map-server.vcxproj.filters b/vcproj-11/map-server.vcxproj.filters new file mode 100644 index 000000000..1dff3e560 --- /dev/null +++ b/vcproj-11/map-server.vcxproj.filters @@ -0,0 +1,458 @@ + + + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + map_sql + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + + + + + + common + + + map_sql + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {3a137217-ebf7-44ee-95d9-3d7c51d2a199} + + + {8c01a080-5a78-4fb7-96f2-862c33a02230} + + + {c4845ea8-bcc7-411b-af29-e3842adb6714} + + + {fcf23386-ddba-4a72-9b41-62f8e2d0e6c0} + + + {9caf40b7-c4d1-43b4-bd1f-0376b4f920e7} + + + \ No newline at end of file diff --git a/vcproj-11/mapcache.vcxproj b/vcproj-11/mapcache.vcxproj new file mode 100644 index 000000000..390e0cc65 --- /dev/null +++ b/vcproj-11/mapcache.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E7E9646175AF} + mapcache + Win32Proj + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + mapcache + mapcache + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + true + + + /FIXED:NO %(AdditionalOptions) + libcmtd.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) + $(OutDir)mapcache.exe + ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + false + + + + + Level3 + ProgramDatabase + CompileAsC + true + + + libcmt.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) + $(OutDir)mapcache.exe + ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-11/mapcache.vcxproj.filters b/vcproj-11/mapcache.vcxproj.filters new file mode 100644 index 000000000..dea00ce79 --- /dev/null +++ b/vcproj-11/mapcache.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + mapcache + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + + + + {a9c2444c-ffec-4e89-8412-e530231d79dc} + + + {5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d} + + + \ No newline at end of file diff --git a/vcproj-11/plugin-HPMHooking.vcxproj b/vcproj-11/plugin-HPMHooking.vcxproj new file mode 100644 index 000000000..b24dbf2e2 --- /dev/null +++ b/vcproj-11/plugin-HPMHooking.vcxproj @@ -0,0 +1,120 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {745D4A8C-6A68-4721-A43A-D81BF59860A1} + plugin-HPMHooking + Win32Proj + plugin-HPMHooking + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + NativeRecommendedRules.ruleset + + + AllRules.ruleset + + + HPMHooking + HPMHooking + + + + /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 diff --git a/vcproj-11/plugin-sample.vcxproj b/vcproj-11/plugin-sample.vcxproj new file mode 100644 index 000000000..6810519ff --- /dev/null +++ b/vcproj-11/plugin-sample.vcxproj @@ -0,0 +1,120 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E64C56D3-CDFB-483B-900B-A62D216B6D2F} + plugin-sample + Win32Proj + plugin-sample + + + + DynamicLibrary + MultiByte + v110 + + + DynamicLibrary + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + NativeRecommendedRules.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 diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj deleted file mode 100644 index 126f15ea4..000000000 --- a/vcproj-12/char-server.vcxproj +++ /dev/null @@ -1,225 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E4E9646175AF} - char-server - Win32Proj - $(VCTargetsPath11) - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - char-server - char-server - - - - Disabled - ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - false - false - - - EnableFastChecks - MultiThreadedDebug - true - - - - - Level3 - EditAndContinue - CompileAsC - 4800;%(DisableSpecificWarnings) - true - - - libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - false - - - MachineX86 - false - - - - - MaxSpeed - AnySuitable - true - Speed - true - true - true - ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LIBCONFIG_STATIC;YY_USE_CONST;FD_SETSIZE=4096;%(PreprocessorDefinitions) - true - MultiThreaded - - - - - Level3 - ProgramDatabase - CompileAsC - 4800;%(DisableSpecificWarnings) - true - - - libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcproj-12/char-server.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters deleted file mode 100644 index 5e536aada..000000000 --- a/vcproj-12/char-server.vcxproj.filters +++ /dev/null @@ -1,276 +0,0 @@ - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - char_sql - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - common - - - - - {623f21b1-c166-4848-83d8-8b4fe0e2e2df} - - - {83b1ecf5-21d1-4dac-915f-95ff77a90899} - - - {b3f5c857-79c0-4a55-b8c5-7e7f56a8f948} - - - {847768ab-8c4b-431b-8667-00f8ae3b915c} - - - {9e8badd7-548f-4eb4-9e87-613e87e772ff} - - - \ No newline at end of file diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj deleted file mode 100644 index 48c79d285..000000000 --- a/vcproj-12/login-server.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E5E9646175AF} - login-server - Win32Proj - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - login-server - login-server - - - - Disabled - ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - false - false - - - EnableFastChecks - MultiThreadedDebug - true - - - - - Level3 - EditAndContinue - CompileAsC - 4100;4800;%(DisableSpecificWarnings) - true - - - libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - false - - - MachineX86 - false - - - - - MaxSpeed - AnySuitable - true - Speed - true - true - true - ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - true - MultiThreaded - - - - - - - - - Level3 - ProgramDatabase - CompileAsC - 4100;4800;%(DisableSpecificWarnings) - true - - - libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcproj-12/login-server.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters deleted file mode 100644 index 4574ee7c1..000000000 --- a/vcproj-12/login-server.vcxproj.filters +++ /dev/null @@ -1,222 +0,0 @@ - - - - - login_sql - - - login_sql - - - login_sql - - - login_sql - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - - - login_sql - - - login_sql - - - login_sql - - - login_sql - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - common - - - - - {b50ee803-e71d-4d41-8f7d-2dad5839df50} - - - {8eea96ed-d379-4694-ae2e-ffb0be95170c} - - - {ab5c90ec-923d-4847-a214-45b40818211e} - - - {68e3bcee-28d9-4b2d-8701-614d50f32999} - - - {779e8145-9bb2-4a88-9149-60586ab0bdd4} - - - \ No newline at end of file diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj deleted file mode 100644 index 5701cd4d0..000000000 --- a/vcproj-12/map-server.vcxproj +++ /dev/null @@ -1,298 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E6E9646175AF} - map-server - Win32Proj - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - map-server - map-server - - - - Disabled - ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - false - false - - - EnableFastChecks - MultiThreadedDebug - true - - - - - Level3 - EditAndContinue - CompileAsC - 4018;4100;4800;%(DisableSpecificWarnings) - true - - - libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - false - - - MachineX86 - false - - - - - MaxSpeed - AnySuitable - true - Speed - true - true - true - ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - true - MultiThreaded - - - - - Level3 - ProgramDatabase - CompileAsC - 4018;4100;4800;%(DisableSpecificWarnings) - true - - - libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).exe - ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) - true - %(IgnoreSpecificDefaultLibraries) - true - $(OutDir)$(ProjectName).pdb - Console - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcproj-12/map-server.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters deleted file mode 100644 index 1dff3e560..000000000 --- a/vcproj-12/map-server.vcxproj.filters +++ /dev/null @@ -1,458 +0,0 @@ - - - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - map_sql - - - common - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - map_sql - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - - - - - - common - - - map_sql - - - common - - - 3rdparty\mt19937ar - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - 3rdparty\libconfig - - - common - - - common - - - common - - - common - - - common - - - - - {3a137217-ebf7-44ee-95d9-3d7c51d2a199} - - - {8c01a080-5a78-4fb7-96f2-862c33a02230} - - - {c4845ea8-bcc7-411b-af29-e3842adb6714} - - - {fcf23386-ddba-4a72-9b41-62f8e2d0e6c0} - - - {9caf40b7-c4d1-43b4-bd1f-0376b4f920e7} - - - \ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj b/vcproj-12/mapcache.vcxproj deleted file mode 100644 index 390e0cc65..000000000 --- a/vcproj-12/mapcache.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E7E9646175AF} - mapcache - Win32Proj - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - mapcache - mapcache - - - - Disabled - ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - false - false - - - EnableFastChecks - MultiThreadedDebug - true - - - - - Level3 - EditAndContinue - CompileAsC - true - - - /FIXED:NO %(AdditionalOptions) - libcmtd.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) - $(OutDir)mapcache.exe - ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) - true - true - $(OutDir)$(ProjectName).pdb - Console - false - - - MachineX86 - false - - - - - MaxSpeed - AnySuitable - true - Speed - true - true - true - ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) - WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) - true - MultiThreaded - false - - - - - Level3 - ProgramDatabase - CompileAsC - true - - - libcmt.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) - $(OutDir)mapcache.exe - ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) - true - true - $(OutDir)$(ProjectName).pdb - Console - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj.filters b/vcproj-12/mapcache.vcxproj.filters deleted file mode 100644 index dea00ce79..000000000 --- a/vcproj-12/mapcache.vcxproj.filters +++ /dev/null @@ -1,76 +0,0 @@ - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - mapcache - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - - - - {a9c2444c-ffec-4e89-8412-e530231d79dc} - - - {5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d} - - - \ No newline at end of file diff --git a/vcproj-12/plugin-HPMHooking.vcxproj b/vcproj-12/plugin-HPMHooking.vcxproj deleted file mode 100644 index 95d2c8dea..000000000 --- a/vcproj-12/plugin-HPMHooking.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {745D4A8C-6A68-4721-A43A-D81BF59860A1} - plugin-HPMHooking - Win32Proj - plugin-HPMHooking - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\plugins\ - $(ProjectName)\$(Configuration)\ - false - ..\plugins\ - $(ProjectName)\$(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - - HPMHooking - HPMHooking - - - - /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 diff --git a/vcproj-12/plugin-sample.vcxproj b/vcproj-12/plugin-sample.vcxproj deleted file mode 100644 index 639cc9a66..000000000 --- a/vcproj-12/plugin-sample.vcxproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {E64C56D3-CDFB-483B-900B-A62D216B6D2F} - plugin-sample - Win32Proj - plugin-sample - - - - DynamicLibrary - MultiByte - v110 - - - DynamicLibrary - MultiByte - v110 - - - - - - - - - - - - - <_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 From 407843653442ee369907d8b86217d315a183c63b Mon Sep 17 00:00:00 2001 From: Shido Date: Wed, 6 Nov 2013 14:42:38 +0800 Subject: Added Visual Studio 2013 files. Signed-off-by: Shido --- Hercules-12.sln | 52 ++++ vcproj-12/char-server.vcxproj | 224 ++++++++++++++++ vcproj-12/char-server.vcxproj.filters | 276 ++++++++++++++++++++ vcproj-12/login-server.vcxproj | 210 +++++++++++++++ vcproj-12/login-server.vcxproj.filters | 222 ++++++++++++++++ vcproj-12/map-server.vcxproj | 298 +++++++++++++++++++++ vcproj-12/map-server.vcxproj.filters | 458 +++++++++++++++++++++++++++++++++ vcproj-12/mapcache.vcxproj | 157 +++++++++++ vcproj-12/mapcache.vcxproj.filters | 76 ++++++ vcproj-12/plugin-HPMHooking.vcxproj | 120 +++++++++ vcproj-12/plugin-sample.vcxproj | 120 +++++++++ 11 files changed, 2213 insertions(+) create mode 100644 Hercules-12.sln create mode 100644 vcproj-12/char-server.vcxproj create mode 100644 vcproj-12/char-server.vcxproj.filters create mode 100644 vcproj-12/login-server.vcxproj create mode 100644 vcproj-12/login-server.vcxproj.filters create mode 100644 vcproj-12/map-server.vcxproj create mode 100644 vcproj-12/map-server.vcxproj.filters create mode 100644 vcproj-12/mapcache.vcxproj create mode 100644 vcproj-12/mapcache.vcxproj.filters create mode 100644 vcproj-12/plugin-HPMHooking.vcxproj create mode 100644 vcproj-12/plugin-sample.vcxproj diff --git a/Hercules-12.sln b/Hercules-12.sln new file mode 100644 index 000000000..2cf675c74 --- /dev/null +++ b/Hercules-12.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-12\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release|Win32.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E7E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {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 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.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 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.ActiveCfg = Debug|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Debug|Win32.Build.0 = Debug|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.ActiveCfg = Release|Win32 + {745D4A8C-6A68-4721-A43A-D81BF59860A1}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj new file mode 100644 index 000000000..710251169 --- /dev/null +++ b/vcproj-12/char-server.vcxproj @@ -0,0 +1,224 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E4E9646175AF} + char-server + Win32Proj + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + char-server + char-server + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LIBCONFIG_STATIC;YY_USE_CONST;FD_SETSIZE=4096;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + Level3 + ProgramDatabase + CompileAsC + 4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/char-server.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters new file mode 100644 index 000000000..5e536aada --- /dev/null +++ b/vcproj-12/char-server.vcxproj.filters @@ -0,0 +1,276 @@ + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + char_sql + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {623f21b1-c166-4848-83d8-8b4fe0e2e2df} + + + {83b1ecf5-21d1-4dac-915f-95ff77a90899} + + + {b3f5c857-79c0-4a55-b8c5-7e7f56a8f948} + + + {847768ab-8c4b-431b-8667-00f8ae3b915c} + + + {9e8badd7-548f-4eb4-9e87-613e87e772ff} + + + \ No newline at end of file diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj new file mode 100644 index 000000000..473f03019 --- /dev/null +++ b/vcproj-12/login-server.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E5E9646175AF} + login-server + Win32Proj + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + login-server + login-server + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4100;4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + + + + + Level3 + ProgramDatabase + CompileAsC + 4100;4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/login-server.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters new file mode 100644 index 000000000..4574ee7c1 --- /dev/null +++ b/vcproj-12/login-server.vcxproj.filters @@ -0,0 +1,222 @@ + + + + + login_sql + + + login_sql + + + login_sql + + + login_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + login_sql + + + login_sql + + + login_sql + + + login_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {b50ee803-e71d-4d41-8f7d-2dad5839df50} + + + {8eea96ed-d379-4694-ae2e-ffb0be95170c} + + + {ab5c90ec-923d-4847-a214-45b40818211e} + + + {68e3bcee-28d9-4b2d-8701-614d50f32999} + + + {779e8145-9bb2-4a88-9149-60586ab0bdd4} + + + \ No newline at end of file diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj new file mode 100644 index 000000000..d5d6c3156 --- /dev/null +++ b/vcproj-12/map-server.vcxproj @@ -0,0 +1,298 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E6E9646175AF} + map-server + Win32Proj + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + map-server + map-server + + + + Disabled + ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + 4018;4100;4800;%(DisableSpecificWarnings) + true + + + libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + + + + + Level3 + ProgramDatabase + CompileAsC + 4018;4100;4800;%(DisableSpecificWarnings) + true + + + libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + ..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/map-server.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters new file mode 100644 index 000000000..1dff3e560 --- /dev/null +++ b/vcproj-12/map-server.vcxproj.filters @@ -0,0 +1,458 @@ + + + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + map_sql + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + map_sql + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + + + + + + common + + + map_sql + + + common + + + 3rdparty\mt19937ar + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + 3rdparty\libconfig + + + common + + + common + + + common + + + common + + + common + + + + + {3a137217-ebf7-44ee-95d9-3d7c51d2a199} + + + {8c01a080-5a78-4fb7-96f2-862c33a02230} + + + {c4845ea8-bcc7-411b-af29-e3842adb6714} + + + {fcf23386-ddba-4a72-9b41-62f8e2d0e6c0} + + + {9caf40b7-c4d1-43b4-bd1f-0376b4f920e7} + + + \ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj b/vcproj-12/mapcache.vcxproj new file mode 100644 index 000000000..44b063cba --- /dev/null +++ b/vcproj-12/mapcache.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E7E9646175AF} + mapcache + Win32Proj + + + + Application + MultiByte + true + v120 + + + Application + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + mapcache + mapcache + + + + Disabled + ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + false + false + + + EnableFastChecks + MultiThreadedDebug + true + + + + + Level3 + EditAndContinue + CompileAsC + true + + + /FIXED:NO %(AdditionalOptions) + libcmtd.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) + $(OutDir)mapcache.exe + ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + false + + + + + MaxSpeed + AnySuitable + true + Speed + true + true + true + ..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions) + true + MultiThreaded + false + + + + + Level3 + ProgramDatabase + CompileAsC + true + + + libcmt.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies) + $(OutDir)mapcache.exe + ..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(ProjectName).pdb + Console + true + true + UseLinkTimeCodeGeneration + false + + + MachineX86 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj.filters b/vcproj-12/mapcache.vcxproj.filters new file mode 100644 index 000000000..dea00ce79 --- /dev/null +++ b/vcproj-12/mapcache.vcxproj.filters @@ -0,0 +1,76 @@ + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + mapcache + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + + + + {a9c2444c-ffec-4e89-8412-e530231d79dc} + + + {5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d} + + + \ No newline at end of file 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 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {745D4A8C-6A68-4721-A43A-D81BF59860A1} + plugin-HPMHooking + Win32Proj + plugin-HPMHooking + + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + NativeRecommendedRules.ruleset + + + AllRules.ruleset + + + HPMHooking + HPMHooking + + + + /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 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 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E64C56D3-CDFB-483B-900B-A62D216B6D2F} + plugin-sample + Win32Proj + plugin-sample + + + + DynamicLibrary + MultiByte + v120 + + + DynamicLibrary + MultiByte + v120 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + ..\plugins\ + $(ProjectName)\$(Configuration)\ + false + NativeRecommendedRules.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 From 18bf8471174adfd1d32d61285154e860f2d28f76 Mon Sep 17 00:00:00 2001 From: Shido Date: Wed, 6 Nov 2013 22:15:46 +0800 Subject: Follow-up 993e3303c3 and c6be1114d3. Signed-off-by: Shido --- Hercules-11.sln | 12 ++++++------ Hercules-12.sln | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Hercules-11.sln b/Hercules-11.sln index 686100c98..b395132be 100644 --- a/Hercules-11.sln +++ b/Hercules-11.sln @@ -1,16 +1,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-12\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server", "vcproj-11\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-12\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server", "vcproj-11\login-server.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-12\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server", "vcproj-11\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-11\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-12\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-sample", "vcproj-11\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-12\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-11\plugin-HPMHooking.vcxproj", "{745D4A8C-6A68-4721-A43A-D81BF59860A1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Hercules-12.sln b/Hercules-12.sln index 2cf675c74..7cb72efd7 100644 --- a/Hercules-12.sln +++ b/Hercules-12.sln @@ -1,5 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 -- cgit v1.2.3-70-g09d2 From 068d42e39b2dafbe37419d37b65992b8a6efd327 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 7 Nov 2013 01:46:52 +0100 Subject: Fixed equip command failing when another item of the same kind is equipped - The command now correctly skips the already equipped items, rather than trying to equip them again (and fail during the process). - Special thanks to Poison. Signed-off-by: Haru --- src/map/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/script.c b/src/map/script.c index 5f7dd777a..b30073486 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12995,7 +12995,7 @@ BUILDIN(equip) ShowError("wrong item ID : equipitem(%i)\n",nameid); return false; } - ARR_FIND( 0, MAX_INVENTORY, i, sd->status.inventory[i].nameid == nameid ); + ARR_FIND( 0, MAX_INVENTORY, i, sd->status.inventory[i].nameid == nameid && sd->status.inventory[i].equip == 0 ); if( i < MAX_INVENTORY ) pc->equipitem(sd,i,item_data->equip); -- cgit v1.2.3-70-g09d2 From 75bbfdd137c0347155ad469d1c46f7f0a36a2579 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 7 Nov 2013 02:33:52 +0100 Subject: Corrected a const pointer being incorrectly initialized - Fixes bugreport:7804, thanks to kyeme http://hercules.ws/board/tracker/issue-7804-warning-c4090-function Signed-off-by: Haru --- src/map/script.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index b30073486..7a2f1f24b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1918,8 +1918,7 @@ void script_errorwarning_sub(StringBuf *buf, const char* src, const char* file, int j; int line = start_line; const char *p, *error_linepos; - const char *linestart[CONTEXTLINES]; - memset(linestart, '\0', sizeof(linestart)); + const char *linestart[CONTEXTLINES] = { NULL }; for(p=src;p && *p;line++){ const char *lineend=strchr(p,'\n'); -- cgit v1.2.3-70-g09d2 From 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 7 Nov 2013 19:47:47 +0100 Subject: Extended script constants to support NPC sprite IDs - Added support for constants whose name begins with a number. - Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40. - Replaced calls to setnpcdisplay with hardcoded numeric IDs to constants. - Thanks to Yommy. Signed-off-by: Haru --- npc/custom/events/disguise.txt | 8 +-- npc/events/gdevent_aru.txt | 14 ++--- npc/quests/newgears/2004_headgears.txt | 2 +- npc/quests/quests_rachel.txt | 6 +- npc/re/quests/quests_brasilis.txt | 2 +- npc/re/quests/quests_mora.txt | 4 +- src/map/script.c | 111 ++++++++++++++++++++++----------- 7 files changed, 94 insertions(+), 53 deletions(-) diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index 1b46e9b16..a1d8c11c3 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -38,7 +38,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ setnpctimer 0; stopnpctimer; announce "A GM has decided to turn the Disguise Event off. As a result no further prizes will be given.",bc_map | bc_blue; deletepset 1; - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; close; } set .EventON,1; set .Timer,1; setnpctimer 0; initnpctimer; @@ -171,7 +171,7 @@ OnTimer10000: OnTimer30000: if (.Timer) end; set .Change,0; - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again."; specialeffect 725; set $MonsterName$,""; @@ -230,13 +230,13 @@ iCorrect: getitem .Prize,.PrizeAmt; announce strcharinfo(0)+" is correct! I was disguised as: "+$MonsterName$+"",bc_map | bc_blue; if (.RoundCount>=.Rounds) { - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; set .RoundCount,0; set .Change,0; set .EventON,0; setnpctimer 0; stopnpctimer; npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later."; end; } - setnpcdisplay "Disguise Event",795; + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; set .Change,0; setnpctimer 0; end; diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index e0098bf9b..9f1a9617a 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -480,19 +480,19 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ specialeffect EF_POISONHIT; set .@sprchg_gd,rand(1,5); if (.@sprchg_gd == 1) { - setnpcdisplay "Pierrot Pier#aru_gd",950; + setnpcdisplay "Pierrot Pier#aru_gd", 4_GHOSTRING; } else if (.@sprchg_gd == 2) { - setnpcdisplay "Pierrot Pier#aru_gd",715; + setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT; } else if (.@sprchg_gd == 3) { - setnpcdisplay "Pierrot Pier#aru_gd",714; + setnpcdisplay "Pierrot Pier#aru_gd", 4_F_06; } else if (.@sprchg_gd == 4) { - setnpcdisplay "Pierrot Pier#aru_gd",785; + setnpcdisplay "Pierrot Pier#aru_gd", 4_M_UMDANCEKID2; } else { - setnpcdisplay "Pierrot Pier#aru_gd",876; + setnpcdisplay "Pierrot Pier#aru_gd", 4_CAT; } if (checkweight(1201,1) == 0) { mes "- Wait!! -"; @@ -506,7 +506,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ if ($@gdeventv_a2 == 0) { set .@que_2143,checkquest(2143,PLAYTIME); if (.@que_2143 == -1) { - setnpcdisplay "Pierrot Pier#aru_gd",715; + setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; next; mes "When looked at closely, the clown is just a puppet that looks like a human."; @@ -845,7 +845,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ } else { if ($@gdeventv_a2 == 0) { - setnpcdisplay "Pierrot Pier#aru_gd",715; + setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; next; mes "When looked at closely, the clown is just a puppet that looks like a human."; diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 1cfa2bc03..a6638d6a7 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -2034,7 +2034,7 @@ alde_alche,88,180,0 script Muscle Man#Alarm Mask 4_M_ALCHE_A,{ OnTimer4000: specialeffect EF_FLASHER; - setnpcdisplay "Muscle Man#Alarm Mask", 748; + setnpcdisplay "Muscle Man#Alarm Mask", 4_M_ALCHE_A; disablenpc " #Alarm Mask Man1"; disablenpc " #Alarm Mask Man2"; disablenpc " #Alarm Mask Man3"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index cf2e62dcb..fc96796bb 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3131,7 +3131,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 4_M_FROZEN1,5,5,{ mes "^3355FF*Pzzzzz*"; mes "*CRASH!*^000000"; next; - setnpcdisplay "Man Stuck in Ice#cave",937; + setnpcdisplay "Man Stuck in Ice#cave", 4_M_ARUNA_NFM1; emotion e_gasp; mes "[Maheo]"; mes "Finally...!"; @@ -3193,7 +3193,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 4_M_FROZEN1,5,5,{ getitem 7574,4; //Ice_Particle close2; cutin "",255; - setnpcdisplay "Man Stuck in Ice#cave",924; + setnpcdisplay "Man Stuck in Ice#cave", 4_M_FROZEN1; end; } @@ -7495,4 +7495,4 @@ OnTouch: //= 2.7 Corrected overlaping warp coordinates. [L0ne_W0lf] //= 2.8 Replaced effect numerics with constants. [L0ne_W0lf] //= 2.9 Replaced effect numerics with constants. [Samuray22] -//============================================================ \ No newline at end of file +//============================================================ diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 306a19cdb..5276fafe5 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -814,7 +814,7 @@ brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{ mes "[Mage Paje]"; mes "Abracadabra~"; specialeffect EF_POISONHIT,AREA,"Poring#bra"; - setarray .@display[0],800,876,909; + setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING; setnpcdisplay "Poring#bra",.@display[rand(3)]; if (brazil_gua != 5) close; next; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 9acebd207..1d7e9bbd0 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -2461,14 +2461,14 @@ bif_fild01,132,338,3 script Lope#pa 4_M_FAIRYSOLDIER2,2,2,{ } end; OnEnable: - setnpcdisplay "Lope#pa",999; + setnpcdisplay "Lope#pa", 4_M_MUT1; end; OnDisable: disablenpc "Lope#pa"; initnpctimer; end; OnReset: - setnpcdisplay "Lope#pa",461; + setnpcdisplay "Lope#pa", 4_M_FAIRYSOLDIER2; enablenpc "Lope#pa"; end; OnTimer2000: diff --git a/src/map/script.c b/src/map/script.c index 7a2f1f24b..b87020253 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -858,50 +858,87 @@ const char* parse_variable(const char* p) { return p; } +/* + * Checks whether the gives string is a number literal + * + * Mainly necessary to differentiate between number literals and NPC name + * constants, since several of those start with a digit. + * + * All this does is to check if the string begins with an optional + or - sign, + * followed by a hexadecimal or decimal number literal literal and is NOT + * followed by a underscore or letter. + * + * @param p Pointer to the string to check + * @return Whether the string is a number literal + */ +bool is_number(const char *p) { + const char *np; + if (!p) + return false; + if (*p == '-' || *p == '+') + p++; + np = p; + if (*p == '0' && p[1] == 'x') { + p+=2; + np = p; + // Hexadecimal + while (ISXDIGIT(*np)) + np++; + } else { + // Decimal + while (ISDIGIT(*np)) + np++; + } + if (p != np && *np != '_' && !ISALPHA(*np)) // At least one digit, and next isn't a letter or _ + return true; + return false; +} + /*========================================== * Analysis section *------------------------------------------*/ -const char* parse_simpleexpr(const char *p) -{ - long long i; +const char* parse_simpleexpr(const char *p) { + int i; p=script->skip_space(p); if(*p==';' || *p==',') disp_error_message("parse_simpleexpr: unexpected end of expression",p); - if(*p=='('){ + if(*p=='(') { if( (i=script->syntax.curly_count-1) >= 0 && script->syntax.curly[i].type == TYPE_ARGLIST ) ++script->syntax.curly[i].count; p=script->parse_subexpr(p+1,-1); p=script->skip_space(p); - if( (i=script->syntax.curly_count-1) >= 0 && script->syntax.curly[i].type == TYPE_ARGLIST && - script->syntax.curly[i].flag == ARGLIST_UNDEFINED && --script->syntax.curly[i].count == 0 - ){ - if( *p == ',' ){ + if( (i=script->syntax.curly_count-1) >= 0 && script->syntax.curly[i].type == TYPE_ARGLIST + && script->syntax.curly[i].flag == ARGLIST_UNDEFINED && --script->syntax.curly[i].count == 0 + ) { + if( *p == ',' ) { script->syntax.curly[i].flag = ARGLIST_PAREN; return p; - } else + } else { script->syntax.curly[i].flag = ARGLIST_NO_PAREN; + } } if( *p != ')' ) disp_error_message("parse_simpleexpr: unmatched ')'",p); ++p; - } else if(ISDIGIT(*p) || ((*p=='-' || *p=='+') && ISDIGIT(p[1]))){ + } else if(is_number(p)) { char *np; - while(*p == '0' && ISDIGIT(p[1])) p++; - i=strtoll(p,&np,0); - if( i < INT_MIN ) { - i = INT_MIN; + long long lli; + while(*p == '0' && ISDIGIT(p[1])) p++; // Skip leading zeros, we don't support octal literals + lli=strtoll(p,&np,0); + if( lli < INT_MIN ) { + lli = INT_MIN; script->disp_warning_message("parse_simpleexpr: underflow detected, capping value to INT_MIN",p); - } else if( i > INT_MAX ) { - i = INT_MAX; + } else if( lli > INT_MAX ) { + lli = INT_MAX; script->disp_warning_message("parse_simpleexpr: overflow detected, capping value to INT_MAX",p); } - script->addi((int)i); + script->addi((int)lli); // Cast is safe, as it's already been checked for overflows p=np; - } else if(*p=='"'){ + } else if(*p=='"') { script->addc(C_STR); p++; - while( *p && *p != '"' ){ + while( *p && *p != '"' ) { if( (unsigned char)p[-1] <= 0x7e && *p == '\\' ) { char buf[8]; size_t len = sv->skip_escaped_c(p) - p; @@ -911,8 +948,9 @@ const char* parse_simpleexpr(const char *p) p += len; script->addb(*buf); continue; - } else if( *p == '\n' ) + } else if( *p == '\n' ) { disp_error_message("parse_simpleexpr: unexpected newline @ string",p); + } script->addb(*p++); } if(!*p) @@ -928,24 +966,24 @@ const char* parse_simpleexpr(const char *p) disp_error_message("parse_simpleexpr: unexpected character",p); l=script->add_word(p); - if( script->str_data[l].type == C_FUNC || script->str_data[l].type == C_USERFUNC || script->str_data[l].type == C_USERFUNC_POS) + if( script->str_data[l].type == C_FUNC || script->str_data[l].type == C_USERFUNC || script->str_data[l].type == C_USERFUNC_POS) { return script->parse_callfunc(p,1,0); #ifdef SCRIPT_CALLFUNC_CHECK - else { + } else { const char* name = script->get_str(l); if( strdb_get(script->userfunc_db,name) != NULL ) { return script->parse_callfunc(p,1,1); } - } #endif + } - if( (pv = script->parse_variable(p)) ) - {// successfully processed a variable assignment + if( (pv = script->parse_variable(p)) ) { + // successfully processed a variable assignment return pv; } p=script->skip_word(p); - if( *p == '[' ){ + if( *p == '[' ) { // array(name[i] => getelementofarray(name,i) ) script->addl(script->buildin_getelementofarray_ref); script->addc(C_ARG); @@ -957,8 +995,9 @@ const char* parse_simpleexpr(const char *p) disp_error_message("parse_simpleexpr: unmatched ']'",p); ++p; script->addc(C_FUNC); - }else + } else { script->addl(l); + } } @@ -1229,8 +1268,16 @@ const char* parse_syntax(const char* p) disp_error_message("parse_syntax: expect space ' '",p); } // check whether case label is integer or not - v = strtol(p,&np,0); - if(np == p) { //Check for constants + if(is_number(p)) { + //Numeric value + v = strtol(p,&np,0); + if((*p == '-' || *p == '+') && ISDIGIT(p[1])) // pre-skip because '-' can not skip_word + p++; + p = script->skip_word(p); + if(np != p) + disp_error_message("parse_syntax: 'case' label is not an integer",np); + } else { + //Check for constants p2 = script->skip_word(p); v = p2-p; // length of word at p2 memcpy(label,p,v); @@ -1238,12 +1285,6 @@ const char* parse_syntax(const char* p) if( !script->get_constant(label, &v) ) disp_error_message("parse_syntax: 'case' label is not an integer",p); p = script->skip_word(p); - } else { //Numeric value - if((*p == '-' || *p == '+') && ISDIGIT(p[1])) // pre-skip because '-' can not skip_word - p++; - p = script->skip_word(p); - if(np != p) - disp_error_message("parse_syntax: 'case' label is not an integer",np); } p = script->skip_space(p); if(*p != ':') -- cgit v1.2.3-70-g09d2