only set focus on textctrl item if it exists (exists if combo box is editable)

[wxWidgets.git] / src / makeprog.bcc

diff --git a/src/makeprog.bcc b/src/makeprog.bcc
index e8f20a2b006fda12748b98d893bd4ab6818926a3..baa44c33497891403302b9249850891dd33cf5b7 100644 (file)
--- a/src/makeprog.bcc
+++ b/src/makeprog.bcc
@@ -4,9 +4,9 @@
 !include $(WXDIR)\src\makebcc.env
 
 WXLIB = $(WXDIR)\lib\wx.lib
 !include $(WXDIR)\src\makebcc.env
 
 WXLIB = $(WXDIR)\lib\wx.lib

-LIBS=$(WXLIB) mathwl cwl import ole2w16
+LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16 winpng zlib

 
 

-all:    $(TARGET).exe
+all:    $(TARGET).exe $(EXTRATARGETS)

 
 $(TARGET).exe:      $(WXLIB) $(OBJECTS) $(TARGET).def $(TARGET).res
         tlink $(LINKFLAGS) @&&!
 
 $(TARGET).exe:      $(WXLIB) $(OBJECTS) $(TARGET).def $(TARGET).res
         tlink $(LINKFLAGS) @&&!


@@ -21,8 +21,11 @@ $(TARGET).def
 .$(SRCSUFF).obj:
        bcc $(CPPFLAGS) -c {$< }
 
 .$(SRCSUFF).obj:
        bcc $(CPPFLAGS) -c {$< }
 

+.c.obj:
+       bcc $(CPPFLAGS) -P- -c {$< }
+

 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
 $(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc

-    brc -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+    brc -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(TARGET)

 
 clean:
         -erase *.obj
 
 clean:
         -erase *.obj