From 1fc55f1687f9d99ac7270b28082a5f0727640469 Mon Sep 17 00:00:00 2001 From: euphyy Date: Sat, 10 Nov 2012 17:29:54 +0000 Subject: * Added a missing shop item, bugreport:6878 (re\merchants\shops.txt) * Fixed a few incorrect labels in Poring War script, bugreport:6794 (other\poring_war.txt) * Follow-up r16900, added svn:eol-style=native property. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16903 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/poring_war.txt | 9 +- npc/re/merchants/shops.txt | 10 +- rAthena-12.sln | 76 +-- vcproj-12/char-server_sql.vcxproj | 426 +++++++-------- vcproj-12/char-server_sql.vcxproj.filters | 496 ++++++++--------- vcproj-12/login-server_sql.vcxproj | 400 +++++++------- vcproj-12/login-server_sql.vcxproj.filters | 400 +++++++------- vcproj-12/map-server_sql.vcxproj | 546 +++++++++---------- vcproj-12/map-server_sql.vcxproj.filters | 848 ++++++++++++++--------------- vcproj-12/mapcache.vcxproj | 304 +++++------ vcproj-12/mapcache.vcxproj.filters | 136 ++--- 11 files changed, 1826 insertions(+), 1825 deletions(-) diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 16cc55790..23f7eb5a1 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1a +//= 1.1b //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 First version. [Kisuka][5511] //= 1.1 Fixed some typos/bugs. [CalciumKid] //= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim] +//= 1.1b Fixed incorrect label calls. [Euphy] //============================================================ // Poring War Recruiter @@ -1439,9 +1440,9 @@ OnTimer68100: donpcevent "Mr. Doppel#wop_team_a::OnDisable"; donpcevent "Mr. Doppel#wop_team_d::OnDisable"; donpcevent "#wop_warp_rtry::OnDisable"; - donpcevent "Poring#wop_door_a::OnReset"; - donpcevent "Poring#wop_door_d::OnReset"; - donpcevent "Poring#wop_door_all::OnReset"; + donpcevent "Poring#wop_door_a::OnEnable"; + donpcevent "Poring#wop_door_d::OnEnable"; + donpcevent "Poring#wop_door_all::OnEnable"; stopnpctimer; end; } diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index fcdd6044b..969482dd2 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -15,7 +15,7 @@ //======================================================= // Einbroch //======================================================= -einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 //======================================================= // Izlude @@ -28,23 +28,23 @@ izlude,174,164,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1, //======================================================= // Lighthalzen //======================================================= -lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1 //======================================================= // Mid Camp //======================================================= mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1 -mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 //======================================================= // Prontera //======================================================= -prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1 //======================================================= // Rachel //======================================================= -ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 +ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1 s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1 diff --git a/rAthena-12.sln b/rAthena-12.sln index c4fc09816..e38ab4cbd 100644 --- a/rAthena-12.sln +++ b/rAthena-12.sln @@ -1,38 +1,38 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-12\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-12\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-12\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" -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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj-12\char-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj-12\login-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-12\map-server_sql.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapcache", "vcproj-12\mapcache.vcxproj", "{D356871D-58E1-450B-967A-E7E9646175AF}" +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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vcproj-12/char-server_sql.vcxproj b/vcproj-12/char-server_sql.vcxproj index f21d58bfa..f3ec456c7 100644 --- a/vcproj-12/char-server_sql.vcxproj +++ b/vcproj-12/char-server_sql.vcxproj @@ -1,214 +1,214 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E4E9646175AF} - char-server_sql - Win32Proj - $(VCTargetsPath11) - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - char-server_sql - char-server_sql - - - - 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 - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E4E9646175AF} + char-server_sql + Win32Proj + $(VCTargetsPath11) + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + char-server_sql + char-server_sql + + + + 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 + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/char-server_sql.vcxproj.filters b/vcproj-12/char-server_sql.vcxproj.filters index 282bce920..06f69e35e 100644 --- a/vcproj-12/char-server_sql.vcxproj.filters +++ b/vcproj-12/char-server_sql.vcxproj.filters @@ -1,249 +1,249 @@ - - - - - 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 - - - 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 - - - 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} - - + + + + + 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 + + + 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 + + + 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_sql.vcxproj b/vcproj-12/login-server_sql.vcxproj index af6d7a326..46b774b06 100644 --- a/vcproj-12/login-server_sql.vcxproj +++ b/vcproj-12/login-server_sql.vcxproj @@ -1,201 +1,201 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E5E9646175AF} - login-server_sql - Win32Proj - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - login-server_sql - login-server_sql - - - - 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 - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E5E9646175AF} + login-server_sql + Win32Proj + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + login-server_sql + login-server_sql + + + + 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 + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/login-server_sql.vcxproj.filters b/vcproj-12/login-server_sql.vcxproj.filters index cf18a99ec..f4280a018 100644 --- a/vcproj-12/login-server_sql.vcxproj.filters +++ b/vcproj-12/login-server_sql.vcxproj.filters @@ -1,201 +1,201 @@ - - - - - login_sql - - - login_sql - - - login_sql - - - login_sql - - - 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 - - - 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} - - + + + + + login_sql + + + login_sql + + + login_sql + + + login_sql + + + 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 + + + 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_sql.vcxproj b/vcproj-12/map-server_sql.vcxproj index 6fb953efa..b4abcf790 100644 --- a/vcproj-12/map-server_sql.vcxproj +++ b/vcproj-12/map-server_sql.vcxproj @@ -1,274 +1,274 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D356871D-58E1-450B-967A-E6E9646175AF} - map-server_sql - Win32Proj - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\ - $(ProjectName)\$(Configuration)\ - true - ..\ - $(ProjectName)\$(Configuration)\ - false - map-server_sql - map-server_sql - - - - 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 - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {D356871D-58E1-450B-967A-E6E9646175AF} + map-server_sql + Win32Proj + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\ + $(ProjectName)\$(Configuration)\ + true + ..\ + $(ProjectName)\$(Configuration)\ + false + map-server_sql + map-server_sql + + + + 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 + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/map-server_sql.vcxproj.filters b/vcproj-12/map-server_sql.vcxproj.filters index 56e50adc7..72ad44246 100644 --- a/vcproj-12/map-server_sql.vcxproj.filters +++ b/vcproj-12/map-server_sql.vcxproj.filters @@ -1,425 +1,425 @@ - - - - - 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 - - - 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 - - - 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} - - + + + + + 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 + + + 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 + + + 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 index c45365200..97be51e20 100644 --- a/vcproj-12/mapcache.vcxproj +++ b/vcproj-12/mapcache.vcxproj @@ -1,153 +1,153 @@ - - - - - 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 - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 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 + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj.filters b/vcproj-12/mapcache.vcxproj.filters index 757c17e15..e5a3cb87b 100644 --- a/vcproj-12/mapcache.vcxproj.filters +++ b/vcproj-12/mapcache.vcxproj.filters @@ -1,69 +1,69 @@ - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - mapcache - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - - - {a9c2444c-ffec-4e89-8412-e530231d79dc} - - - {5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d} - - + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + mapcache + + + + + 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 -- cgit v1.2.3-70-g09d2