Build updates

Author: rasa

Makefile

@@ -14,16 +14,13 @@
 
 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)
-VC98?=$(PROGRAMFILES)\\Microsoft Visual Studio 10.0\\VC
-MSVC_DIR?=$(shell cygpath -u `cygpath -ds "$(VC98)"`)
-CYGENV=MAKEFLAGS="" PATH=$(MSVC_DIR)/bin:$$PATH
+APP_FILES=Release/$(APP).exe changelog.txt COPYING readme.txt
+SRC_FILES=$(APP_FILES) $(shell ls Makefile *.cpp *.dep *.dsp *.dsw *.h *.ico *.mak *.rc 2>/dev/null)
+
 APP_ZIP?=$(APP)-$(VER)-win32.zip
 SRC_ZIP?=$(APP)-$(VER)-win32-src.zip
 ZIP?=zip
 ZIP_OPTS?=-9jquX
-CWD=$(shell pwd)
-APP_FILES=Release/$(APP).exe changelog.txt COPYING readme.txt
-SRC_FILES=$(APP_FILES) $(shell ls *.cpp *.c *.h *.hpp *.inl *.dsp *.dsw *.mak *.dep Makefile 2>/dev/null)
 
 .PHONY:	dist
 dist:	all $(APP_ZIP) $(SRC_ZIP)

dskwipe.dep

@@ -1,7 +1,15 @@
 # Microsoft Developer Studio Generated Dependency File, included by dskwipe.mak
 
 .\dskwipe.cpp : \
-	"..\shared\getopt.h"\
-	"..\shared\ver_defaults.h"\
+	{$(INCLUDE)}"basetsd.h"\
+	{$(INCLUDE)}"guiddef.h"\
+	{$(INCLUDE)}"propidl.h"\
+	{$(INCLUDE)}"reason.h"\
+	{$(INCLUDE)}"specstrings.h"\
+	{$(INCLUDE)}"stralign.h"\
+	{$(INCLUDE)}"tvout.h"\
+	{$(INCLUDE)}"winefs.h"\
+	{$(INCLUDE)}"getopt.h"\
+	{$(INCLUDE)}"ver_defaults.h"\
 	".\version.h"\
 

dskwipe.rc

@@ -9,7 +9,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "windows.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

nmake.mak

@@ -1,10 +1,10 @@
 all:
-	$(CYGENV) nmake /f dskwipe.mak CFG="dskwipe - Win32 Release"	all
-	$(CYGENV) nmake /f dskwipe.mak CFG="dskwipe - Win32 Debug"	all
+	$(MAKE) /f dskwipe.mak CFG="dskwipe - Win32 Release"	all
+	$(MAKE) /f dskwipe.mak CFG="dskwipe - Win32 Debug"	all
 
 clean:
-	$(CYGENV) nmake /f dskwipe.mak CFG="dskwipe - Win32 Release"	clean
-	$(CYGENV) nmake /f dskwipe.mak CFG="dskwipe - Win32 Debug"	clean
+	$(MAKE) /f dskwipe.mak CFG="dskwipe - Win32 Release"	clean
+	$(MAKE) /f dskwipe.mak CFG="dskwipe - Win32 Debug"	clean
 
 realclean: clean
 	-cmd /c del /s *.bak