Building now copies over all fnalibs to output directory

This commit is contained in:
Caleb Cornett 2018-10-09 10:45:50 -04:00
parent b3c254aba3
commit d7b64583ec
2 changed files with 18 additions and 17 deletions

View File

@ -4,10 +4,7 @@
{ {
"label": "Restore Project", "label": "Restore Project",
"type": "shell", "type": "shell",
"command": "msbuild", "command": "msbuild /t:restore",
"args": [
"/t:restore"
],
"group": "build", "group": "build",
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
@ -46,14 +43,10 @@
{ {
"label": "Build and Run (Debug)", "label": "Build and Run (Debug)",
"identifier": "Build and Run (Debug)",
"type": "shell", "type": "shell",
"group": "build", "group": "build",
"osx":{ "osx":{
"command": "mono", "command": "DYLD_LIBRARY_PATH=${workspaceFolder}/bin/Debug/osx/ mono ${workspaceFolder}/bin/Debug/project_name.exe"
"args": [
"${workspaceFolder}/bin/Debug/project_name.exe"
],
}, },
"windows":{ "windows":{
"command": "cmd", "command": "cmd",
@ -71,10 +64,7 @@
"type": "shell", "type": "shell",
"group": "build", "group": "build",
"osx":{ "osx":{
"command": "mono", "command": "DYLD_LIBRARY_PATH=${workspaceFolder}/bin/Release/osx/ mono ${workspaceFolder}/bin/Release/project_name.exe"
"args": [
"${workspaceFolder}/bin/Release/project_name.exe"
]
}, },
"windows":{ "windows":{
"command": "cmd", "command": "cmd",

View File

@ -20,17 +20,28 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<!-- Copy the correct fnalibs folder on Windows --> <!-- Copy fnalib directories to output -->
<!-- Modified from Andrew Russell's template (https://github.com/AndrewRussellNet/FNA-Template/blob/master/build/CopyFNALibs.targets) -->
<ItemGroup> <ItemGroup>
<Content Include="..\fnalibs\x86\**\*.*" Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' != 'x64'"> <Content Include="..\fnalibs\x86\**\*.*">
<Link>x86\%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>x86\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\fnalibs\x64\**\*.*" Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' != 'x86'"> <Content Include="..\fnalibs\x64\**\*.*">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link> <Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="..\fnalibs\osx\**\*.*">
<Link>osx\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\fnalibs\lib\**\*.*">
<Link>lib\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\fnalibs\lib64\**\*.*">
<Link>lib64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
</Project> </Project>