From d7b64583ecab690cc56ff894ef91bebbfdfcafc0 Mon Sep 17 00:00:00 2001
From: Caleb Cornett <caleb.cornett@outlook.com>
Date: Tue, 9 Oct 2018 10:45:50 -0400
Subject: [PATCH] Building now copies over all fnalibs to output directory

---
 project_name/.vscode/tasks.json  | 16 +++-------------
 project_name/project_name.csproj | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/project_name/.vscode/tasks.json b/project_name/.vscode/tasks.json
index 97dd008..f63488d 100644
--- a/project_name/.vscode/tasks.json
+++ b/project_name/.vscode/tasks.json
@@ -4,10 +4,7 @@
         {
             "label": "Restore Project",
             "type": "shell",
-            "command": "msbuild",
-            "args": [
-                "/t:restore"
-            ],
+            "command": "msbuild /t:restore",
             "group": "build",
             "problemMatcher": "$msCompile"
         },
@@ -46,14 +43,10 @@
 
         {
             "label": "Build and Run (Debug)",
-            "identifier": "Build and Run (Debug)",
             "type": "shell",
             "group": "build",
             "osx":{
-                "command": "mono",
-                "args": [
-                    "${workspaceFolder}/bin/Debug/project_name.exe"
-                ],
+                "command": "DYLD_LIBRARY_PATH=${workspaceFolder}/bin/Debug/osx/ mono ${workspaceFolder}/bin/Debug/project_name.exe"
             },
             "windows":{
                 "command": "cmd",
@@ -71,10 +64,7 @@
             "type": "shell",
             "group": "build",
             "osx":{
-                "command": "mono",
-                "args": [
-                    "${workspaceFolder}/bin/Release/project_name.exe"
-                ]
+                "command": "DYLD_LIBRARY_PATH=${workspaceFolder}/bin/Release/osx/ mono ${workspaceFolder}/bin/Release/project_name.exe"
             },
             "windows":{
                 "command": "cmd",
diff --git a/project_name/project_name.csproj b/project_name/project_name.csproj
index 72c3db2..35d2a4c 100644
--- a/project_name/project_name.csproj
+++ b/project_name/project_name.csproj
@@ -20,17 +20,28 @@
     </Content>
   </ItemGroup>
 
-  <!-- Copy the correct fnalibs folder on Windows -->
-	<!-- Modified from Andrew Russell's template (https://github.com/AndrewRussellNet/FNA-Template/blob/master/build/CopyFNALibs.targets) -->
+  <!-- Copy fnalib directories to output -->
   <ItemGroup>
-		<Content Include="..\fnalibs\x86\**\*.*" Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' != 'x64'">
+		<Content Include="..\fnalibs\x86\**\*.*">
 			<Link>x86\%(RecursiveDir)%(Filename)%(Extension)</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="..\fnalibs\x64\**\*.*" Condition="'$(OS)' == 'Windows_NT' AND '$(Platform)' != 'x86'">
+		<Content Include="..\fnalibs\x64\**\*.*">
 			<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</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>
 
 </Project>
\ No newline at end of file