From 957848dad2355fdd9552bbfc7538a4daeef60c9a Mon Sep 17 00:00:00 2001
From: Nick Blakely <ncblakely@gmail.com>
Date: Tue, 11 Aug 2020 01:38:49 -0700
Subject: [PATCH] Change patch output directory.

---
 .gitignore               | 1 +
 GPatch/DotNetChecker.nsh | 2 +-
 GPatch/GPatch.nsi        | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5f9220..21f755d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -343,4 +343,5 @@ healthchecksdb
 
 #GPatch
 GPatch/Files
+GPatch/Output
 GPatch/Launcher/*.exe
\ No newline at end of file
diff --git a/GPatch/DotNetChecker.nsh b/GPatch/DotNetChecker.nsh
index ba9e502..abc84e5 100644
--- a/GPatch/DotNetChecker.nsh
+++ b/GPatch/DotNetChecker.nsh
@@ -91,7 +91,7 @@
 		Goto NoDotNET${FrameworkVersion}
 	${Else}
 		DetailPrint ".NET Framework $dotNetReadableVersion${FrameworkVersion} found, no need to install."
-		Goto NoDotNET${FrameworkVersion}
+		Goto NewDotNET${FrameworkVersion}
 	${EndIf}
 
 NoDotNET${FrameworkVersion}:
diff --git a/GPatch/GPatch.nsi b/GPatch/GPatch.nsi
index 2075bfe..41178af 100644
--- a/GPatch/GPatch.nsi
+++ b/GPatch/GPatch.nsi
@@ -42,7 +42,7 @@ SetCompressor /SOLID lzma
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "GPatch1_498_177_0.exe"
+OutFile "Output\GPatch1_498_177_0.exe"
 InstallDir "$PROGRAMFILES\Giants\"
 InstallDirRegKey HKCU "SOFTWARE\PlanetMoon\Giants" "DestDir"
 ShowInstDetails hide
@@ -72,7 +72,9 @@ Section
   Delete $INSTDIR\bin\Shaders\*.*
   Delete $INSTDIR\gg_dx7r.dll
   Delete $INSTDIR\gg_dx8r.dll
+  Delete $INSTDIR\gg_dx9r.dll
   Delete $INSTDIR\Giants.exe
+  Delete $INSTDIR\GiantsMain.exe
   Delete $INSTDIR\*.vso
   Delete $INSTDIR\*.pso