From 4d81f68ece4dee6282024fe7189d8402a05428db Mon Sep 17 00:00:00 2001 From: amber Date: Wed, 30 Mar 2005 22:14:36 +0000 Subject: eAthena VC7 solution and support added for native builds [MouseJstr] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1347 54d463be-8e91-2dee-dedb-b68131a5f0ec --- vcproj/char-server_txt.vcproj | 179 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 vcproj/char-server_txt.vcproj (limited to 'vcproj/char-server_txt.vcproj') diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj new file mode 100644 index 000000000..809c06124 --- /dev/null +++ b/vcproj/char-server_txt.vcproj @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 382ce9ad80de448431c1490185f02b123e1cd08f Mon Sep 17 00:00:00 2001 From: amber Date: Thu, 31 Mar 2005 00:33:12 +0000 Subject: added sql projects for eAthena git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1349 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-SVN.txt | 3 +- eAthena.sln | 24 +++ vcproj/char-server_sql.vcproj | 179 +++++++++++++++++++ vcproj/char-server_txt.vcproj | 2 +- vcproj/login-server_sql.vcproj | 167 ++++++++++++++++++ vcproj/map-server_sql.vcproj | 377 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 750 insertions(+), 2 deletions(-) create mode 100644 vcproj/char-server_sql.vcproj create mode 100644 vcproj/login-server_sql.vcproj create mode 100644 vcproj/map-server_sql.vcproj (limited to 'vcproj/char-server_txt.vcproj') diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index d4ebdfe8b..cda6a2b7c 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -2,11 +2,12 @@ Date Added 03/30 + * Began sql projects for VC7 [1349: MouseJstr] * text char-server and login-server now build using VC7. You can use the eAthena.sln solution to build all three. These are currently just the text versions of the servers. I have not added projects yet to build the sql versions. - [SVN: 1357 MouseJstr] + [SVN: 1347 MouseJstr] * Made the map-server build cleanly using Microsoft Visual Studio.. entirely native code without any cygwin dependency [SVN: 1345 MouseJstr] diff --git a/eAthena.sln b/eAthena.sln index 830da50d5..b8444b1bb 100644 --- a/eAthena.sln +++ b/eAthena.sln @@ -11,6 +11,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\c ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_sql", "vcproj\char-server_sql.vcproj", "{D356871D-58E1-450B-967A-E4E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj\login-server_sql.vcproj", "{D356871D-58E1-450B-967A-E5E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -29,6 +41,18 @@ Global {D356871D-58E1-450B-967A-E3E9646175AF}.Debug.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E3E9646175AF}.Release.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E3E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E4E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E5E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj new file mode 100644 index 000000000..fb8b90f8b --- /dev/null +++ b/vcproj/char-server_sql.vcproj @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj index 809c06124..8ccd9a5ed 100644 --- a/vcproj/char-server_txt.vcproj +++ b/vcproj/char-server_txt.vcproj @@ -78,7 +78,7 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj new file mode 100644 index 000000000..017ab2fcb --- /dev/null +++ b/vcproj/map-server_sql.vcproj @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 5d58b51f5c8332f20d152ee1364f10d190506683 Mon Sep 17 00:00:00 2001 From: amber Date: Thu, 31 Mar 2005 21:03:22 +0000 Subject: fixed memory corruption in mapif_guild_info:int_guild.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1367 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-SVN.txt | 2 ++ src/char/int_guild.c | 2 +- vcproj/char-server_sql.vcproj | 9 ++++++--- vcproj/char-server_txt.vcproj | 9 ++++++--- vcproj/login-server_sql.vcproj | 10 ++++++---- vcproj/login-server_txt.vcproj | 10 ++++++---- vcproj/map-server_sql.vcproj | 9 ++++++--- vcproj/map-server_txt.vcproj | 6 ++++-- 8 files changed, 37 insertions(+), 20 deletions(-) (limited to 'vcproj/char-server_txt.vcproj') diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 4c1330d07..0a952fafb 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -2,6 +2,8 @@ Date Added 03/31 + * fixed memory corruption in mapif_guild_info:int_guild.c + [SVN 1367: MouseJstr] * Fixed common/lock.c (problem with unistd.h include) [Codemaster] * Added father/mother/child fields to mmo_char_tostr() and mmo_char_fromstr() [veider] diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 95f0cf099..9268d9339 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -731,7 +731,7 @@ int mapif_guild_noinfo(int fd, int guild_id) { // ギルド情報まとめ送り int mapif_guild_info(int fd, struct guild *g) { - unsigned char buf[2048]; + unsigned char buf[16384]; WBUFW(buf,0) = 0x3831; memcpy(buf + 4, g, sizeof(struct guild)); diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj index 3a0d6e600..f2ba8781d 100644 --- a/vcproj/char-server_sql.vcproj +++ b/vcproj/char-server_sql.vcproj @@ -69,9 +69,10 @@ CharacterSet="2"> @@ -79,6 +80,8 @@ Name="VCCustomBuildTool"/> @@ -78,6 +80,7 @@ Name="VCCustomBuildTool"/> @@ -79,7 +80,8 @@ Name="VCCustomBuildTool"/> @@ -78,7 +79,8 @@ Name="VCCustomBuildTool"/> @@ -80,6 +81,8 @@ Name="VCCustomBuildTool"/>