Patch to make wxComboBox work in Toolbars.

[wxWidgets.git] / src / makeprog.vc

diff --git a/src/makeprog.vc b/src/makeprog.vc
index 5905a183ebb2527d8e3a6822793f861e25684c0a..3559c1ca82c4efd177a5b330ac98291bf2d624dd 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -33,6 +33,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,6 +55,19 @@ $(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) *.exe