Browse Source

fix a bunch of windows build bullshit

main
cosmonaut 10 months ago
parent
commit
723c2a726e
  1. 4
      .vscode/launch.json
  2. 60
      .vscode/tasks.json
  3. 26
      ProjectName.Core.sln
  4. 26
      ProjectName.Framework.sln
  5. 6
      build/CopyFNALibs.targets
  6. 2
      install.sh

4
.vscode/launch.json

@ -6,9 +6,9 @@
"type": "clr",
"request": "launch",
"preLaunchTask": "Build: Framework Debug",
"program": "${workspaceFolder}/ProjectName/bin/Debug/net461/ProjectName.exe",
"program": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461/ProjectName.exe",
"args": [],
"cwd": "${workspaceFolder}/ProjectName/bin/Debug/net461",
"cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
},

60
.vscode/tasks.json

@ -21,12 +21,12 @@
},
"tasks": [
{
"label": "Build: Framework Release",
"command": "msbuild",
"label": "Build: Framework Debug",
"command": "MsBuild.exe",
"args": [
"-restore:True",
"${workspaceFolder}/ProjectName.Framework.sln",
"-p:Configuration=Release",
"-p:Configuration=Debug",
"-p:Platform=x64"
],
"type": "shell",
@ -34,20 +34,13 @@
"kind": "build",
"isDefault": true
},
"problemMatcher": "$msCompile"
"problemMatcher": []
},
{
"label": "Run: Framework Release",
"command": "mono",
"args": [
"ProjectName.exe"
],
"label": "Run: Framework Debug",
"command": "ProjectName.exe",
"options": {
"env": {
"LD_LIBRARY_PATH": "./lib64",
"DYLD_LIBRARY_PATH": "./osx"
},
"cwd": "${workspaceFolder}/ProjectName/bin/Release/net461"
"cwd": "${workspaceFolder}/ProjectName/bin/x64/Debug/net461"
},
"type": "process",
"group": {
@ -57,10 +50,10 @@
"problemMatcher": []
},
{
"label": "Build & Run: Framework Release",
"label": "Build & Run: Framework Debug",
"dependsOn": [
"Build: Framework Release",
"Run: Framework Release"
"Build: Framework Debug",
"Run: Framework Debug"
],
"dependsOrder": "sequence",
"type": "shell",
@ -71,12 +64,12 @@
"problemMatcher": []
},
{
"label": "Build: Framework Debug",
"command": "msbuild",
"label": "Build: Framework Release",
"command": "MsBuild.exe",
"args": [
"-restore:True",
"${workspaceFolder}/ProjectName.Framework.sln",
"-p:Configuration=Debug",
"-p:Configuration=Release",
"-p:Platform=x64"
],
"type": "shell",
@ -87,17 +80,10 @@
"problemMatcher": []
},
{
"label": "Run: Framework Debug",
"command": "mono",
"args": [
"ProjectName.exe"
],
"label": "Run: Framework Release",
"command": "ProjectName.exe",
"options": {
"env": {
"LD_LIBRARY_PATH": "./lib64",
"DYLD_LIBRARY_PATH": "./osx"
},
"cwd": "${workspaceFolder}/ProjectName/bin/Debug/net461"
"cwd": "${workspaceFolder}/ProjectName/bin/x64/Release/net461"
},
"type": "process",
"group": {
@ -107,10 +93,10 @@
"problemMatcher": []
},
{
"label": "Build & Run: Framework Debug",
"label": "Build & Run: Framework Release",
"dependsOn": [
"Build: Framework Debug",
"Run: Framework Debug"
"Build: Framework Release",
"Run: Framework Release"
],
"dependsOrder": "sequence",
"type": "shell",
@ -237,9 +223,7 @@
"command": "dotnet",
"args": [
"build",
"./ProjectName.Core.sln",
"-f",
"netcoreapp3.1"
"./ProjectName.Core.sln"
],
"type": "shell",
"group": {
@ -275,9 +259,7 @@
"build",
"./ProjectName.Core.sln",
"--configuration",
"Release",
"-f",
"netcoreapp3.1"
"Release"
],
"type": "shell",
"group": {

26
ProjectName.Core.sln

@ -5,30 +5,24 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectName.Core", "ProjectName\ProjectName.Core.csproj", "{4589302C-174A-4173-9654-CAA6CA1B5220}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA.Core", "FNA\FNA.Core.csproj", "{D107303E-2AA7-4C9B-BB2A-2D1D75BEFF27}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.ActiveCfg = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.Build.0 = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.ActiveCfg = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x86.Build.0 = Debug|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|Any CPU.Build.0 = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.ActiveCfg = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.Build.0 = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.ActiveCfg = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x86.Build.0 = Release|Any CPU
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.ActiveCfg = Debug|x64
{4589302C-174A-4173-9654-CAA6CA1B5220}.Debug|x64.Build.0 = Debug|x64
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.ActiveCfg = Release|x64
{4589302C-174A-4173-9654-CAA6CA1B5220}.Release|x64.Build.0 = Release|x64
{D107303E-2AA7-4C9B-BB2A-2D1D75BEFF27}.Debug|x64.ActiveCfg = Debug|x64
{D107303E-2AA7-4C9B-BB2A-2D1D75BEFF27}.Debug|x64.Build.0 = Debug|x64
{D107303E-2AA7-4C9B-BB2A-2D1D75BEFF27}.Release|x64.ActiveCfg = Release|x64
{D107303E-2AA7-4C9B-BB2A-2D1D75BEFF27}.Release|x64.Build.0 = Release|x64
EndGlobalSection
EndGlobal

26
ProjectName.Framework.sln

@ -5,30 +5,24 @@ VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNATemplate.Framework", "ProjectName\ProjectName.Framework.csproj", "{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.Build.0 = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.Build.0 = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.ActiveCfg = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x86.Build.0 = Release|Any CPU
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|x64
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|x64
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|x64
{9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.Build.0 = Release|x64
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.ActiveCfg = Debug|x64
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.Build.0 = Debug|x64
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.ActiveCfg = Release|x64
{35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
EndGlobal

6
build/CopyFNALibs.targets

@ -2,11 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Content Include="..\fnalibs\x86\**\*.*" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Platform)' != 'x64'">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\fnalibs\x64\**\*.*" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true' AND '$(Platform)' != 'x86'">
<Content Include="..\fnalibs\x64\**\*.*" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

2
install.sh

@ -78,6 +78,8 @@ function getLibs()
echo "Finished decompressing!"
echo ""
rm "$MY_DIR"/fnalibs.tar.bz2
#Remove x86 libs because fuck x86
rm -rf "$MY_DIR"/fnalibs/x86
else
>&2 echo "ERROR: Unable to decompress successfully."
exit 1

Loading…
Cancel
Save