From ddd8c7eb1bf9c461cdcf4e2fb25f633754458631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CCarson?= Date: Mon, 12 Oct 2020 16:21:22 -0400 Subject: [PATCH] fix makefile to use most recent version of Newtonsoft.Json.dll --- makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 450b073..737a920 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,12 @@ -all: Program.cs +$(eval SHELL:=/bin/bash) + +all: Program.cs mkdir -p build/ nuget restore SteamAuth/SteamAuth/SteamAuth.sln - mcs -target:library -out:build/SteamAuth.dll -r:SteamAuth/SteamAuth/packages/Newtonsoft.Json.11.0.1/lib/net45/Newtonsoft.Json.dll SteamAuth/SteamAuth/APIEndpoints.cs SteamAuth/SteamAuth/AuthenticatorLinker.cs SteamAuth/SteamAuth/Confirmation.cs SteamAuth/SteamAuth/SessionData.cs SteamAuth/SteamAuth/SteamGuardAccount.cs SteamAuth/SteamAuth/SteamWeb.cs SteamAuth/SteamAuth/TimeAligner.cs SteamAuth/SteamAuth/UserLogin.cs SteamAuth/SteamAuth/Util.cs SteamAuth/SteamAuth/Properties/AssemblyInfo.cs - cp SteamAuth/SteamAuth/packages/Newtonsoft.Json.11.0.1/lib/net45/Newtonsoft.Json.dll build/ + $(eval NEWTONSOFT_JSON_PATH=$(shell find -name Newtonsoft.Json.dll | grep \/net45\/ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n 1)) + echo "NEWTONSOFT_JSON_PATH=$(NEWTONSOFT_JSON_PATH)" + mcs -target:library -out:build/SteamAuth.dll -r:$(NEWTONSOFT_JSON_PATH) SteamAuth/SteamAuth/APIEndpoints.cs SteamAuth/SteamAuth/AuthenticatorLinker.cs SteamAuth/SteamAuth/Confirmation.cs SteamAuth/SteamAuth/SessionData.cs SteamAuth/SteamAuth/SteamGuardAccount.cs SteamAuth/SteamAuth/SteamWeb.cs SteamAuth/SteamAuth/TimeAligner.cs SteamAuth/SteamAuth/UserLogin.cs SteamAuth/SteamAuth/Util.cs SteamAuth/SteamAuth/Properties/AssemblyInfo.cs + cp $(NEWTONSOFT_JSON_PATH) build/ mcs -out:build/steamguard -r:build/SteamAuth.dll -r:build/Newtonsoft.Json.dll -r:/usr/lib/mono/4.5/System.Security.dll Program.cs Manifest.cs AssemblyInfo.cs Utils.cs run: