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

This commit is contained in:
d18c7db 2009-09-07 09:03:45 +00:00
commit a8120704f7
5 changed files with 32 additions and 25 deletions

View file

@ -2,7 +2,9 @@
call _checkmake call _checkmake
IF %MAKE_FAILED%==1 GOTO end IF %MAKE_FAILED%==1 GOTO end
cd ..\armsrc cd ..\armsrc
rem make clean @echo **************
make @echo *** armsrc ***
@echo **************
make %1
cd ..\cockpit cd ..\cockpit
:end :end

View file

@ -2,7 +2,9 @@
call _checkmake call _checkmake
IF %MAKE_FAILED%==1 GOTO end IF %MAKE_FAILED%==1 GOTO end
cd ..\bootrom cd ..\bootrom
rem make clean @echo ***************
make @echo *** bootrom ***
@echo ***************
make %1
cd ..\cockpit cd ..\cockpit
:end :end

View file

@ -1,5 +1,7 @@
@echo off @echo off
cd ..\winsrc cd ..\winsrc
rem nmake clean @echo **************
nmake @echo *** winsrc ***
@echo **************
make %1
cd ..\cockpit cd ..\cockpit

View file

@ -1,3 +1,7 @@
call 1makearm.bat @echo off
call 2makeboot.bat call _checkmake
call 3makewin.bat IF %MAKE_FAILED%==1 GOTO end
call 1makearm.bat %1
call 2makeboot.bat %1
call 3makewin.bat %1
:end

View file

@ -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_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% LIB=..\..\devkitWIN\lib;%LIB%
DEFINES = $(BASE_DEFS) DEFINES = $(BASE_DEFS)
CFLAGS = $(BASE_CFLAGS) /I..\..\devkitWIN/include /Zi /MT INCLUDES = /I..\..\devkitWIN/include
CFLAGS = $(BASE_CFLAGS) $(INCLUDES)
OBJDIR = obj OBJDIR = obj
@ -12,24 +13,20 @@ OBJS = $(OBJDIR)\prox.obj \
$(OBJDIR)\gui.obj \ $(OBJDIR)\gui.obj \
$(OBJDIR)\command.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 LIBS = user32.lib gdi32.lib setupapi.lib
HEADERS = prox.h all: proxmark3
all: prox.exe proxmark3:
$(CC) $(CFLAGS) $(DEFINES) -c -Foobj/prox.obj prox.cpp
prox.exe: $(OBJDIR)/prox.exe $(CC) $(CFLAGS) $(DEFINES) -c -Foobj/gui.obj gui.cpp
copy $(OBJDIR)\prox.exe . $(CC) $(CFLAGS) $(DEFINES) -c -Foobj/command.obj command.cpp
$(CC) $(CFLAGS) $(DEFINES) -Fe$(OBJDIR)/prox.exe $(OBJS) $(LIBS)
copy obj\prox.exe .
clean: clean:
del /q obj\*.obj del /q obj\*.obj
del /q obj\*.ilk del /q obj\*.ilk
del /q obj\*.exe del /q obj\*.exe
del /q obj\*.pdb del /q obj\*.pdb
del /q *.pdb del prox.exe
$(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