gered/BWMirror-Generator
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 3 Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bwapi_bridge/bwapi_bridge.vcxproj
View file

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

4
bwapi_bridge/bwapi_bridge.vcxproj.filters
View file

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

4
generator/src/main/java/bwmirror/generator/CJavaPipeline.java
View file

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

2
generator/src/main/java/bwmirror/generator/ccalls/CallImplementer.java
View file

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