diff options
| author | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
| commit | 951b18c97a09426e2f14801263c2fd07efbd46bb (patch) | |
| tree | 94303465410557176454305aeeab76a13ca8514d | |
| parent | 8083daec0d94f78510411c9b225abcfa7e829e95 (diff) | |
| parent | 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff) | |
| download | hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.gz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.bz2 hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.xz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.zip | |
Merge remote-tracking branch 'upstream/master'
29 files changed, 2385 insertions, 98 deletions
diff --git a/Hercules-11.sln b/Hercules-11.sln new file mode 100644 index 000000000..b395132be --- /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-11\char-server.vcxproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" +EndProject +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-11\map-server.vcxproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" +EndProject +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-11\plugin-sample.vcxproj", "{E64C56D3-CDFB-483B-900B-A62D216B6D2F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-HPMHooking", "vcproj-11\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 index 686100c98..7cb72efd7 100644 --- a/Hercules-12.sln +++ b/Hercules-12.sln @@ -1,13 +1,15 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +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}") = "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}") = "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}" @@ -26,14 +28,14 @@ Global {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 + {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 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/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__) diff --git a/src/map/script.c b/src/map/script.c index cf3c3fb50..53b5bbe16 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 != ':') @@ -1918,8 +1959,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'); @@ -13043,7 +13083,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); 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 ) { 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid> + <RootNamespace>char-server</RootNamespace> + <Keyword>Win32Proj</Keyword> + <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">char-server</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">char-server</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessToFile>false</PreprocessToFile> + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> + <ExceptionHandling> + </ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LIBCONFIG_STATIC;YY_USE_CONST;FD_SETSIZE=4096;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\3rdparty\libconfig\grammar.h" /> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h" /> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanner.h" /> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h" /> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> + <ClInclude Include="..\src\common\cbasetypes.h" /> + <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\core.h" /> + <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\db.h" /> + <ClInclude Include="..\src\common\ers.h" /> + <ClInclude Include="..\src\common\HPM.h" /> + <ClInclude Include="..\src\common\HPMi.h" /> + <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\mapindex.h" /> + <ClInclude Include="..\src\common\mempool.h" /> + <ClInclude Include="..\src\common\mmo.h" /> + <ClInclude Include="..\src\common\mutex.h" /> + <ClInclude Include="..\src\common\nullpo.h" /> + <ClInclude Include="..\src\common\raconf.h" /> + <ClInclude Include="..\src\common\random.h" /> + <ClInclude Include="..\src\common\showmsg.h" /> + <ClInclude Include="..\src\common\socket.h" /> + <ClInclude Include="..\src\common\sql.h" /> + <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\thread.h" /> + <ClInclude Include="..\src\common\timer.h" /> + <ClInclude Include="..\src\common\utils.h" /> + <ClInclude Include="..\src\char\char.h" /> + <ClInclude Include="..\src\char\int_auction.h" /> + <ClInclude Include="..\src\char\int_elemental.h" /> + <ClInclude Include="..\src\char\int_guild.h" /> + <ClInclude Include="..\src\char\int_homun.h" /> + <ClInclude Include="..\src\char\int_mail.h" /> + <ClInclude Include="..\src\char\int_mercenary.h" /> + <ClInclude Include="..\src\char\int_party.h" /> + <ClInclude Include="..\src\char\int_pet.h" /> + <ClInclude Include="..\src\char\int_quest.h" /> + <ClInclude Include="..\src\char\int_storage.h" /> + <ClInclude Include="..\src\char\inter.h" /> + <ClInclude Include="..\src\char\pincode.h" /> + <ClInclude Include="..\src\common\winapi.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\3rdparty\libconfig\grammar.c" /> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> + <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\db.c" /> + <ClCompile Include="..\src\common\ers.c" /> + <ClCompile Include="..\src\common\HPM.c" /> + <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\mapindex.c" /> + <ClCompile Include="..\src\common\mempool.c" /> + <ClCompile Include="..\src\common\mutex.c" /> + <ClCompile Include="..\src\common\nullpo.c" /> + <ClCompile Include="..\src\common\raconf.c" /> + <ClCompile Include="..\src\common\random.c" /> + <ClCompile Include="..\src\common\showmsg.c" /> + <ClCompile Include="..\src\common\socket.c" /> + <ClCompile Include="..\src\common\sql.c" /> + <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\thread.c" /> + <ClCompile Include="..\src\common\timer.c" /> + <ClCompile Include="..\src\common\utils.c" /> + <ClCompile Include="..\src\char\char.c" /> + <ClCompile Include="..\src\char\int_auction.c" /> + <ClCompile Include="..\src\char\int_elemental.c" /> + <ClCompile Include="..\src\char\int_guild.c" /> + <ClCompile Include="..\src\char\int_homun.c" /> + <ClCompile Include="..\src\char\int_mail.c" /> + <ClCompile Include="..\src\char\int_mercenary.c" /> + <ClCompile Include="..\src\char\int_party.c" /> + <ClCompile Include="..\src\char\int_pet.c" /> + <ClCompile Include="..\src\char\int_quest.c" /> + <ClCompile Include="..\src\char\int_storage.c" /> + <ClCompile Include="..\src\char\inter.c" /> + <ClCompile Include="..\src\char\pincode.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\src\common\conf.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\core.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\console.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\db.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\ers.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\HPM.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\malloc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mapindex.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\nullpo.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\random.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\showmsg.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\socket.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\sql.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\strlib.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\timer.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\utils.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\char\char.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_auction.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_elemental.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_guild.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_homun.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_mail.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_mercenary.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_party.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_pet.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_quest.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\int_storage.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\inter.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\char\pincode.c"> + <Filter>char_sql</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c"> + <Filter>3rdparty\mt19937ar</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\grammar.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanner.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\src\common\thread.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mutex.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mempool.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\raconf.c"> + <Filter>common</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\src\common\cbasetypes.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\conf.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\core.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\console.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\db.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\ers.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPM.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPMi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\malloc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mapindex.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mmo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\nullpo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\random.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\showmsg.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\socket.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\sql.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\strlib.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\timer.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\utils.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\char\inter.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\pincode.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\char.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_auction.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_elemental.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_guild.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_homun.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_mail.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_mercenary.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_party.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_pet.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_quest.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\char\int_storage.h"> + <Filter>char_sql</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h"> + <Filter>3rdparty\mt19937ar</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\grammar.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanner.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\src\common\winapi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\thread.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mutex.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mempool.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\raconf.h"> + <Filter>common</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="common"> + <UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier> + </Filter> + <Filter Include="char_sql"> + <UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty"> + <UniqueIdentifier>{b3f5c857-79c0-4a55-b8c5-7e7f56a8f948}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\mt19937ar"> + <UniqueIdentifier>{847768ab-8c4b-431b-8667-00f8ae3b915c}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\libconfig"> + <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D356871D-58E1-450B-967A-E5E9646175AF}</ProjectGuid> + <RootNamespace>login-server</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">login-server</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">login-server</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessToFile>false</PreprocessToFile> + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> + <ExceptionHandling> + </ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4100;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;WITH_SQL;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4100;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\3rdparty\libconfig\grammar.h" /> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h" /> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanner.h" /> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h" /> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> + <ClInclude Include="..\src\common\mempool.h" /> + <ClInclude Include="..\src\common\mutex.h" /> + <ClInclude Include="..\src\common\raconf.h" /> + <ClInclude Include="..\src\common\thread.h" /> + <ClInclude Include="..\src\common\winapi.h" /> + <ClInclude Include="..\src\login\account.h" /> + <ClInclude Include="..\src\login\ipban.h" /> + <ClInclude Include="..\src\login\login.h" /> + <ClInclude Include="..\src\login\loginlog.h" /> + <ClInclude Include="..\src\common\cbasetypes.h" /> + <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\core.h" /> + <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\db.h" /> + <ClInclude Include="..\src\common\ers.h" /> + <ClInclude Include="..\src\common\HPM.h" /> + <ClInclude Include="..\src\common\HPMi.h" /> + <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\md5calc.h" /> + <ClInclude Include="..\src\common\mmo.h" /> + <ClInclude Include="..\src\common\nullpo.h" /> + <ClInclude Include="..\src\common\random.h" /> + <ClInclude Include="..\src\common\showmsg.h" /> + <ClInclude Include="..\src\common\socket.h" /> + <ClInclude Include="..\src\common\sql.h" /> + <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\timer.h" /> + <ClInclude Include="..\src\common\utils.h" /> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\3rdparty\libconfig\grammar.c" /> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> + <ClCompile Include="..\src\common\mempool.c" /> + <ClCompile Include="..\src\common\mutex.c" /> + <ClCompile Include="..\src\common\raconf.c" /> + <ClCompile Include="..\src\common\thread.c" /> + <ClCompile Include="..\src\login\account_sql.c" /> + <ClCompile Include="..\src\login\ipban_sql.c" /> + <ClCompile Include="..\src\login\login.c" /> + <ClCompile Include="..\src\login\loginlog_sql.c" /> + <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\db.c" /> + <ClCompile Include="..\src\common\ers.c" /> + <ClCompile Include="..\src\common\HPM.c" /> + <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\md5calc.c" /> + <ClCompile Include="..\src\common\nullpo.c" /> + <ClCompile Include="..\src\common\random.c" /> + <ClCompile Include="..\src\common\showmsg.c" /> + <ClCompile Include="..\src\common\socket.c" /> + <ClCompile Include="..\src\common\sql.c" /> + <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\timer.c" /> + <ClCompile Include="..\src\common\utils.c" /> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\src\login\account_sql.c"> + <Filter>login_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\login\ipban_sql.c"> + <Filter>login_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\login\login.c"> + <Filter>login_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\login\loginlog_sql.c"> + <Filter>login_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\common\conf.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\core.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\console.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\db.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\ers.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\HPM.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\malloc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\md5calc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\nullpo.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\random.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\showmsg.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\socket.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\sql.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\strlib.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\timer.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\utils.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c"> + <Filter>3rdparty\mt19937ar</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\grammar.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanner.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\src\common\thread.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mutex.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mempool.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\raconf.c"> + <Filter>common</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\src\login\account.h"> + <Filter>login_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\login\ipban.h"> + <Filter>login_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\login\loginlog.h"> + <Filter>login_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\login\login.h"> + <Filter>login_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\common\cbasetypes.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\conf.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\core.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\console.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\db.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\ers.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPM.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPMi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\malloc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\md5calc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mmo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\nullpo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\random.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\showmsg.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\socket.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\sql.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\strlib.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\timer.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\utils.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h"> + <Filter>3rdparty\mt19937ar</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\grammar.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanner.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\src\common\winapi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\thread.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mutex.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mempool.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\raconf.h"> + <Filter>common</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="common"> + <UniqueIdentifier>{b50ee803-e71d-4d41-8f7d-2dad5839df50}</UniqueIdentifier> + </Filter> + <Filter Include="login_sql"> + <UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty"> + <UniqueIdentifier>{ab5c90ec-923d-4847-a214-45b40818211e}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\mt19937ar"> + <UniqueIdentifier>{68e3bcee-28d9-4b2d-8701-614d50f32999}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\libconfig"> + <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D356871D-58E1-450B-967A-E6E9646175AF}</ProjectGuid> + <RootNamespace>map-server</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">map-server</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">map-server</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessToFile>false</PreprocessToFile> + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> + <ExceptionHandling> + </ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4018;4100;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmtd.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;..\3rdparty\libconfig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <DisableSpecificWarnings>4018;4100;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmt.lib;oldnames.lib;ws2_32.lib;libmysql.lib;zdll.lib;pcre.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\mysql\lib;..\3rdparty\zlib\lib;..\3rdparty\pcre\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\3rdparty\libconfig\grammar.h" /> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h" /> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h" /> + <ClInclude Include="..\3rdparty\libconfig\scanner.h" /> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h" /> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> + <ClInclude Include="..\src\common\cbasetypes.h" /> + <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\core.h" /> + <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\db.h" /> + <ClInclude Include="..\src\common\des.h" /> + <ClInclude Include="..\src\common\ers.h" /> + <ClInclude Include="..\src\common\grfio.h" /> + <ClInclude Include="..\src\common\HPM.h" /> + <ClInclude Include="..\src\common\HPMi.h" /> + <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\mapindex.h" /> + <ClInclude Include="..\src\common\md5calc.h" /> + <ClInclude Include="..\src\common\mempool.h" /> + <ClInclude Include="..\src\common\mmo.h" /> + <ClInclude Include="..\src\common\mutex.h" /> + <ClInclude Include="..\src\common\nullpo.h" /> + <ClInclude Include="..\src\common\raconf.h" /> + <ClInclude Include="..\src\common\random.h" /> + <ClInclude Include="..\src\common\showmsg.h" /> + <ClInclude Include="..\src\common\socket.h" /> + <ClInclude Include="..\src\common\sql.h" /> + <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\thread.h" /> + <ClInclude Include="..\src\common\timer.h" /> + <ClInclude Include="..\src\common\utils.h" /> + <ClInclude Include="..\src\common\winapi.h" /> + <ClInclude Include="..\src\map\atcommand.h" /> + <ClInclude Include="..\src\map\battle.h" /> + <ClInclude Include="..\src\map\battleground.h" /> + <ClInclude Include="..\src\map\buyingstore.h" /> + <ClInclude Include="..\src\map\chat.h" /> + <ClInclude Include="..\src\map\chrif.h" /> + <ClInclude Include="..\src\map\clif.h" /> + <ClInclude Include="..\src\map\date.h" /> + <ClInclude Include="..\src\map\duel.h" /> + <ClInclude Include="..\src\map\elemental.h" /> + <ClInclude Include="..\src\map\guild.h" /> + <ClInclude Include="..\src\map\intif.h" /> + <ClInclude Include="..\src\map\irc-bot.h" /> + <ClInclude Include="..\src\map\itemdb.h" /> + <ClInclude Include="..\src\map\log.h" /> + <ClInclude Include="..\src\map\mail.h" /> + <ClInclude Include="..\src\map\map.h" /> + <ClInclude Include="..\src\map\mapreg.h" /> + <ClInclude Include="..\src\map\homunculus.h" /> + <ClInclude Include="..\src\map\HPMmap.h" /> + <ClInclude Include="..\src\map\instance.h" /> + <ClInclude Include="..\src\map\mercenary.h" /> + <ClInclude Include="..\src\map\mob.h" /> + <ClInclude Include="..\src\map\npc.h" /> + <ClInclude Include="..\src\map\packets.h" /> + <ClInclude Include="..\src\map\packets_struct.h" /> + <ClInclude Include="..\src\map\party.h" /> + <ClInclude Include="..\src\map\path.h" /> + <ClInclude Include="..\src\map\pc.h" /> + <ClInclude Include="..\src\map\pc_groups.h" /> + <ClInclude Include="..\src\map\pet.h" /> + <ClInclude Include="..\src\map\quest.h" /> + <ClInclude Include="..\src\config\const.h" /> + <ClInclude Include="..\src\config\core.h" /> + <ClInclude Include="..\src\config\renewal.h" /> + <ClInclude Include="..\src\config\secure.h" /> + <ClInclude Include="..\src\config\classes\general.h" /> + <ClInclude Include="..\src\map\script.h" /> + <ClInclude Include="..\src\map\searchstore.h" /> + <ClInclude Include="..\src\map\skill.h" /> + <ClInclude Include="..\src\map\status.h" /> + <ClInclude Include="..\src\map\storage.h" /> + <ClInclude Include="..\src\map\trade.h" /> + <ClInclude Include="..\src\map\unit.h" /> + <ClInclude Include="..\src\map\vending.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\3rdparty\libconfig\grammar.c" /> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c" /> + <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> + <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\db.c" /> + <ClCompile Include="..\src\common\des.c" /> + <ClCompile Include="..\src\common\ers.c" /> + <ClCompile Include="..\src\common\grfio.c" /> + <ClCompile Include="..\src\common\HPM.c" /> + <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\mapindex.c" /> + <ClCompile Include="..\src\common\md5calc.c" /> + <ClCompile Include="..\src\common\mempool.c" /> + <ClCompile Include="..\src\common\mutex.c" /> + <ClCompile Include="..\src\common\nullpo.c" /> + <ClCompile Include="..\src\common\raconf.c" /> + <ClCompile Include="..\src\common\random.c" /> + <ClCompile Include="..\src\common\showmsg.c" /> + <ClCompile Include="..\src\common\socket.c" /> + <ClCompile Include="..\src\common\sql.c" /> + <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\thread.c" /> + <ClCompile Include="..\src\common\timer.c" /> + <ClCompile Include="..\src\common\utils.c" /> + <ClCompile Include="..\src\map\atcommand.c" /> + <ClCompile Include="..\src\map\battle.c" /> + <ClCompile Include="..\src\map\battleground.c" /> + <ClCompile Include="..\src\map\buyingstore.c" /> + <ClCompile Include="..\src\map\chat.c" /> + <ClCompile Include="..\src\map\chrif.c" /> + <ClCompile Include="..\src\map\clif.c" /> + <ClCompile Include="..\src\map\date.c" /> + <ClCompile Include="..\src\map\duel.c" /> + <ClCompile Include="..\src\map\elemental.c" /> + <ClCompile Include="..\src\map\guild.c" /> + <ClCompile Include="..\src\map\intif.c" /> + <ClCompile Include="..\src\map\irc-bot.c" /> + <ClCompile Include="..\src\map\itemdb.c" /> + <ClCompile Include="..\src\map\log.c" /> + <ClCompile Include="..\src\map\mail.c" /> + <ClCompile Include="..\src\map\map.c" /> + <ClCompile Include="..\src\map\mapreg_sql.c" /> + <ClCompile Include="..\src\map\homunculus.c" /> + <ClCompile Include="..\src\map\HPMmap.c" /> + <ClCompile Include="..\src\map\instance.c" /> + <ClCompile Include="..\src\map\mercenary.c" /> + <ClCompile Include="..\src\map\mob.c" /> + <ClCompile Include="..\src\map\npc.c" /> + <ClCompile Include="..\src\map\npc_chat.c" /> + <ClCompile Include="..\src\map\party.c" /> + <ClCompile Include="..\src\map\path.c" /> + <ClCompile Include="..\src\map\pc.c" /> + <ClCompile Include="..\src\map\pc_groups.c" /> + <ClCompile Include="..\src\map\pet.c" /> + <ClCompile Include="..\src\map\quest.c" /> + <ClCompile Include="..\src\map\script.c" /> + <ClCompile Include="..\src\map\searchstore.c" /> + <ClCompile Include="..\src\map\skill.c" /> + <ClCompile Include="..\src\map\status.c" /> + <ClCompile Include="..\src\map\storage.c" /> + <ClCompile Include="..\src\map\trade.c" /> + <ClCompile Include="..\src\map\unit.c" /> + <ClCompile Include="..\src\map\vending.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> + <Target Name="AfterBuild"> + <Copy SourceFiles="..\conf\import-tmpl\battle_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\battle_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\char_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\char_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\inter_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\inter_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\log_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\log_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\login_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\login_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\map_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\map_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\msg_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\msg_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\packet_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\packet_conf.txt')" /> + <Copy SourceFiles="..\conf\import-tmpl\script_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\script_conf.txt')" /> + </Target> +</Project> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\src\map\atcommand.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\battle.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\battleground.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\buyingstore.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\chat.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\chrif.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\clif.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\date.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\duel.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\elemental.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\guild.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\homunculus.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\HPMmap.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\instance.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\intif.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\irc-bot.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\itemdb.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\log.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\mail.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\map.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\mapreg_sql.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\mercenary.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\mob.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\npc.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\npc_chat.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\party.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\path.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\pc.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\pet.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\quest.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\script.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\searchstore.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\skill.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\status.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\storage.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\trade.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\unit.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\map\vending.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\common\core.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\console.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\des.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\db.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\ers.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\grfio.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\HPM.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\malloc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mapindex.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\md5calc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\nullpo.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\random.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\socket.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\sql.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\strlib.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\timer.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\utils.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\conf.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\map\pc_groups.c"> + <Filter>map_sql</Filter> + </ClCompile> + <ClCompile Include="..\src\common\showmsg.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c"> + <Filter>3rdparty\mt19937ar</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\grammar.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\libconfig.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanctx.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\scanner.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\3rdparty\libconfig\strbuf.c"> + <Filter>3rdparty\libconfig</Filter> + </ClCompile> + <ClCompile Include="..\src\common\thread.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mutex.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\mempool.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\raconf.c"> + <Filter>common</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\src\map\atcommand.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\battle.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\battleground.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\buyingstore.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\chat.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\chrif.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\clif.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\date.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\duel.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\elemental.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\guild.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\homunculus.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\HPMmap.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\instance.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\intif.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\irc-bot.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\itemdb.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\log.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\mail.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\map.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\mapreg.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\mercenary.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\mob.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\npc.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\packets.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\packets_struct.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\party.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\path.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\pc.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\pet.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\quest.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\script.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\searchstore.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\skill.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\status.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\storage.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\trade.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\unit.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\map\vending.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\common\cbasetypes.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\core.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\console.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\db.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\des.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\ers.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\grfio.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPM.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\HPMi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\malloc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mapindex.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\md5calc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mmo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\nullpo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\random.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\socket.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\sql.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\strlib.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\timer.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\utils.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\config\const.h" /> + <ClInclude Include="..\src\config\core.h" /> + <ClInclude Include="..\src\config\renewal.h" /> + <ClInclude Include="..\src\config\secure.h" /> + <ClInclude Include="..\src\config\classes\general.h" /> + <ClInclude Include="..\src\common\conf.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\map\pc_groups.h"> + <Filter>map_sql</Filter> + </ClInclude> + <ClInclude Include="..\src\common\showmsg.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h"> + <Filter>3rdparty\mt19937ar</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\grammar.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\libconfig.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\parsectx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanctx.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\scanner.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\strbuf.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\3rdparty\libconfig\wincompat.h"> + <Filter>3rdparty\libconfig</Filter> + </ClInclude> + <ClInclude Include="..\src\common\winapi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\thread.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mutex.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mempool.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\raconf.h"> + <Filter>common</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="common"> + <UniqueIdentifier>{3a137217-ebf7-44ee-95d9-3d7c51d2a199}</UniqueIdentifier> + </Filter> + <Filter Include="map_sql"> + <UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty"> + <UniqueIdentifier>{c4845ea8-bcc7-411b-af29-e3842adb6714}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\mt19937ar"> + <UniqueIdentifier>{fcf23386-ddba-4a72-9b41-62f8e2d0e6c0}</UniqueIdentifier> + </Filter> + <Filter Include="3rdparty\libconfig"> + <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D356871D-58E1-450B-967A-E7E9646175AF}</ProjectGuid> + <RootNamespace>mapcache</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mapcache</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mapcache</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessToFile>false</PreprocessToFile> + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> + <ExceptionHandling> + </ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>libcmtd.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)mapcache.exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <FunctionLevelLinking>false</FunctionLevelLinking> + <AdditionalOptions> + </AdditionalOptions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <CompileAs>CompileAsC</CompileAs> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <Link> + <AdditionalDependencies>libcmt.lib;oldnames.lib;zdll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)mapcache.exe</OutputFile> + <AdditionalLibraryDirectories>..\3rdparty\zlib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\des.c" /> + <ClCompile Include="..\src\common\grfio.c" /> + <ClCompile Include="..\src\common\malloc.c" /> + <ClCompile Include="..\src\common\showmsg.c" /> + <ClCompile Include="..\src\common\strlib.c" /> + <ClCompile Include="..\src\common\utils.c" /> + <ClCompile Include="..\src\tool\mapcache.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\src\common\cbasetypes.h" /> + <ClInclude Include="..\src\common\core.h" /> + <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\des.h" /> + <ClInclude Include="..\src\common\grfio.h" /> + <ClInclude Include="..\src\common\malloc.h" /> + <ClInclude Include="..\src\common\mmo.h" /> + <ClInclude Include="..\src\common\showmsg.h" /> + <ClInclude Include="..\src\common\strlib.h" /> + <ClInclude Include="..\src\common\utils.h" /> + <ClInclude Include="..\src\common\winapi.h" /> + <ClInclude Include="..\src\config\renewal.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\src\common\core.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\console.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\des.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\grfio.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\malloc.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\showmsg.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\strlib.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\common\utils.c"> + <Filter>common</Filter> + </ClCompile> + <ClCompile Include="..\src\tool\mapcache.c"> + <Filter>mapcache</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\src\common\cbasetypes.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\core.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\console.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\des.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\grfio.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\malloc.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\mmo.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\showmsg.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\strlib.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\utils.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\common\winapi.h"> + <Filter>common</Filter> + </ClInclude> + <ClInclude Include="..\src\config\renewal.h" /> + </ItemGroup> + <ItemGroup> + <Filter Include="common"> + <UniqueIdentifier>{a9c2444c-ffec-4e89-8412-e530231d79dc}</UniqueIdentifier> + </Filter> + <Filter Include="mapcache"> + <UniqueIdentifier>{5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{745D4A8C-6A68-4721-A43A-D81BF59860A1}</ProjectGuid> + <RootNamespace>plugin-HPMHooking</RootNamespace> + <Keyword>Win32Proj</Keyword> + <ProjectName>plugin-HPMHooking</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">HPMHooking</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">HPMHooking</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\src\plugins\HPMHooking.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-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 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{E64C56D3-CDFB-483B-900B-A62D216B6D2F}</ProjectGuid> + <RootNamespace>plugin-sample</RootNamespace> + <Keyword>Win32Proj</Keyword> + <ProjectName>plugin-sample</ProjectName> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">plugin-sample</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">plugin-sample</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\src\common;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0417</Culture> + </ResourceCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\src\plugins\sample.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index 126f15ea4..710251169 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -14,19 +14,18 @@ <ProjectGuid>{D356871D-58E1-450B-967A-E4E9646175AF}</ProjectGuid> <RootNamespace>char-server</RootNamespace> <Keyword>Win32Proj</Keyword> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -141,9 +140,9 @@ <ClInclude Include="..\3rdparty\libconfig\wincompat.h" /> <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" /> <ClInclude Include="..\src\common\cbasetypes.h" /> - <ClInclude Include="..\src\common\conf.h" /> + <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> @@ -175,7 +174,7 @@ <ClInclude Include="..\src\char\int_quest.h" /> <ClInclude Include="..\src\char\int_storage.h" /> <ClInclude Include="..\src\char\inter.h" /> - <ClInclude Include="..\src\char\pincode.h" /> + <ClInclude Include="..\src\char\pincode.h" /> <ClInclude Include="..\src\common\winapi.h" /> </ItemGroup> <ItemGroup> @@ -185,9 +184,9 @@ <ClCompile Include="..\3rdparty\libconfig\scanner.c" /> <ClCompile Include="..\3rdparty\libconfig\strbuf.c" /> <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> - <ClCompile Include="..\src\common\conf.c" /> + <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> @@ -217,7 +216,7 @@ <ClCompile Include="..\src\char\int_quest.c" /> <ClCompile Include="..\src\char\int_storage.c" /> <ClCompile Include="..\src\char\inter.c" /> - <ClCompile Include="..\src\char\pincode.c" /> + <ClCompile Include="..\src\char\pincode.c" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj index 48c79d285..473f03019 100644 --- a/vcproj-12/login-server.vcxproj +++ b/vcproj-12/login-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -154,7 +154,7 @@ <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\ers.h" /> <ClInclude Include="..\src\common\HPM.h" /> @@ -188,7 +188,7 @@ <ClCompile Include="..\src\login\loginlog_sql.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> <ClCompile Include="..\src\common\HPM.c" /> diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj index 5701cd4d0..d5d6c3156 100644 --- a/vcproj-12/map-server.vcxproj +++ b/vcproj-12/map-server.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -141,7 +141,7 @@ <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\conf.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\db.h" /> <ClInclude Include="..\src\common\des.h" /> <ClInclude Include="..\src\common\ers.h" /> @@ -220,7 +220,7 @@ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> <ClCompile Include="..\src\common\ers.c" /> @@ -295,4 +295,4 @@ <Copy SourceFiles="..\conf\import-tmpl\packet_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\packet_conf.txt')" /> <Copy SourceFiles="..\conf\import-tmpl\script_conf.txt" DestinationFolder="..\conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\import\script_conf.txt')" /> </Target> -</Project> +</Project>
\ No newline at end of file diff --git a/vcproj-12/mapcache.vcxproj b/vcproj-12/mapcache.vcxproj index 390e0cc65..44b063cba 100644 --- a/vcproj-12/mapcache.vcxproj +++ b/vcproj-12/mapcache.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -128,7 +128,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\src\common\core.c" /> - <ClCompile Include="..\src\common\console.c" /> + <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\des.c" /> <ClCompile Include="..\src\common\grfio.c" /> <ClCompile Include="..\src\common\malloc.c" /> @@ -140,7 +140,7 @@ <ItemGroup> <ClInclude Include="..\src\common\cbasetypes.h" /> <ClInclude Include="..\src\common\core.h" /> - <ClInclude Include="..\src\common\console.h" /> + <ClInclude Include="..\src\common\console.h" /> <ClInclude Include="..\src\common\des.h" /> <ClInclude Include="..\src\common\grfio.h" /> <ClInclude Include="..\src\common\malloc.h" /> diff --git a/vcproj-12/plugin-HPMHooking.vcxproj b/vcproj-12/plugin-HPMHooking.vcxproj index 95d2c8dea..1357697b8 100644 --- a/vcproj-12/plugin-HPMHooking.vcxproj +++ b/vcproj-12/plugin-HPMHooking.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -45,7 +45,7 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> diff --git a/vcproj-12/plugin-sample.vcxproj b/vcproj-12/plugin-sample.vcxproj index 639cc9a66..64f15725b 100644 --- a/vcproj-12/plugin-sample.vcxproj +++ b/vcproj-12/plugin-sample.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -20,12 +20,12 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -45,7 +45,7 @@ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\plugins\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)\$(Configuration)\</IntDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NativeRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> |