Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the txt-char converter compilation (bugreport:2171).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13245 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-09-28 15:02:55 +00:00
parent dc8edb6416
commit de25376177
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/char_sql/int_mercenary.c
View File

@ -136,6 +136,8 @@ bool mapif_mercenary_delete(int merc_id)
return true; return true;
} }
#ifndef TXT_SQL_CONVERT
static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag) static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
{ {
int size = sizeof(struct s_mercenary) + 5; int size = sizeof(struct s_mercenary) + 5;
@ -216,3 +218,4 @@ int inter_mercenary_parse_frommap(int fd)
} }
return 1; return 1;
} }
#endif //TXT_SQL_CONVERT

24
vcproj-8/txt-converter-char.vcproj
View File

@ -374,6 +374,30 @@
RelativePath="..\src\char_sql\int_guild.h" RelativePath="..\src\char_sql\int_guild.h"
> >
</File> </File>
<File
RelativePath="..\src\char_sql\int_mercenary.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)_sql.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)_sql.obj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\char_sql\int_mercenary.h"
>
</File>
<File <File
RelativePath="..\src\char_sql\int_party.c" RelativePath="..\src\char_sql\int_party.c"
> >

24
vcproj-9/txt-converter-char.vcproj
View File

@ -379,6 +379,30 @@
RelativePath="..\src\char_sql\int_guild.h" RelativePath="..\src\char_sql\int_guild.h"
> >
</File> </File>
<File
RelativePath="..\src\char_sql\int_mercenary.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)_sql.obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)_sql.obj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\char_sql\int_mercenary.h"
>
</File>
<File <File
RelativePath="..\src\char_sql\int_party.c" RelativePath="..\src\char_sql\int_party.c"
> >