X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f02408ec96dbb43a505aa2b4781ac943a32772c..f0e5a44df103e880f57416f483e8f3f4b4bc9651:/src/makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index b89d4066d8..e2c76535c4 100644
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -2,7 +2,7 @@
 # File:		makefile.nt
 # Author:	Julian Smart
 # Created:	1999
-# Updated:	
+# Updated:
 # Copyright:	(c) Julian Smart
 #
 # Makefile environment for building samples. Include this from
@@ -13,10 +13,16 @@
 # Set WXDIR for your system
 WXDIR = $(WXWIN)
 
+!ifndef WXUSINGDLL
 WXUSINGDLL=0
+!endif
 
 !include $(WXDIR)\src\makevc.env
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 all:    $(PROGRAM).exe
 
 wx:
@@ -29,21 +35,45 @@ wxclean:
         nmake -f makefile.vc clean
 #        cd $(THISDIR)
 
-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+
+!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
 $(LINKFLAGS)
-$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
+$(OBJECTS) $(DUMMYOBJ) $(PROGRAM).res
 $(LIBS)
 <<
 
 $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).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:
-        -erase $(OBJECTS)
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+        -$(RM) *.obj
+        -$(RM) *.exe
+        -$(RM) *.res
+        -$(RM) *.map
+        -$(RM) *.sbr
+        -$(RM) *.pdb