Move wxVariant support for GDI classes to their

[wxWidgets.git] / src / makeprog.bcc

diff --git a/src/makeprog.bcc b/src/makeprog.bcc
index 1600f23c2284664330d3b9e7bd283a2f90a5efa8..baa44c33497891403302b9249850891dd33cf5b7 100644 (file)
--- a/src/makeprog.bcc
+++ b/src/makeprog.bcc
@@ -4,24 +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
+LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16 winpng zlib

 
 

-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-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) @&&!


@@ -31,13 +16,16 @@ nul
 $(LIBS)
 $(TARGET).def
 !
 $(LIBS)
 $(TARGET).def
 !

-        rc -K $(TARGET).res
+        brc -K $(TARGET).res

 
 .$(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

-    rc -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