X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e1ed7d709cf4e81556589a8c2132882f40d97ff..59c962bf54667cab735353b2ec3b7a2438464f22:/src/makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index 5c17936e4f..3559c1ca82 100644
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -10,13 +10,17 @@
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
-# Set WXDIR for your system (hint, set an environment variable named WXWIN)
+# Set WXDIR for your system
 WXDIR = $(WXWIN)
 
 WXUSINGDLL=0
 
 !include $(WXDIR)\src\makevc.env
 
+!if "$(RM)" == ""
+RM= erase
+!endif
+
 all:    $(PROGRAM).exe
 
 wx:
@@ -29,21 +33,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) $(OBJECTS)
+        -$(RM) *.exe
+        -$(RM) *.res
+        -$(RM) *.map
+        -$(RM) *.sbr
+        -$(RM) *.pdb