keep generated bwapi_bridge c++ sources in the same output directory

This commit is contained in:
Gered 2017-04-11 11:05:53 -04:00
parent e05570f6f9
commit bd362f3a5f
4 changed files with 7 additions and 7 deletions

View file

@ -82,10 +82,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\output\concat_header.h" />
<ClInclude Include="..\output\bwapi_bridge_src\concat_header.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\output\c\impl.cpp" />
<ClCompile Include="..\output\bwapi_bridge_src\impl.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View file

@ -15,12 +15,12 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\output\concat_header.h">
<ClInclude Include="..\output\bwapi_bridge_src\concat_header.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\output\c\impl.cpp">
<ClCompile Include="..\output\bwapi_bridge_src\impl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>

View file

@ -328,8 +328,8 @@ public class CJavaPipeline {
Properties props = new Properties();
props.put(COMPILE_DIR_PROPERTY, basePath.getPath() + "/output/compiled");
props.put(HEADERS_DIR_PROPERTY, basePath.getPath() + "/output/headers");
props.put(HEADER_FILE_PROPERTY, basePath.getPath() + "/output/concat_header.h");
props.put(C_IMPLEMENTATION_FILE_PROPERTY, basePath.getPath() + "/output/c/impl.cpp");
props.put(HEADER_FILE_PROPERTY, basePath.getPath() + "/output/bwapi_bridge_src/concat_header.h");
props.put(C_IMPLEMENTATION_FILE_PROPERTY, basePath.getPath() + "/output/bwapi_bridge_src/impl.cpp");
props.put(GENERATE_TO_DIR, basePath.getPath() + "/output/generated");
new CJavaPipeline().run(new PackageProcessOptions[]{bwapiOptions, bwtaOptions}, props);

View file

@ -51,7 +51,7 @@ public class CallImplementer {
public void setOut(PrintStream out) {
this.out = out;
out.print("#include \"../concat_header.h\"\n" +
out.print("#include \"concat_header.h\"\n" +
"#include <BWAPI.h>\n" +
"#include <BWAPI/Client.h>\n" +
"#include <BWTA.h>\n" +