Description:
Fix for linux (fingers crossed).
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -43,7 +43,7 | |||
|
43 | 43 | ], |
|
44 | 44 | "options": { |
|
45 | 45 | "env": { |
|
46 | "LD_LIBRARY_PATH": "./lib64", | |
|
46 | "LD_LIBRARY_PATH": "../../../fnalibs/lib64", | |
|
47 | 47 | "DYLD_LIBRARY_PATH": "/Users/alys/repos/isometric-park-fna/fnalibs/osx:/Users/alys/repos/isometric-park-fna/cimgui/osx-x64s" |
|
48 | 48 | }, |
|
49 | 49 | "cwd": "${workspaceFolder}/isometric-park-fna/bin/Release/" |
@@ -92,7 +92,7 | |||
|
92 | 92 | ], |
|
93 | 93 | "options": { |
|
94 | 94 | "env": { |
|
95 | "LD_LIBRARY_PATH": "./lib64", | |
|
95 | "LD_LIBRARY_PATH": "../../../fnalibs/lib64", | |
|
96 | 96 | "DYLD_LIBRARY_PATH": "/Users/alys/repos/isometric-park-fna/fnalibs/osx:/Users/alys/repos/isometric-park-fna/cimgui/osx-x64" |
|
97 | 97 | }, |
|
98 | 98 | "cwd": "${workspaceFolder}/isometric-park-fna/bin/Debug" |
@@ -119,7 +119,7 | |||
|
119 | 119 | "problemMatcher": [] |
|
120 | 120 | }, |
|
121 | 121 | { |
|
122 |
"label": "Build |
|
|
122 | "label": "Build Run: Core Debug", | |
|
123 | 123 | "type": "shell", |
|
124 | 124 | "dependsOrder": "sequence", |
|
125 | 125 | "dependsOn": [ |
@@ -156,7 +156,7 | |||
|
156 | 156 | ], |
|
157 | 157 | "options": { |
|
158 | 158 | "env": { |
|
159 | "LD_LIBRARY_PATH": "./lib64", | |
|
159 | "LD_LIBRARY_PATH": "../../../../fnalibs/lib64", | |
|
160 | 160 | "DYLD_LIBRARY_PATH": "/Users/alys/repos/isometric-park-fna/fnalibs/osx:/Users/alys/repos/isometric-park-fna/cimgui/osx-x64", |
|
161 | 161 | // "DYLD_LIBRARY_PATH": "./osx" |
|
162 | 162 | "DYLD_PRINT_LIBRARIES": "TRUE" |
@@ -196,7 +196,7 | |||
|
196 | 196 | ], |
|
197 | 197 | "options": { |
|
198 | 198 | "env": { |
|
199 | "LD_LIBRARY_PATH": "./lib64", | |
|
199 | "LD_LIBRARY_PATH": "../../../../fnalibs/lib64", | |
|
200 | 200 | "DYLD_LIBRARY_PATH": "/Users/alys/repos/isometric-park-fna/fnalibs/osx:/Users/alys/repos/isometric-park-fna/cimgui/osx-x64" |
|
201 | 201 | }, |
|
202 | 202 | "cwd": "${workspaceFolder}/isometric-park-fna/bin/Release/netcoreapp3.1" |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -19,3 +19,10 | |||
|
19 | 19 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.dll |
|
20 | 20 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.pdb |
|
21 | 21 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csprojAssemblyReference.cache |
|
22 | /home/alys/repos/isometric-park-fna/FNA/bin/Debug/FNA.dll.config | |
|
23 | /home/alys/repos/isometric-park-fna/FNA/bin/Debug/FNA.dll | |
|
24 | /home/alys/repos/isometric-park-fna/FNA/bin/Debug/FNA.pdb | |
|
25 | /home/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csprojAssemblyReference.cache | |
|
26 | /home/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csproj.CoreCompileInputs.cache | |
|
27 | /home/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.dll | |
|
28 | /home/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.pdb |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -34,3 +34,15 | |||
|
34 | 34 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CopyComplete |
|
35 | 35 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll |
|
36 | 36 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb |
|
37 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll.config | |
|
38 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll | |
|
39 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb | |
|
40 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll | |
|
41 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.pdb | |
|
42 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache | |
|
43 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache | |
|
44 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache | |
|
45 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.AssemblyInfo.cs | |
|
46 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csproj.CopyComplete | |
|
47 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll | |
|
48 | /home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
|
1 | NO CONTENT: modified file, binary diff hidden |
@@ -1,14 +1,14 | |||
|
1 | 1 | { |
|
2 | 2 | "format": 1, |
|
3 | 3 | "restore": { |
|
4 |
"/ |
|
|
4 | "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {} | |
|
5 | 5 | }, |
|
6 | 6 | "projects": { |
|
7 |
"/ |
|
|
7 | "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": { | |
|
8 | 8 | "restore": { |
|
9 |
"projectUniqueName": "/ |
|
|
9 | "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj", | |
|
10 | 10 | "projectName": "FNA", |
|
11 |
"projectPath": "/ |
|
|
11 | "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj", | |
|
12 | 12 | "frameworks": { |
|
13 | 13 | "net48": { |
|
14 | 14 | "projectReferences": {} |
@@ -19,17 +19,20 | |||
|
19 | 19 | "net48": {} |
|
20 | 20 | } |
|
21 | 21 | }, |
|
22 |
"/ |
|
|
22 | "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": { | |
|
23 | 23 | "version": "1.0.0", |
|
24 | 24 | "restore": { |
|
25 |
"projectUniqueName": "/ |
|
|
25 | "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
26 | 26 | "projectName": "SpriteFontPlus", |
|
27 |
"projectPath": "/ |
|
|
28 |
"packagesPath": "/ |
|
|
29 |
"outputPath": "/ |
|
|
27 | "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
28 | "packagesPath": "/home/alys/.nuget/packages/", | |
|
29 | "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", | |
|
30 | 30 | "projectStyle": "PackageReference", |
|
31 | "fallbackFolders": [ | |
|
32 | "/usr/share/dotnet/sdk/NuGetFallbackFolder" | |
|
33 | ], | |
|
31 | 34 | "configFilePaths": [ |
|
32 |
"/ |
|
|
35 | "/home/alys/.config/NuGet/NuGet.Config" | |
|
33 | 36 | ], |
|
34 | 37 | "originalTargetFrameworks": [ |
|
35 | 38 | "net45" |
@@ -40,8 +43,8 | |||
|
40 | 43 | "frameworks": { |
|
41 | 44 | "net45": { |
|
42 | 45 | "projectReferences": { |
|
43 |
"/ |
|
|
44 |
"projectPath": "/ |
|
|
46 | "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": { | |
|
47 | "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj" | |
|
45 | 48 | } |
|
46 | 49 | } |
|
47 | 50 | } |
@@ -53,9 +56,7 | |||
|
53 | 56 | } |
|
54 | 57 | }, |
|
55 | 58 | "frameworks": { |
|
56 | "net45": { | |
|
57 | "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" | |
|
58 | } | |
|
59 | "net45": {} | |
|
59 | 60 | } |
|
60 | 61 | } |
|
61 | 62 | } |
@@ -4,8 +4,8 | |||
|
4 | 4 | <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess> |
|
5 | 5 | <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> |
|
6 | 6 | <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> |
|
7 |
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/ |
|
|
8 |
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/ |
|
|
7 | <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot> | |
|
8 | <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders> | |
|
9 | 9 | <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> |
|
10 | 10 | <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion> |
|
11 | 11 | </PropertyGroup> |
@@ -26,19 +26,23 | |||
|
26 | 26 | ] |
|
27 | 27 | }, |
|
28 | 28 | "packageFolders": { |
|
29 |
"/ |
|
|
29 | "/home/alys/.nuget/packages/": {}, | |
|
30 | "/usr/share/dotnet/sdk/NuGetFallbackFolder": {} | |
|
30 | 31 | }, |
|
31 | 32 | "project": { |
|
32 | 33 | "version": "1.0.0", |
|
33 | 34 | "restore": { |
|
34 |
"projectUniqueName": "/ |
|
|
35 | "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
35 | 36 | "projectName": "SpriteFontPlus", |
|
36 |
"projectPath": "/ |
|
|
37 |
"packagesPath": "/ |
|
|
38 |
"outputPath": "/ |
|
|
37 | "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
38 | "packagesPath": "/home/alys/.nuget/packages/", | |
|
39 | "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", | |
|
39 | 40 | "projectStyle": "PackageReference", |
|
41 | "fallbackFolders": [ | |
|
42 | "/usr/share/dotnet/sdk/NuGetFallbackFolder" | |
|
43 | ], | |
|
40 | 44 | "configFilePaths": [ |
|
41 |
"/ |
|
|
45 | "/home/alys/.config/NuGet/NuGet.Config" | |
|
42 | 46 | ], |
|
43 | 47 | "originalTargetFrameworks": [ |
|
44 | 48 | "net45" |
@@ -49,8 +53,8 | |||
|
49 | 53 | "frameworks": { |
|
50 | 54 | "net45": { |
|
51 | 55 | "projectReferences": { |
|
52 |
"/ |
|
|
53 |
"projectPath": "/ |
|
|
56 | "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": { | |
|
57 | "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj" | |
|
54 | 58 | } |
|
55 | 59 | } |
|
56 | 60 | } |
@@ -62,9 +66,7 | |||
|
62 | 66 | } |
|
63 | 67 | }, |
|
64 | 68 | "frameworks": { |
|
65 | "net45": { | |
|
66 | "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" | |
|
67 | } | |
|
69 | "net45": {} | |
|
68 | 70 | } |
|
69 | 71 | } |
|
70 | 72 | } No newline at end of file |
@@ -1,8 +1,8 | |||
|
1 | 1 | { |
|
2 | 2 | "version": 2, |
|
3 | "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==", | |
|
3 | "dgSpecHash": "3AWDv+MZriwMxBTBDorp8FiSvyrXQqppePDYsTfATqNGlipF/pJObt6DcBo8NzTLP21oSN3cyqBrcDukFLx64w==", | |
|
4 | 4 | "success": true, |
|
5 |
"projectFilePath": "/ |
|
|
5 | "projectFilePath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", | |
|
6 | 6 | "expectedPackageFiles": [], |
|
7 | 7 | "logs": [] |
|
8 | 8 | } No newline at end of file |
You need to be logged in to leave comments.
Login now