Build fixes

rasa · Feb 19, 2015 · 1ccc4c4 · 1ccc4c4
1 parent efa18d3
commit 1ccc4c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 VER?=$(shell perl -n -e '/define\s+VER_STRING2\s+"(.*)"/ && print $$1' version.h)
 APP?=$(shell perl -n -e '/define\s+VER_INTERNAL_NAME\s+"(.*)"/ && print $$1' version.h)
-APP_FILES=CHANGELOG.md LICENSE README.md $(wildcard Release/*.exe)
+APP_FILES=CHANGELOG.md LICENSE README.md Release/$(APP).exe
 SRC_FILES=$(APP_FILES) $(wildcard Makefile *.cpp *.dep *.dsp *.dsw *.h *.ico *.mak *.rc *.sln *.vcproj *.vcxproj *.vcxproj.filters)
 
 
@@ -17,12 +17,12 @@ dist:	all $(APP_ZIP) $(SRC_ZIP)
 $(APP_ZIP):	$(APP_FILES)
 	-rm -f $(APP_ZIP)
 	chmod +x $^
-	${ZIP} ${ZIP_OPTS} $@ $^
+	$(ZIP) $(ZIP_OPTS) $@ $^
 
 $(SRC_ZIP):	$(SRC_FILES)
 	-rm -f $(SRC_ZIP)
 	chmod +x $^
-	${ZIP} ${ZIP_OPTS} $@ $^
+	$(ZIP) $(ZIP_OPTS) $@ $^
 
 .PHONY:	distclean
 distclean:	clean

diff --git a/msbuild.mak b/msbuild.mak
@@ -1,10 +1,12 @@
 .PHONY:	all clean realclean
 
 all:
-	MSBuild.exe res_set.sln /t:Rebuild
+	MSBuild.exe res_set.sln /t:Build /p:Configuration=Debug
+	MSBuild.exe res_set.sln /t:Build /p:Configuration=Release
 
 clean:
-	MSBuild.exe res_set.sln /t:Clean
+	MSBuild.exe res_set.sln /t:Clean /p:Configuration=Debug
+	MSBuild.exe res_set.sln /t:Clean /p:Configuration=Release
 
 realclean: clean
 	-cmd /c del /s *.bak *.bsc *.idb *.pdb *.lib *.ncb *.obj *.opt *.pch *.plg *.sbr