Fix segfault due to linker issue (Fixes #1)

rasa · Mar 28, 2015 · 467b748 · 467b748
1 parent 66ba79a
commit 467b748
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -458,3 +458,8 @@ sha1s.txt
 sha256s.txt
 *.asc
 *.sha256
+
+.*.uploaded
+.*.scanned
+.*.released
+.*.tagged
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6 (28-Mar-2015)
+
+  * Fix segfault due to linker issue (#1)
+
 ## 1.5 (27-Mar-2015)
 
   * Executables signed with StartSSL code signing certificate

diff --git a/Makefile b/Makefile
@@ -94,7 +94,7 @@ endif
 define FIND_SIGNTOOL
 
 ifndef SIGNTOOL
-	SDK_DIR:=$$(shell cygpath -m -s $(1) 2>/dev/null)
+	SDK_DIR:=$$(shell cygpath -m -s "$(1)" 2>/dev/null)
 	ifneq ($$(wildcard $$(SDK_DIR)/signtool.exe),)
 		SIGNTOOL:=$$(SDK_DIR)/signtool.exe
 	endif
@@ -371,7 +371,7 @@ publish:	$(UPLOADED_FILES) $(SCANNED_FILES)
 
 .PHONY:	tidy
 tidy:	clean
-	-rm -f  $(CLEANED_FILES) \
+	-rm -f  $(CLEAN_FILES) \
 		$(HASH_FILES) \
 		$(SIGNED_FILES) \
 		$(UPXED_FILES)

diff --git a/path_set.cpp b/path_set.cpp
@@ -34,9 +34,6 @@ change REG type if specified type is different
 #include <cstdlib>
 //#include <atlbase.h> // required for Stackwalker
 
-#include "Stackwalker.h"
-#include "Optimize.h"
-#include "debug.h"
 #include "UpdatePathVariable.h"
 #include "getopt.h"
 

diff --git a/version.h b/version.h
@@ -3,7 +3,7 @@
 #define VER_INTERNAL_NAME 		"path_set"
 #define	VER_FILE_DESCRIPTION	"Modify system and user environment variables"
 #define VER_MAJOR				1
-#define VER_MINOR				5
-#define VER_STRING2				"1.5"
+#define VER_MINOR				6
+#define VER_STRING2				"1.6"
 
 #include "ver_defaults.h"