From 90fd7a2c221c9e13a43d2c01e3af53c04e393945 Mon Sep 17 00:00:00 2001 From: amber Date: Thu, 7 Apr 2005 18:42:53 +0000 Subject: G++ is now the default on trunk [MouseJstr] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1443 54d463be-8e91-2dee-dedb-b68131a5f0ec --- .svnignore | 20 ++ Changelog-Trunk.txt | 7 + Makefile | 13 +- README.win32 | 64 ++-- db/item_findingore.txt | 46 +-- eAthena.sln | 116 +++---- src/common/.svnignore | 2 + src/common/dll.h | 50 +-- src/map/.svnignore | 3 + src/map/clif.c | 2 +- src/map/npc_chat.c | 2 +- vcproj/char-server_sql.vcproj | 366 ++++++++++---------- vcproj/char-server_txt.vcproj | 364 ++++++++++---------- vcproj/login-server_sql.vcproj | 340 +++++++++--------- vcproj/login-server_txt.vcproj | 338 +++++++++--------- vcproj/map-server_sql.vcproj | 764 ++++++++++++++++++++--------------------- vcproj/map-server_txt.vcproj | 762 ++++++++++++++++++++-------------------- 17 files changed, 1644 insertions(+), 1615 deletions(-) create mode 100644 .svnignore create mode 100644 Changelog-Trunk.txt create mode 100644 src/common/.svnignore create mode 100644 src/map/.svnignore diff --git a/.svnignore b/.svnignore new file mode 100644 index 000000000..9274a23f2 --- /dev/null +++ b/.svnignore @@ -0,0 +1,20 @@ +char-converter +conf +save +char-server_sql +map-server_sql +ladmin +char-server +map-server +login-server_sql +login-server +login-converter +char-converter.exe +char-server_sql.exe +map-server_sql.exe +ladmin.exe +char-server.exe +map-server.exe +login-server_sql.exe +login-server.exe +login-converter.exe diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt new file mode 100644 index 000000000..5e4c3d454 --- /dev/null +++ b/Changelog-Trunk.txt @@ -0,0 +1,7 @@ +Date Added + +04/07 + * Switched to G++ as the default [MouseJstr] + * Enabled PCRE on by default [MouseJstr] + * cleaned up svn:ignore properties [MouseJstr] + * cleaned up svn:eol-style properties [MouseJstr] diff --git a/Makefile b/Makefile index 86ccb0189..b6baa4bc3 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,11 @@ -CC = gcc -pipe -# CC = gcc -pipe -DPCRE_SUPPORT -# CC = g++ --pipe -# CC = gcc -pipe -DGCOLLECT -# CC = gcc -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK -# CC = /usr/local/bin/gcc -fbounds-checking -pipe -DBCHECK +CC = g++ -pipe -DPCRE_SUPPORT +# CC = g++ -pipe -DGCOLLECT +# CC = g++ -pipe -DDMALLOC -DDMALLOC_FUNC_CHECK # GCLIB = -lgc -# GCLIB = -L/usr/local/lib -lpcre -GCLIB = +GCLIB = -L/usr/local/lib -lpcre +# GCLIB = # GCLIB = -ldmalloc PACKETDEF = -DPACKETVER=6 -DNEW_006b -DSO_REUSEPORT diff --git a/README.win32 b/README.win32 index 16a8c9524..22f3bac3a 100644 --- a/README.win32 +++ b/README.win32 @@ -1,32 +1,32 @@ - Building eAthena under win32 - -There are currently two ways to build eAthena. The first and oldest way is by using cygwin (www.cygwin.org). This was the only way until the svn 1370 timeframe. The second way is by using Visual Studio .NET 2003. - -Building using cygwin: - - 1) delete every copy of cygwin1.dll on your system - 2) Go to www.cygwin.com and run the setup.exe. - 3) install gcc, make, bash, g++, and gdb. Basically install - all developer tools if possible. If later you find you are - missing something, re-run the setup and install that - 4) make sure the ../bin of wherever you installed cygwin to is in your - path. ie, if you put cygwin in C:/cygwin then add c:/cygwin/bin - to your path - 5) return to this directory and type "make txt" - -Building using Visual Studio .NET 2003 - - 1) Make sure you have the platform SDK installed when you install - this. If you don't have it, you can go to microsoft and download a - copy. - 2) open the eAthena.sln file - 3) Build the components you wish.. - - if you wish mysql support (http://dev.mysql.com/), grab a windows - install of mysql - - http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-4.1.10a-win32.zip/from/pick#mirrors - - and install it into the default location on the C drive. This will - best match how I set up the solutions/project files - + Building eAthena under win32 + +There are currently two ways to build eAthena. The first and oldest way is by using cygwin (www.cygwin.org). This was the only way until the svn 1370 timeframe. The second way is by using Visual Studio .NET 2003. + +Building using cygwin: + + 1) delete every copy of cygwin1.dll on your system + 2) Go to www.cygwin.com and run the setup.exe. + 3) install gcc, make, bash, g++, and gdb. Basically install + all developer tools if possible. If later you find you are + missing something, re-run the setup and install that + 4) make sure the ../bin of wherever you installed cygwin to is in your + path. ie, if you put cygwin in C:/cygwin then add c:/cygwin/bin + to your path + 5) return to this directory and type "make txt" + +Building using Visual Studio .NET 2003 + + 1) Make sure you have the platform SDK installed when you install + this. If you don't have it, you can go to microsoft and download a + copy. + 2) open the eAthena.sln file + 3) Build the components you wish.. + + if you wish mysql support (http://dev.mysql.com/), grab a windows + install of mysql + + http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-4.1.10a-win32.zip/from/pick#mirrors + + and install it into the default location on the C drive. This will + best match how I set up the solutions/project files + diff --git a/db/item_findingore.txt b/db/item_findingore.txt index d14d14f29..5285aab56 100644 --- a/db/item_findingore.txt +++ b/db/item_findingore.txt @@ -1,24 +1,24 @@ -// 鉱石発見スキルでドロップされる鉱石 -// item ID, Jname (dummy), 確率を 1 万倍 (100% なら 1000000) -// 0 はデフォルト項目 -0,Iron Ore,1002 -714,Emperium,30000 -756,Rough Oridecon,200000 -757,Rough Elunium,200000 -969,Gold,20000 -984,Oridecon,100000 -985,Elunium,100000 -990,Red Blood,300000 -991,Crystal Blue,300000 -992,Wind of Verdure,300000 -993,Green Live,300000 -994,Flame Heart,150000 -995,Mystic Frozen,150000 -996,Rough Wind,150000 -997,Great Nature,150000 -998,Iron,800000 -999,Steel,500000 -1002,Iron Ore,1000000 -1003,Coal,600000 -1010,Phracon,950000 +// 鉱石発見スキルでドロップされる鉱石 +// item ID, Jname (dummy), 確率を 1 万倍 (100% なら 1000000) +// 0 はデフォルト項目 +0,Iron Ore,1002 +714,Emperium,30000 +756,Rough Oridecon,200000 +757,Rough Elunium,200000 +969,Gold,20000 +984,Oridecon,100000 +985,Elunium,100000 +990,Red Blood,300000 +991,Crystal Blue,300000 +992,Wind of Verdure,300000 +993,Green Live,300000 +994,Flame Heart,150000 +995,Mystic Frozen,150000 +996,Rough Wind,150000 +997,Great Nature,150000 +998,Iron,800000 +999,Steel,500000 +1002,Iron Ore,1000000 +1003,Coal,600000 +1010,Phracon,950000 1011,Emveretarcon,550000 \ No newline at end of file diff --git a/eAthena.sln b/eAthena.sln index 66b082b91..6881a4b01 100644 --- a/eAthena.sln +++ b/eAthena.sln @@ -1,58 +1,58 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}" - 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 - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E1E9646175AF}.Release.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E1E9646175AF}.Release.Build.0 = Release|Win32 - {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E2E9646175AF}.Release.ActiveCfg = Release|Win32 - {D356871D-58E1-450B-967A-E2E9646175AF}.Release.Build.0 = Release|Win32 - {D356871D-58E1-450B-967A-E3E9646175AF}.Debug.ActiveCfg = Debug|Win32 - {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-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-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32 - {D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_txt", "vcproj\map-server_txt.vcproj", "{D356871D-58E1-450B-967A-E1E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_txt", "vcproj\login-server_txt.vcproj", "{D356871D-58E1-450B-967A-E2E9646175AF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "char-server_txt", "vcproj\char-server_txt.vcproj", "{D356871D-58E1-450B-967A-E3E9646175AF}" + 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 + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E1E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E1E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E1E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E2E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E2E9646175AF}.Release.ActiveCfg = Release|Win32 + {D356871D-58E1-450B-967A-E2E9646175AF}.Release.Build.0 = Release|Win32 + {D356871D-58E1-450B-967A-E3E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {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-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-E6E9646175AF}.Debug.ActiveCfg = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Debug.Build.0 = Debug|Win32 + {D356871D-58E1-450B-967A-E6E9646175AF}.Release.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/src/common/.svnignore b/src/common/.svnignore new file mode 100644 index 000000000..fbbf39b06 --- /dev/null +++ b/src/common/.svnignore @@ -0,0 +1,2 @@ +GNUmakefile +obj diff --git a/src/common/dll.h b/src/common/dll.h index 50854da4d..1ad49143c 100644 --- a/src/common/dll.h +++ b/src/common/dll.h @@ -1,25 +1,25 @@ - -#ifndef _DLL_H_ -#define _DLL_H_ - -#ifdef _WIN32 - - #include - #define DLL_OPEN(x) LoadLibrary(x) - #define DLL_SYM(x,y,z) (FARPROC)(x) = GetProcAddress(y,z) - #define DLL_CLOSE(x) FreeLibrary(x) - #define DLL HINSTANCE - -#else - - #include - #define DLL_OPEN(x) dlopen(x,RTLD_NOW) - #define DLL_SYM(x,y,z) (x) = (void *)dlsym(y,z) - #define DLL_CLOSE(x) dlclose(x) - #define DLL void * - -#endif - -#endif // _DLL_H_ - - + +#ifndef _DLL_H_ +#define _DLL_H_ + +#ifdef _WIN32 + + #include + #define DLL_OPEN(x) LoadLibrary(x) + #define DLL_SYM(x,y,z) (FARPROC)(x) = GetProcAddress(y,z) + #define DLL_CLOSE(x) FreeLibrary(x) + #define DLL HINSTANCE + +#else + + #include + #define DLL_OPEN(x) dlopen(x,RTLD_NOW) + #define DLL_SYM(x,y,z) (x) = (void *)dlsym(y,z) + #define DLL_CLOSE(x) dlclose(x) + #define DLL void * + +#endif + +#endif // _DLL_H_ + + diff --git a/src/map/.svnignore b/src/map/.svnignore new file mode 100644 index 000000000..d2a881f54 --- /dev/null +++ b/src/map/.svnignore @@ -0,0 +1,3 @@ +txtobj +GNUmakefile +sqlobj diff --git a/src/map/clif.c b/src/map/clif.c index c8f190c5a..70d7cdaa9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8007,7 +8007,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < WFIFOSET(fd, WFIFOW(fd,2)); #ifdef PCRE_SUPPORT - map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen(RFIFOP(fd,4)), &sd->bl); + map_foreachinarea(npc_chat_sub, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_NPC, RFIFOP(fd,4), strlen((char *) RFIFOP(fd,4)), &sd->bl); #endif // Celest diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c index 5ec8540ae..c15a26bf0 100644 --- a/src/map/npc_chat.c +++ b/src/map/npc_chat.c @@ -387,7 +387,7 @@ int npc_chat_sub(struct block_list *bl, va_list ap) int offsets[20]; char buf[255]; // perform pattern match - int r = pcre_exec(e->pcre_, e->pcre_extra_, msg, len, 0, + int r = pcre_exec(e->pcre_, e->pcre_extra_, (char *) msg, len, 0, 0, offsets, sizeof(offsets) / sizeof(offsets[0])); if (r >= 0) { // save out the matched strings diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj index f2ba8781d..302f28087 100644 --- a/vcproj/char-server_sql.vcproj +++ b/vcproj/char-server_sql.vcproj @@ -1,183 +1,183 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj index 26319cd9e..ddc75a06f 100644 --- a/vcproj/char-server_txt.vcproj +++ b/vcproj/char-server_txt.vcproj @@ -1,182 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/login-server_sql.vcproj b/vcproj/login-server_sql.vcproj index dcf4fc108..12596137e 100644 --- a/vcproj/login-server_sql.vcproj +++ b/vcproj/login-server_sql.vcproj @@ -1,170 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/login-server_txt.vcproj b/vcproj/login-server_txt.vcproj index 84766b3af..0e6f16b30 100644 --- a/vcproj/login-server_txt.vcproj +++ b/vcproj/login-server_txt.vcproj @@ -1,169 +1,169 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj index f1dc809ce..e7d33f33e 100644 --- a/vcproj/map-server_sql.vcproj +++ b/vcproj/map-server_sql.vcproj @@ -1,382 +1,382 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj index aa8a75578..d00cb23c6 100644 --- a/vcproj/map-server_txt.vcproj +++ b/vcproj/map-server_txt.vcproj @@ -1,381 +1,381 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2