zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update sw build. Update emitter addition.

Browse source
This commit is contained in:
lzwdgc 2019-10-29 02:46:49 +03:00
parent 1c146ad9e3
commit d9b49e957d
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/script2txt/script2txt.yy
View file

@ -107,7 +107,7 @@ global_statements: global_statement
{ {
auto &ctx = $1; auto &ctx = $1;
ctx.addLine(); ctx.addLine();
ctx.addWithRelativeIndent($2); ctx.addEmitter($2);
$$ = std::move(ctx); $$ = std::move(ctx);
} }
; ;
@ -140,7 +140,7 @@ procedure: procedure_begin proc_statements END
{ {
Emitter ctx; Emitter ctx;
ctx.beginBlock($1); ctx.beginBlock($1);
ctx.addWithRelativeIndent($2); ctx.addEmitter($2);
ctx.endBlock(); ctx.endBlock();
$$ = std::move(ctx); $$ = std::move(ctx);
} }
@ -155,7 +155,7 @@ procedure: procedure_begin proc_statements END
{ {
Emitter ctx; Emitter ctx;
ctx.beginBlock($1); ctx.beginBlock($1);
ctx.addWithRelativeIndent($3); ctx.addEmitter($3);
ctx.endBlock(); ctx.endBlock();
$$ = std::move(ctx); $$ = std::move(ctx);
} }
@ -171,7 +171,7 @@ proc_statements: proc_statement
| proc_statements proc_statement | proc_statements proc_statement
{ {
auto &ctx = $1; auto &ctx = $1;
ctx.addWithRelativeIndent($2); ctx.addEmitter($2);
$$ = std::move(ctx); $$ = std::move(ctx);
} }
; ;
@ -202,7 +202,7 @@ statements: statement
| statements statement | statements statement
{ {
auto &ctx = $1; auto &ctx = $1;
ctx.addWithRelativeIndent($2); ctx.addEmitter($2);
$$ = std::move(ctx); $$ = std::move(ctx);
} }
; ;
@ -244,7 +244,7 @@ condition: condition_begin
{ {
auto &ctx = $1; auto &ctx = $1;
ctx.beginBlock("else"); ctx.beginBlock("else");
ctx.addWithRelativeIndent($4); ctx.addEmitter($4);
ctx.endBlock(); ctx.endBlock();
$$ = std::move(ctx); $$ = std::move(ctx);
} }
@ -253,7 +253,7 @@ condition_begin: IF L_BRACKET condition_body R_BRACKET L_CURLY_BRACKET statement
{ {
Emitter ctx; Emitter ctx;
ctx.beginBlock("if (" + $3 + ")"); ctx.beginBlock("if (" + $3 + ")");
ctx.addWithRelativeIndent($6); ctx.addEmitter($6);
ctx.endBlock(); ctx.endBlock();
$$ = std::move(ctx); $$ = std::move(ctx);
} }
@ -261,7 +261,7 @@ condition_begin: IF L_BRACKET condition_body R_BRACKET L_CURLY_BRACKET statement
{ {
Emitter ctx; Emitter ctx;
ctx.beginBlock("if (" + $3 + ")"); ctx.beginBlock("if (" + $3 + ")");
ctx.addWithRelativeIndent($5); ctx.addEmitter($5);
ctx.endBlock(); ctx.endBlock();
$$ = std::move(ctx); $$ = std::move(ctx);
} }

13
sw.cpp
View file

@ -42,7 +42,7 @@ void build(Solution &s)
add_exe_with_common("tm_converter"); add_exe_with_common("tm_converter");
add_exe("name_generator"); add_exe("name_generator");
add_exe_with_common("save_loader"); add_exe_with_common("save_loader");
if (common.getSettings().TargetOS.Arch == ArchType::x86) if (common.getBuildSettings().TargetOS.Arch == ArchType::x86)
add_exe("unpaker"); // 32-bit only add_exe("unpaker"); // 32-bit only
// not so simple targets // not so simple targets
@ -67,10 +67,13 @@ void build(Solution &s)
path sdk = "d:/arh/apps/Autodesk/FBX/FBX SDK/2019.0"; path sdk = "d:/arh/apps/Autodesk/FBX/FBX SDK/2019.0";
mod_converter += IncludeDirectory(sdk / "include"); mod_converter += IncludeDirectory(sdk / "include");
String cfg = "release"; String cfg = "release";
if (mod_converter.getSettings().Native.ConfigurationType == ConfigurationType::Debug) if (mod_converter.getBuildSettings().Native.ConfigurationType == ConfigurationType::Debug)
cfg = "debug"; cfg = "debug";
String arch = "x64"; String arch = "x64";
if (mod_converter.getSettings().TargetOS.Arch == ArchType::x86) if (mod_converter.getBuildSettings().TargetOS.Arch == ArchType::x86)
arch = "x86"; arch = "x86";
mod_converter += LinkLibrary(sdk / ("lib/vs2015/" + arch + "/" + cfg + "/libfbxsdk-md.lib")); String md = "md";
if (mod_converter.getBuildSettings().Native.MT)
md = "mt";
mod_converter += LinkLibrary(sdk / ("lib/vs2015/" + arch + "/" + cfg + "/libfbxsdk-" + md + ".lib"));
} }