From f88375bb9ab1926e58820e9c417cc08adb415124 Mon Sep 17 00:00:00 2001 From: Sour Date: Mon, 25 Nov 2019 20:56:12 -0500 Subject: [PATCH] Linux: Revert to using xbuild for now --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 9e92470..b25e580 100644 --- a/makefile +++ b/makefile @@ -94,12 +94,12 @@ all: ui ui: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) mkdir -p $(RELEASEFOLDER)/Dependencies rm -fr $(RELEASEFOLDER)/Dependencies/* - cd UpdateHelper && msbuild /property:Configuration="Release" /property:Platform="AnyCPU" + cd UpdateHelper && xbuild /property:Configuration="Release" /property:Platform="AnyCPU" cp "bin/Any CPU/Release/MesenUpdater.exe" $(RELEASEFOLDER)/Dependencies/ cp -r UI/Dependencies/* $(RELEASEFOLDER)/Dependencies/ cp InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) $(RELEASEFOLDER)/Dependencies/$(SHAREDLIB) cd $(RELEASEFOLDER)/Dependencies && zip -r ../Dependencies.zip * - cd UI && msbuild /property:Configuration="Release" /property:Platform="$(MESENPLATFORM)" /property:PreBuildEvent="" '/property:DefineConstants="HIDETESTMENU;DISABLEAUTOUPDATE"' /property:CodeAnalysisRuleSet="" + cd GUI.NET && xbuild /property:Configuration="Release" /property:Platform="$(MESENPLATFORM)" /property:PreBuildEvent="" /property:DefineConstants="HIDETESTMENU,DISABLEAUTOUPDATE" libretro: Libretro/$(OBJFOLDER)/$(LIBRETROLIB) mkdir -p bin