X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd8528426bb359aa85af8bc1ce06b214a11e68d1..233387bdcbb1c4f31c54b0fe6b3f03e8d261cab1:/src/makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index 5905a183eb..e2c76535c4 100644
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -13,7 +13,9 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
+!ifndef WXUSINGDLL
 WXUSINGDLL=0
+!endif
 
 !include $(WXDIR)\src\makevc.env
 
@@ -33,6 +35,17 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
+
+!if "$(wxUSE_GUI)" == ""
+wxUSE_GUI=1
+!endif
+
+!if "$(wxUSE_GUI)" == "1"
+
+#!if "$(WXUSINGDLL)" == "1"
+DUMMYOBJ=
+#!endif
+
 $(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res
 	$(link) @<<
 -out:$(PROGRAM).exe
@@ -44,8 +57,21 @@ $(LIBS)
 $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
     $(rc) -r /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$@ $(PROGRAM).rc
 
+!else
+
+$(PROGRAM).exe:      $(WXLIB) $(OBJECTS)
+	$(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(OBJECTS) $(DUMMYOBJ)
+$(LIBS)
+<<
+
+!endif
+
+
 clean:
-        -$(RM) $(OBJECTS)
+        -$(RM) *.obj
         -$(RM) *.exe
         -$(RM) *.res
         -$(RM) *.map