mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-12 21:47:00 -04:00
Fixed 'todo' in reader in ASCII build
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@503 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+1
-1
@@ -40,7 +40,7 @@
|
|||||||
Name="VCCustomBuildTool"/>
|
Name="VCCustomBuildTool"/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="rpcrt4.lib wsock32.lib comctl32.lib odbc32.lib odbccp32.lib wxbase26d.lib wxmsw26d_core.lib"
|
AdditionalDependencies="rpcrt4.lib wsock32.lib comctl32.lib wxbase26d.lib wxmsw26d_core.lib wxjpegd.lib wxpngd.lib wxtiffd.lib wxzlibd.lib wxregexd.lib wxbase26d_net.lib wxmsw26d_html.lib"
|
||||||
OutputFile="$(OutDir)/mse.exe"
|
OutputFile="$(OutDir)/mse.exe"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
|
IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ String read_utf8_line(wxInputStream& input, bool eat_bom, bool until_eof) {
|
|||||||
wxConvUTF8.MB2WC(result_buf, &buffer[0], size + 1);
|
wxConvUTF8.MB2WC(result_buf, &buffer[0], size + 1);
|
||||||
result.UngetWriteBuf(size);
|
result.UngetWriteBuf(size);
|
||||||
#else
|
#else
|
||||||
// TODO!
|
result = String(&buffer[0], *wxConvCurrent);
|
||||||
#endif
|
#endif
|
||||||
return eat_bom ? decodeUTF8BOM(result) : result;
|
return eat_bom ? decodeUTF8BOM(result) : result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user