Simplify data types, now that I believe that 'frames' will always be rather short

[proxmark3-svn] / winsrc / Makefile

diff --git a/winsrc/Makefile b/winsrc/Makefile
index 71dce86617da169bacff273c971cc313e6a01fcd..1c8287f871cb3916e62b870e39fa5d2291680079 100644 (file)
--- a/winsrc/Makefile
+++ b/winsrc/Makefile
@@ -1,10 +1,12 @@
+CC=cl\r
+BASE_DIR    ?= "..\..\devkitWIN"\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
-LIB=..\..\devkitWIN\lib;%LIB%\r
+BASE_CFLAGS = /W3 /nologo /Zi /MT /Fdobj/vc90.pdb\r
+LIB         = $(BASE_DIR)\lib\r

 \r
 DEFINES  = $(BASE_DEFS)\r
 \r
 DEFINES  = $(BASE_DEFS)\r

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

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


@@ -12,24 +14,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   = $(LIB)\user32.lib $(LIB)\gdi32.lib $(LIB)\setupapi.lib $(LIB)\libcmt.lib $(LIB)\oldnames.lib $(LIB)\kernel32.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