diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-09-28 15:02:55 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-09-28 15:02:55 +0000 |
| commit | 3c48bb1a20a207eb04edfe366892d001bffe7e16 (patch) | |
| tree | ebdc34db1ddd44aa79ccc56c0ef627a5002ca885 | |
| parent | 8014d6b251dfadbcadb8154297f7076efd2029cd (diff) | |
| download | hercules-3c48bb1a20a207eb04edfe366892d001bffe7e16.tar.gz hercules-3c48bb1a20a207eb04edfe366892d001bffe7e16.tar.bz2 hercules-3c48bb1a20a207eb04edfe366892d001bffe7e16.tar.xz hercules-3c48bb1a20a207eb04edfe366892d001bffe7e16.zip | |
Fixing the txt-char converter compilation (bugreport:2171).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13245 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/char_sql/int_mercenary.c | 3 | ||||
| -rw-r--r-- | vcproj-8/txt-converter-char.vcproj | 24 | ||||
| -rw-r--r-- | vcproj-9/txt-converter-char.vcproj | 24 |
3 files changed, 51 insertions, 0 deletions
diff --git a/src/char_sql/int_mercenary.c b/src/char_sql/int_mercenary.c index b6c4d6313..dfb6dd880 100644 --- a/src/char_sql/int_mercenary.c +++ b/src/char_sql/int_mercenary.c @@ -136,6 +136,8 @@ bool mapif_mercenary_delete(int merc_id) return true;
}
+#ifndef TXT_SQL_CONVERT
+
static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
{
int size = sizeof(struct s_mercenary) + 5;
@@ -216,3 +218,4 @@ int inter_mercenary_parse_frommap(int fd) }
return 1;
}
+#endif //TXT_SQL_CONVERT
diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj index a30463c22..91dfa8f03 100644 --- a/vcproj-8/txt-converter-char.vcproj +++ b/vcproj-8/txt-converter-char.vcproj @@ -375,6 +375,30 @@ > </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 RelativePath="..\src\char_sql\int_party.c" > <FileConfiguration diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj index 31a48cc8b..329cd2f8d 100644 --- a/vcproj-9/txt-converter-char.vcproj +++ b/vcproj-9/txt-converter-char.vcproj @@ -380,6 +380,30 @@ > </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 RelativePath="..\src\char_sql\int_party.c" > <FileConfiguration |