From a8120704f701882253cd5242f78ede938c2af501 Mon Sep 17 00:00:00 2001
From: d18c7db <d18c7db@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Mon, 7 Sep 2009 09:03:45 +0000
Subject: [PATCH] Updated the windows Makefile to be compatible with both nmake
 and make

---
 cockpit/1makearm.bat  |  6 ++++--
 cockpit/2makeboot.bat |  6 ++++--
 cockpit/3makewin.bat  |  6 ++++--
 cockpit/5makeall.bat  | 10 +++++++---
 winsrc/Makefile       | 29 +++++++++++++----------------
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/cockpit/1makearm.bat b/cockpit/1makearm.bat
index 8efdd556..f4a53992 100644
--- a/cockpit/1makearm.bat
+++ b/cockpit/1makearm.bat
@@ -2,7 +2,9 @@
 call _checkmake
 IF %MAKE_FAILED%==1 GOTO end
 cd ..\armsrc
-rem make clean
-make
+@echo **************
+@echo *** armsrc ***
+@echo **************
+make %1
 cd ..\cockpit
 :end
diff --git a/cockpit/2makeboot.bat b/cockpit/2makeboot.bat
index aa8161e9..47057037 100644
--- a/cockpit/2makeboot.bat
+++ b/cockpit/2makeboot.bat
@@ -2,7 +2,9 @@
 call _checkmake
 IF %MAKE_FAILED%==1 GOTO end
 cd ..\bootrom
-rem make clean
-make
+@echo ***************
+@echo *** bootrom ***
+@echo ***************
+make %1
 cd ..\cockpit
 :end
diff --git a/cockpit/3makewin.bat b/cockpit/3makewin.bat
index 82228e32..fa769860 100644
--- a/cockpit/3makewin.bat
+++ b/cockpit/3makewin.bat
@@ -1,5 +1,7 @@
 @echo off
 cd ..\winsrc
-rem nmake clean
-nmake
+@echo **************
+@echo *** winsrc ***
+@echo **************
+make %1
 cd ..\cockpit
diff --git a/cockpit/5makeall.bat b/cockpit/5makeall.bat
index 072393d9..23ee6e83 100644
--- a/cockpit/5makeall.bat
+++ b/cockpit/5makeall.bat
@@ -1,3 +1,7 @@
-call 1makearm.bat
-call 2makeboot.bat
-call 3makewin.bat
+@echo off
+call _checkmake
+IF %MAKE_FAILED%==1 GOTO end
+call 1makearm.bat %1
+call 2makeboot.bat %1
+call 3makewin.bat %1
+:end
\ No newline at end of file
diff --git a/winsrc/Makefile b/winsrc/Makefile
index 71dce866..96466700 100644
--- a/winsrc/Makefile
+++ b/winsrc/Makefile
@@ -1,10 +1,11 @@
+CC=cl
 BASE_DEFS   = /D_WIN32_WINNT=0x501 /DISOLATION_AWARE_ENABLED /D_WIN32_IE=0x600 /DWIN32_LEAN_AND_MEAN /DWIN32 /D_MT /D_CRT_SECURE_NO_WARNINGS
-BASE_CFLAGS = /W3 /nologo
-
+BASE_CFLAGS = /W3 /nologo /Zi /MT /Fdobj/vc90.pdb
 LIB=..\..\devkitWIN\lib;%LIB%
 
 DEFINES  = $(BASE_DEFS)
-CFLAGS   = $(BASE_CFLAGS) /I..\..\devkitWIN/include /Zi /MT
+INCLUDES = /I..\..\devkitWIN/include
+CFLAGS   = $(BASE_CFLAGS) $(INCLUDES)
 
 OBJDIR = obj
 
@@ -12,24 +13,20 @@ OBJS   = $(OBJDIR)\prox.obj \
          $(OBJDIR)\gui.obj \
          $(OBJDIR)\command.obj
 
-LIBS   = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib
-
-HEADERS = prox.h
+LIBS   = user32.lib gdi32.lib setupapi.lib
 
-all: prox.exe
+all: proxmark3
 
-prox.exe: $(OBJDIR)/prox.exe
-    copy $(OBJDIR)\prox.exe .
+proxmark3:
+	$(CC) $(CFLAGS) $(DEFINES) -c -Foobj/prox.obj prox.cpp
+	$(CC) $(CFLAGS) $(DEFINES) -c -Foobj/gui.obj gui.cpp
+	$(CC) $(CFLAGS) $(DEFINES) -c -Foobj/command.obj command.cpp
+	$(CC) $(CFLAGS) $(DEFINES) -Fe$(OBJDIR)/prox.exe $(OBJS) $(LIBS)
+	copy obj\prox.exe .
 
 clean:
 	del /q obj\*.obj
 	del /q obj\*.ilk
 	del /q obj\*.exe
 	del /q obj\*.pdb
-	del /q *.pdb
-
-$(OBJDIR)/prox.exe: $(OBJS)
-    $(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/prox.exe $(OBJS) $(LIBS)
-
-$(OBJS): $(@B).cpp $(HEADERS)
-    $(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(@B).cpp
+	del prox.exe
\ No newline at end of file
-- 
2.39.2