Updated the windows Makefile to be compatible with both nmake and make

diff --git a/cockpit/1makearm.bat b/cockpit/1makearm.bat
index 8efdd55614e2106780036a8a18532d48aa41605b..f4a539927c30d49caf60684dab82f001e88e0aad 100644 (file)
--- a/cockpit/1makearm.bat
+++ b/cockpit/1makearm.bat
@@ -2,7 +2,9 @@
 call _checkmake\r
 IF %MAKE_FAILED%==1 GOTO end\r
 cd ..\armsrc\r
 call _checkmake\r
 IF %MAKE_FAILED%==1 GOTO end\r
 cd ..\armsrc\r

-rem make clean\r
-make\r
+@echo **************\r
+@echo *** armsrc ***\r
+@echo **************\r
+make %1\r

 cd ..\cockpit\r
 :end\r
 cd ..\cockpit\r
 :end\r

diff --git a/cockpit/2makeboot.bat b/cockpit/2makeboot.bat
index aa8161e9dacb015d91b7ffac8a668be429301938..470570376ca45cd6b8674b6dcd74b616a295cdbc 100644 (file)
--- a/cockpit/2makeboot.bat
+++ b/cockpit/2makeboot.bat
@@ -2,7 +2,9 @@
 call _checkmake\r
 IF %MAKE_FAILED%==1 GOTO end\r
 cd ..\bootrom\r
 call _checkmake\r
 IF %MAKE_FAILED%==1 GOTO end\r
 cd ..\bootrom\r

-rem make clean\r
-make\r
+@echo ***************\r
+@echo *** bootrom ***\r
+@echo ***************\r
+make %1\r

 cd ..\cockpit\r
 :end\r
 cd ..\cockpit\r
 :end\r

diff --git a/cockpit/3makewin.bat b/cockpit/3makewin.bat
index 82228e32f542d2d703c0ac5ff74ec9a21aade31f..fa7698607ccff264735aa6f1d6c62b47101000c1 100644 (file)
--- a/cockpit/3makewin.bat
+++ b/cockpit/3makewin.bat
@@ -1,5 +1,7 @@
 @echo off\r
 cd ..\winsrc\r
 @echo off\r
 cd ..\winsrc\r

-rem nmake clean\r
-nmake\r
+@echo **************\r
+@echo *** winsrc ***\r
+@echo **************\r
+make %1\r

 cd ..\cockpit\r
 cd ..\cockpit\r

diff --git a/cockpit/5makeall.bat b/cockpit/5makeall.bat
index 072393d9d396b60d7052d059e783d113b9123eac..23ee6e83d4e5b8ea437c92b9977a100772f6c4f1 100644 (file)
--- a/cockpit/5makeall.bat
+++ b/cockpit/5makeall.bat
@@ -1,3 +1,7 @@
-call 1makearm.bat\r
-call 2makeboot.bat\r
-call 3makewin.bat\r
+@echo off\r
+call _checkmake\r
+IF %MAKE_FAILED%==1 GOTO end\r
+call 1makearm.bat %1\r
+call 2makeboot.bat %1\r
+call 3makewin.bat %1\r
+:end
\ No newline at end of file

diff --git a/winsrc/Makefile b/winsrc/Makefile
index 71dce86617da169bacff273c971cc313e6a01fcd..96466700fa6ab54f978a67de000500f432b920c8 100644 (file)
--- a/winsrc/Makefile
+++ b/winsrc/Makefile
@@ -1,10 +1,11 @@
+CC=cl\r

 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\r
 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\r

-BASE_CFLAGS = /W3 /nologo\r
-\r
+BASE_CFLAGS = /W3 /nologo /Zi /MT /Fdobj/vc90.pdb\r

 LIB=..\..\devkitWIN\lib;%LIB%\r
 \r
 DEFINES  = $(BASE_DEFS)\r
 LIB=..\..\devkitWIN\lib;%LIB%\r
 \r
 DEFINES  = $(BASE_DEFS)\r

-CFLAGS   = $(BASE_CFLAGS) /I..\..\devkitWIN/include /Zi /MT\r
+INCLUDES = /I..\..\devkitWIN/include\r
+CFLAGS   = $(BASE_CFLAGS) $(INCLUDES)\r

 \r
 OBJDIR = obj\r
 \r
 \r
 OBJDIR = obj\r
 \r


@@ -12,24 +13,20 @@ OBJS   = $(OBJDIR)\prox.obj \
          $(OBJDIR)\gui.obj \\r
          $(OBJDIR)\command.obj\r
 \r
          $(OBJDIR)\gui.obj \\r
          $(OBJDIR)\command.obj\r
 \r

-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\r
-\r
-HEADERS = prox.h\r
+LIBS   = user32.lib gdi32.lib setupapi.lib\r

 \r
 \r

-all: prox.exe\r
+all: proxmark3\r

 \r
 \r

-prox.exe: $(OBJDIR)/prox.exe\r
-    copy $(OBJDIR)\prox.exe .\r
+proxmark3:\r
+       $(CC) $(CFLAGS) $(DEFINES) -c -Foobj/prox.obj prox.cpp\r
+       $(CC) $(CFLAGS) $(DEFINES) -c -Foobj/gui.obj gui.cpp\r
+       $(CC) $(CFLAGS) $(DEFINES) -c -Foobj/command.obj command.cpp\r
+       $(CC) $(CFLAGS) $(DEFINES) -Fe$(OBJDIR)/prox.exe $(OBJS) $(LIBS)\r
+       copy obj\prox.exe .\r

 \r
 clean:\r
        del /q obj\*.obj\r
        del /q obj\*.ilk\r
        del /q obj\*.exe\r
        del /q obj\*.pdb\r
 \r
 clean:\r
        del /q obj\*.obj\r
        del /q obj\*.ilk\r
        del /q obj\*.exe\r
        del /q obj\*.pdb\r

-       del /q *.pdb\r
-\r
-$(OBJDIR)/prox.exe: $(OBJS)\r
-    $(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/prox.exe $(OBJS) $(LIBS)\r
-\r
-$(OBJS): $(@B).cpp $(HEADERS)\r
-    $(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj $(@B).cpp\r
+       del prox.exe
\ No newline at end of file