diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/txt-converter/Makefile.in | 2 | ||||
| -rw-r--r-- | vcproj-10/txt-converter-login.vcxproj | 2 | ||||
| -rw-r--r-- | vcproj-8/txt-converter-login.vcproj | 8 | ||||
| -rw-r--r-- | vcproj-9/txt-converter-login.vcproj | 8 |
5 files changed, 21 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5eba6da1a..1aac02062 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/12/07 + * Fixed txt-converter-login was no longer compilable with supplied project/make files, due to missing reference to function exists in utils.c (bugreport:4626, since r14528). [Ai4rei] * Applied svn:eol-style to VS2010 project files (follow up to r14562). [Ai4rei] * Reverted r14563, due to multiple issues which render the source malfunctioning or uncompilable. To be redone later (bugreport:4627). [Ai4rei] * Removed unnecessary reference operator from scanf calls passing character strings as arguments in adduser tool. [Paradox924X] diff --git a/src/txt-converter/Makefile.in b/src/txt-converter/Makefile.in index 089d9d276..50e89e34e 100644 --- a/src/txt-converter/Makefile.in +++ b/src/txt-converter/Makefile.in @@ -10,6 +10,7 @@ LOGIN_CONVERTER_OBJ = \ ../common/obj_all/showmsg.o \ ../common/obj_all/strlib.o \ ../common/obj_all/timer.o \ + ../common/obj_all/utils.o \ ../common/obj_sql/sql.o LOGIN_CONVERTER_H = \ ../login/account.h \ @@ -23,6 +24,7 @@ LOGIN_CONVERTER_H = \ ../common/showmsg.h \ ../common/strlib.h \ ../common/timer.h \ + ../common/utils.h \ ../common/sql.h CHAR_CONVERTER_OBJ = \ diff --git a/vcproj-10/txt-converter-login.vcxproj b/vcproj-10/txt-converter-login.vcxproj index 4bd41e16e..842388705 100644 --- a/vcproj-10/txt-converter-login.vcxproj +++ b/vcproj-10/txt-converter-login.vcxproj @@ -135,6 +135,7 @@ <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="..\src\login\account_sql.c" /> <ClCompile Include="..\src\login\account_txt.c" /> <ClCompile Include="..\src\txt-converter\login-converter.c" /> @@ -149,6 +150,7 @@ <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="..\src\login\account.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj index fcdafc35c..4e43fd147 100644 --- a/vcproj-8/txt-converter-login.vcproj +++ b/vcproj-8/txt-converter-login.vcproj @@ -270,6 +270,14 @@ RelativePath="..\src\common\timer.h" > </File> + <File + RelativePath="..\src\common\utils.c" + > + </File> + <File + RelativePath="..\src\common\utils.h" + > + </File> </Filter> <File RelativePath="..\src\login\account.h" diff --git a/vcproj-9/txt-converter-login.vcproj b/vcproj-9/txt-converter-login.vcproj index 39e69e1a3..7d7cbad97 100644 --- a/vcproj-9/txt-converter-login.vcproj +++ b/vcproj-9/txt-converter-login.vcproj @@ -275,6 +275,14 @@ RelativePath="..\src\common\timer.h" > </File> + <File + RelativePath="..\src\common\utils.c" + > + </File> + <File + RelativePath="..\src\common\utils.h" + > + </File> </Filter> <File RelativePath="..\src\login\account.h" |