Update Makefile

rasa · May 21, 2015 · 9dd0452 · 9dd0452
1 parent 2608217
commit 9dd0452
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.10 (unreleased)
+
+  * Update Makefile
+
 ## 1.9 (28-Mar-2015)
 
   * Fix segfault due to linker issue (#1)

diff --git a/Makefile b/Makefile
@@ -49,10 +49,14 @@ APP_URL?=http://github.com/rasa/$(REPO)/
 APP_ZIP?=$(APP)-$(VER)-$(FLAVOR).zip
 CODESIGN_PFX?=../codesign.pfx
 CURL?=curl
-CURL_OPTS?=--netrc --insecure --silent --show-error 
+CURL_OPTS?=--netrc --insecure --silent --show-error
 GPG_OPTS?=
 HASH_FILES?=md5s.txt sha1s.txt sha256s.txt
+ifeq ("$(FLAVOR)", "win32")
 RELEASE_APP_EXE?=Release/$(APP_EXE)
+else
+RELEASE_APP_EXE?=Release/$(FLAVOR)/$(APP_EXE)
+endif
 RELEASE_URL?=https://api.github.com/repos/rasa/$(REPO)/releases
 TAG?=v$(VER)
 ## fails occasionally: http://timestamp.verisign.com/scripts/timstamp.dll
@@ -121,7 +125,7 @@ define UPX_FILE
 $(2): $(1)
 	test -d $(dir $(2)) || mkdir $(dir $(2))
 	test ! -f $(2) || rm -f $(2)
-	upx -9 -o $(2) $(1)
+	upx --best --overlay=skip --quiet -o $(2) $(1) || cp -p $(1) $(2)
 
 UPXED_FILES+=$(2)
 
@@ -284,7 +288,7 @@ hashes:	$(HASH_FILES)
 $(APP_ZIP):	$(APP_FILES)
 	-rm -f $@
 	zip $(ZIP_OPTS) $@ $^
-	
+
 .PHONY:	zip
 zip:	$(APP_ZIP)
 

diff --git a/version.h b/version.h
@@ -3,7 +3,7 @@
 #define VER_INTERNAL_NAME 		"res_set"
 #define	VER_FILE_DESCRIPTION	"Display or change the monitor resolution, color depth, or refresh rate"
 #define VER_MAJOR				1
-#define VER_MINOR				9
-#define VER_STRING2				"1.9"
+#define VER_MINOR				10
+#define VER_STRING2				"1.10"
 
 #include "ver_defaults.h"